Merge "Update text of blocking activity."
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 6f58d25..3b8b435 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -200,11 +200,6 @@
return mPropertyManager;
}
- @Override
- protected CarDrawerAdapter getRootAdapter() {
- return new DrawerAdapter();
- }
-
public CarSensorManager getSensorManager() {
return mSensorManager;
}
@@ -214,6 +209,7 @@
super.onCreate(savedInstanceState);
setToolbarElevation(0f);
setMainContent(R.layout.kitchen_content);
+ getDrawerController().setRootAdapter(new DrawerAdapter());
// Connection to Car Service does not work for non-automotive yet.
if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
initCarApi();
diff --git a/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
index 31ed4b2..7f94cbb 100644
--- a/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
+++ b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
@@ -48,6 +48,16 @@
.getSimpleName();
private CarDrivingStateManager mCarDrivingStateManager;
private CarUxRestrictionsManager mCarUxRManager;
+ // Currently set restrictions currently set in car_ux_restrictions_map.xml
+ private static final int UX_RESTRICTIONS_MOVING = CarUxRestrictions.UX_RESTRICTIONS_NO_DIALPAD
+ | CarUxRestrictions.UX_RESTRICTIONS_NO_FILTERING
+ | CarUxRestrictions.UX_RESTRICTIONS_LIMIT_STRING_LENGTH
+ | CarUxRestrictions.UX_RESTRICTIONS_NO_KEYBOARD
+ | CarUxRestrictions.UX_RESTRICTIONS_NO_VIDEO
+ | CarUxRestrictions.UX_RESTRICTIONS_LIMIT_CONTENT
+ | CarUxRestrictions.UX_RESTRICTIONS_NO_SETUP
+ | CarUxRestrictions.UX_RESTRICTIONS_NO_TEXT_MESSAGE;
+
@Override
protected synchronized void configureMockedHal() {
@@ -128,8 +138,7 @@
restrictions = listener.waitForUxRestrictionsChange();
assertNotNull(restrictions);
assertTrue(restrictions.isRequiresDistractionOptimization());
- assertThat(restrictions.getActiveRestrictions())
- .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED);
+ assertThat(restrictions.getActiveRestrictions()).isEqualTo(UX_RESTRICTIONS_MOVING);
// Test Idling state and corresponding restrictions based on car_ux_restrictions_map.xml
listener.reset();