Fixed ApplicationDetails carets. Fixed ExtraSettingsPreferenceController am: f96d9f0a35
Change-Id: I1e3e7c2d7c0c3d8bbd9a417bb751dc4e8e5da569
diff --git a/res/xml/application_details_fragment.xml b/res/xml/application_details_fragment.xml
index dd1abee..75bf604 100644
--- a/res/xml/application_details_fragment.xml
+++ b/res/xml/application_details_fragment.xml
@@ -19,10 +19,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/applications_settings">
- <Preference
+ <com.android.car.ui.preference.CarUiPreference
android:key="@string/pk_application_details_app"
android:selectable="false"
- settings:controller="com.android.car.settings.applications.ApplicationPreferenceController"/>
+ settings:controller="com.android.car.settings.applications.ApplicationPreferenceController"
+ settings:showChevron="false"/>
<SwitchPreference
android:key="@string/pk_application_details_notifications"
android:title="@string/notifications_label"
@@ -31,7 +32,8 @@
android:key="@string/pk_application_details_permissions"
android:title="@string/permissions_label"
settings:controller="com.android.car.settings.applications.PermissionsPreferenceController"/>
- <Preference
+ <com.android.car.ui.preference.CarUiPreference
android:key="@string/pk_application_details_version"
- settings:controller="com.android.car.settings.applications.VersionPreferenceController"/>
+ settings:controller="com.android.car.settings.applications.VersionPreferenceController"
+ settings:showChevron="false"/>
</PreferenceScreen>
diff --git a/src/com/android/car/settings/common/ExtraSettingsPreferenceController.java b/src/com/android/car/settings/common/ExtraSettingsPreferenceController.java
index fc73d1f..6dd14fd 100644
--- a/src/com/android/car/settings/common/ExtraSettingsPreferenceController.java
+++ b/src/com/android/car/settings/common/ExtraSettingsPreferenceController.java
@@ -86,8 +86,11 @@
// user.
for (int i = 0; i < getPreference().getPreferenceCount(); i++) {
Preference preference = getPreference().getPreference(i);
- if (!preference.getExtras().getBoolean(META_DATA_DISTRACTION_OPTIMIZED)) {
+ if (uxRestrictions.isRequiresDistractionOptimization()
+ && !preference.getExtras().getBoolean(META_DATA_DISTRACTION_OPTIMIZED)) {
preference.setEnabled(false);
+ } else {
+ preference.setEnabled(getAvailabilityStatus() != AVAILABLE_FOR_VIEWING);
}
}
}
diff --git a/tests/robotests/src/com/android/car/settings/common/ExtraSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/car/settings/common/ExtraSettingsPreferenceControllerTest.java
index be6ed91..8c19a8c 100644
--- a/tests/robotests/src/com/android/car/settings/common/ExtraSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/car/settings/common/ExtraSettingsPreferenceControllerTest.java
@@ -59,7 +59,7 @@
private Map<Preference, Bundle> mPreferenceBundleMapEmpty = new HashMap<>();
private Map<Preference, Bundle> mPreferenceBundleMap = new HashMap<>();
private static final CarUxRestrictions UNRESTRICTED_UX_RESTRICTIONS =
- new CarUxRestrictions.Builder(/* reqOpt= */ false,
+ new CarUxRestrictions.Builder(/* reqOpt= */ true,
CarUxRestrictions.UX_RESTRICTIONS_BASELINE, /* timestamp= */ 0).build();
private Bundle mBundle;