Skip to content

Commit 5d5f6dc

Browse files
author
Billy Lam
committed
Update car app library version to 1.1.0-beta01 (Attempt #2)
Previous attempt commit 3e919da failed because the API surface was changed by a different commit (53b1652) at the same time. Bug: n/a Test: n/a Relnote: n/a Change-Id: I9c3d0ffc5d3a78cf8a7f0514e358bb5c587b2f67
1 parent c011d61 commit 5d5f6dc

17 files changed

Lines changed: 4586 additions & 1 deletion

buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object LibraryVersions {
3939
val CAMERA_VIDEO = Version("1.0.0-alpha01")
4040
val CAMERA_VIEW = Version("1.0.0-alpha29")
4141
val CARDVIEW = Version("1.1.0-alpha01")
42-
val CAR_APP = Version("1.1.0-alpha03")
42+
val CAR_APP = Version("1.1.0-beta01")
4343
val COLLECTION = Version("1.2.0-alpha02")
4444
val COLLECTION2 = Version("1.2.0-alpha02")
4545
val CONTENTPAGER = Version("1.1.0-alpha01")
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Signature format: 4.0
2+
package androidx.car.app.activity {
3+
4+
public final class CarAppActivity extends androidx.fragment.app.FragmentActivity implements androidx.lifecycle.LifecycleOwner {
5+
ctor public CarAppActivity();
6+
}
7+
8+
}
9+
10+
package androidx.car.app.activity.renderer.surface {
11+
12+
public final class LegacySurfacePackage {
13+
ctor public LegacySurfacePackage(androidx.car.app.activity.renderer.surface.SurfaceControlCallback);
14+
}
15+
16+
public interface SurfaceControlCallback {
17+
method public default void onError(String, Throwable);
18+
method public void onKeyEvent(android.view.KeyEvent);
19+
method public void onTouchEvent(android.view.MotionEvent);
20+
method public void onWindowFocusChanged(boolean, boolean);
21+
method public void setSurfaceWrapper(androidx.car.app.activity.renderer.surface.SurfaceWrapper);
22+
}
23+
24+
public final class SurfaceWrapper {
25+
ctor public SurfaceWrapper(android.os.IBinder?, @Dimension int, @Dimension int, int, int, android.view.Surface);
26+
method public int getDensityDpi();
27+
method public int getDisplayId();
28+
method @Dimension public int getHeight();
29+
method public android.os.IBinder? getHostToken();
30+
method public android.view.Surface getSurface();
31+
method @Dimension public int getWidth();
32+
}
33+
34+
}
35+
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Signature format: 4.0
2+
package androidx.car.app.activity {
3+
4+
public final class CarAppActivity extends androidx.fragment.app.FragmentActivity implements androidx.lifecycle.LifecycleOwner {
5+
ctor public CarAppActivity();
6+
}
7+
8+
}
9+
10+
package androidx.car.app.activity.renderer.surface {
11+
12+
public final class LegacySurfacePackage {
13+
ctor public LegacySurfacePackage(androidx.car.app.activity.renderer.surface.SurfaceControlCallback);
14+
}
15+
16+
public interface SurfaceControlCallback {
17+
method public default void onError(String, Throwable);
18+
method public void onKeyEvent(android.view.KeyEvent);
19+
method public void onTouchEvent(android.view.MotionEvent);
20+
method public void onWindowFocusChanged(boolean, boolean);
21+
method public void setSurfaceWrapper(androidx.car.app.activity.renderer.surface.SurfaceWrapper);
22+
}
23+
24+
public final class SurfaceWrapper {
25+
ctor public SurfaceWrapper(android.os.IBinder?, @Dimension int, @Dimension int, int, int, android.view.Surface);
26+
method public int getDensityDpi();
27+
method public int getDisplayId();
28+
method @Dimension public int getHeight();
29+
method public android.os.IBinder? getHostToken();
30+
method public android.view.Surface getSurface();
31+
method @Dimension public int getWidth();
32+
}
33+
34+
}
35+
36+
package androidx.car.app.hardware {
37+
38+
@androidx.car.app.annotations.ExperimentalCarApi public final class AutomotiveCarHardwareManager implements androidx.car.app.hardware.CarHardwareManager {
39+
ctor public AutomotiveCarHardwareManager(android.content.Context);
40+
}
41+
42+
}
43+

car/app/app-automotive/api/res-1.1.0-beta01.txt

Whitespace-only changes.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Signature format: 4.0
2+
package androidx.car.app.activity {
3+
4+
public final class CarAppActivity extends androidx.fragment.app.FragmentActivity {
5+
ctor public CarAppActivity();
6+
}
7+
8+
}
9+
10+
package androidx.car.app.activity.renderer.surface {
11+
12+
public final class LegacySurfacePackage {
13+
ctor public LegacySurfacePackage(androidx.car.app.activity.renderer.surface.SurfaceControlCallback);
14+
}
15+
16+
public interface SurfaceControlCallback {
17+
method public default void onError(String, Throwable);
18+
method public void onKeyEvent(android.view.KeyEvent);
19+
method public void onTouchEvent(android.view.MotionEvent);
20+
method public void onWindowFocusChanged(boolean, boolean);
21+
method public void setSurfaceWrapper(androidx.car.app.activity.renderer.surface.SurfaceWrapper);
22+
}
23+
24+
public final class SurfaceWrapper {
25+
ctor public SurfaceWrapper(android.os.IBinder?, @Dimension int, @Dimension int, int, int, android.view.Surface);
26+
method public int getDensityDpi();
27+
method public int getDisplayId();
28+
method @Dimension public int getHeight();
29+
method public android.os.IBinder? getHostToken();
30+
method public android.view.Surface getSurface();
31+
method @Dimension public int getWidth();
32+
}
33+
34+
}
35+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Signature format: 4.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Signature format: 4.0

car/app/app-projected/api/res-1.1.0-beta01.txt

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Signature format: 4.0
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
// Signature format: 4.0
2+
package androidx.car.app.testing {
3+
4+
public class FakeHost {
5+
method public void performNotificationActionClick(android.app.PendingIntent);
6+
}
7+
8+
public class ScreenController {
9+
ctor public ScreenController(androidx.car.app.Screen);
10+
ctor @Deprecated public ScreenController(androidx.car.app.testing.TestCarContext, androidx.car.app.Screen);
11+
method public androidx.car.app.Screen getScreen();
12+
method public Object? getScreenResult();
13+
method public java.util.List<androidx.car.app.model.Template!> getTemplatesReturned();
14+
method public androidx.car.app.testing.ScreenController moveToState(androidx.lifecycle.Lifecycle.State);
15+
method public void reset();
16+
}
17+
18+
public class SessionController {
19+
ctor public SessionController(androidx.car.app.Session, androidx.car.app.testing.TestCarContext, android.content.Intent);
20+
method public androidx.car.app.Session getSession();
21+
method public androidx.car.app.testing.SessionController moveToState(androidx.lifecycle.Lifecycle.State);
22+
}
23+
24+
public class TestAppManager extends androidx.car.app.AppManager {
25+
method public androidx.car.app.SurfaceCallback? getSurfaceCallback();
26+
method public java.util.List<android.util.Pair<androidx.car.app.Screen!,androidx.car.app.model.Template!>!> getTemplatesReturned();
27+
method public java.util.List<java.lang.CharSequence!> getToastsShown();
28+
method public void reset();
29+
}
30+
31+
public class TestCarContext extends androidx.car.app.CarContext {
32+
method public static androidx.car.app.testing.TestCarContext createCarContext(android.content.Context);
33+
method public androidx.car.app.testing.FakeHost getFakeHost();
34+
method public androidx.car.app.testing.TestCarContext.PermissionRequestInfo? getLastPermissionRequestInfo();
35+
method public java.util.List<android.content.Intent!> getStartCarAppIntents();
36+
method public boolean hasCalledFinishCarApp();
37+
method public void reset();
38+
}
39+
40+
public static class TestCarContext.PermissionRequestInfo {
41+
method public androidx.car.app.OnRequestPermissionsListener getListener();
42+
method public java.util.List<java.lang.String!> getPermissionsRequested();
43+
}
44+
45+
public class TestScreenManager extends androidx.car.app.ScreenManager {
46+
method public java.util.List<androidx.car.app.Screen!> getScreensPushed();
47+
method public java.util.List<androidx.car.app.Screen!> getScreensRemoved();
48+
method public boolean hasScreens();
49+
method public void reset();
50+
}
51+
52+
}
53+
54+
package androidx.car.app.testing.navigation {
55+
56+
public class TestNavigationManager extends androidx.car.app.navigation.NavigationManager {
57+
ctor public TestNavigationManager(androidx.car.app.testing.TestCarContext, androidx.car.app.HostDispatcher);
58+
method public int getNavigationEndedCount();
59+
method public androidx.car.app.navigation.NavigationManagerCallback? getNavigationManagerCallback();
60+
method public int getNavigationStartedCount();
61+
method public java.util.List<androidx.car.app.navigation.model.Trip!> getTripsSent();
62+
method public void reset();
63+
}
64+
65+
}
66+

0 commit comments

Comments
 (0)