commit faf22145ee7b86a3ea374c7efb42e0e14e45f01a
author Alex Stetson <alexstetson@google.com> Thu Jun 25 12:13:01 2020 -0700
committer Heemin Seog <hseog@google.com> Wed Sep 30 08:32:03 2020 -0700
tree 9ee558d0f3f162b28a5d486886baed681f7b5741
parent 1bf866efc0137024a2640df354f380f1dbdeb001

Fix disabled toast showing on view-only preferences

The UxRestricted toast should not be shown on preferences that are for
viewing only (AVAILABLE_FOR_VIEWING)

Bug: 168308383
Bug: 159910592
Test: manual, make -j50 RunCarSettingsRoboTests
ROBOTEST_FILTER=com.android.car.settings.common.SettingsFragmentTest

Change-Id: I05f0ce6aa4f1ece5b315a69919f20c98831d537a
Merged-In: I05f0ce6aa4f1ece5b315a69919f20c98831d537a

src/com/android/car/settings/common/SettingsFragment.java

diff --git a/src/com/android/car/settings/common/SettingsFragment.java b/src/com/android/car/settings/common/SettingsFragment.java
index 6fe250d..4eb14ca 100644
--- a/src/com/android/car/settings/common/SettingsFragment.java
+++ b/src/com/android/car/settings/common/SettingsFragment.java
@@ -184,7 +184,8 @@
 
             controller.setPreference(pref);
 
-            if (pref instanceof DisabledPreferenceCallback) {
+            if (pref instanceof DisabledPreferenceCallback && controller.getAvailabilityStatus()
+                    != PreferenceController.AVAILABLE_FOR_VIEWING) {
                 ((DisabledPreferenceCallback) pref).setMessageToShowWhenDisabledPreferenceClicked(
                         mRestrictedWhileDrivingMessage);
             }