commit 3434e72f3116bf9514ca88a903b7e60b85f7a750
author yuemingw <yuemingw@google.com> Mon Mar 26 14:18:10 2018 +0100
committer Yueming Wang <yuemingw@google.com> Mon Mar 26 20:37:56 2018 +0000
tree 0a984cf16a39dd93e51855b70b5e4dd331d5d02a
parent 21926abed21d864a55f735b7232011222653f0fc

Auto time should show dynamic subtext when restricted.

Auto time preference should show dynamic subtext corresponding to
the current status of auto time when it's restricted, instead of
hard code "enabled by admin", as it could either be enabled or disabled
when disallow_config_date_time is set.

Bug: 73811933
Test: manually by TestDPC
Change-Id: Ia7181e8a67ccfe72117f95133e9081375c121fe3

res/xml/date_time_prefs.xml

diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 3249189..511b39f 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -30,7 +30,6 @@
             android:summaryOn="@string/date_time_auto_summaryOn"
             android:summaryOff="@string/date_time_auto_summaryOff"
             settings:useAdditionalSummary="true"
-            settings:restrictedSwitchSummary="@string/enabled_by_admin"
             settings:userRestriction="no_config_date_time" />
 
         <com.android.settingslib.RestrictedPreference