Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dae5d00 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Android (Google) Code Review
Browse files

Merge "Follow footer preference guildance on some pages" into sc-dev

parents e2217fc5 ff727efe

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6617,7 +6617,7 @@ 








    <!-- Message displayed to let the user know that some of the options are disabled by admin. [CHAR LIMIT=NONE] -->









    <string name="admin_disabled_other_options">Other options are disabled by your admin</string>









    <string name="admin_more_details">More details</string>









    <string name="admin_more_details">Learn more</string>









    <string name="notification_log_title">Notification log</string>

















    <string name="notification_history_title">Notification history</string>

























res/xml/tether_prefs.xml



+3
−3






























Original line number
Diff line number
Diff line







@@ -49,9 +49,9 @@







        android:summary="@string/ethernet_tethering_subtext"









        settings:keywords="@string/keywords_hotspot_tethering" />



















    <Preference









    <com.android.settingslib.widget.FooterPreference









        android:key="disabled_on_data_saver"









        android:summary="@string/tether_settings_disabled_on_data_saver"









        android:title="@string/tether_settings_disabled_on_data_saver"









        android:selectable="false"









        settings:allowDividerAbove="true" />









        settings:searchable="false"/>









</PreferenceScreen>
























src/com/android/settings/display/AdaptiveSleepPreferenceController.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -60,7 +60,6 @@ public class AdaptiveSleepPreferenceController {







        mPreference = new RestrictedSwitchPreference(context);









        mPreference.setTitle(R.string.adaptive_sleep_title);









        mPreference.setSummary(R.string.adaptive_sleep_description);









        mPreference.setIcon(R.drawable.empty_icon);









        mPreference.setChecked(isChecked());









        mPreference.setKey(PREFERENCE_KEY);









        mPreference.setOnPreferenceClickListener(preference -> {
































src/com/android/settings/display/ScreenTimeoutSettings.java



+3
−2






























Original line number
Diff line number
Diff line







@@ -164,7 +164,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements







        final String textMoreDetails = getResources().getString(R.string.admin_more_details);



















        final SpannableString spannableString = new SpannableString(









                textDisabledByAdmin + System.lineSeparator() + textMoreDetails);









                textDisabledByAdmin + System.lineSeparator()









                + System.lineSeparator() + textMoreDetails);









        final ClickableSpan clickableSpan = new ClickableSpan() {









            @Override









            public void onClick(@NonNull View widget) {








@@ -174,7 +175,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements

















        if (textDisabledByAdmin != null && textMoreDetails != null) {









            spannableString.setSpan(clickableSpan, textDisabledByAdmin.length() + 1,









                    textDisabledByAdmin.length() + textMoreDetails.length() + 1,









                    textDisabledByAdmin.length() + textMoreDetails.length() + 2,









                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);









        }