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

Commit 4bda8719 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9232464 from 47d84b41 to tm-qpr2-release 

Change-Id: Ie525c7d06bc31b8200a04209626094f993b69a9c
parents dc98170d 47d84b41

res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,20 @@ 
        <item>90</item>

    </string-array>



    <!-- Options for screensaver "When to start" for devices that do not support screensavers

         while on battery -->

    <string-array name="when_to_start_screensaver_entries_no_battery" translatable="false">

        <item>@string/screensaver_settings_summary_sleep</item>

        <item>@string/screensaver_settings_summary_dock_and_charging</item>

    </string-array>



    <!-- Values for screensaver "When to start" for devices that do not support screensavers

         while on battery -->

    <string-array name="when_to_start_screensaver_values_no_battery" translatable="false">

        <item>while_charging_only</item>

        <item>while_docked_only</item>

    </string-array>



    <string-array name="when_to_start_screensaver_entries" translatable="false">

        <item>@string/screensaver_settings_summary_sleep</item>

        <item>@string/screensaver_settings_summary_dock</item>

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -3365,6 +3365,8 @@ 
    <string name="screensaver_settings_toggle_title">Use screen saver</string>

    <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_either_long">While charging or docked</string>

    <!-- Display settings screen, summary fragment for screen saver options, actived while docked and charging [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_dock_and_charging">While docked and charging</string>

    <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_sleep">While charging</string>

    <!-- Display settings screen, summary fragment for screen saver options, activated when docked [CHAR LIMIT=35] -->
@@ -9895,6 +9897,9 @@ 
    <!-- [CHAR LIMIT=NONE] Text appearing when channel group notifications are off -->

    <string name="channel_group_notifications_off_desc">At your request, Android is blocking this group of notifications from appearing on this device</string>









    <!-- [CHAR LIMIT=NONE] Text appearing when app does not send notifications -->









    <string name="app_notifications_not_send_desc">This app does not send notifications</string>

















    <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->









    <string name="notification_channels">Categories</string>

































src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+7
−4






























Original line number
Diff line number
Diff line







@@ -60,6 +60,7 @@ import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferen







import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;









import com.android.settings.development.qstile.DevelopmentTiles;









import com.android.settings.development.storage.SharedDataPreferenceController;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.BaseSearchIndexProvider;









import com.android.settings.search.actionbar.SearchMenuController;









import com.android.settings.widget.SettingsMainSwitchBar;








@@ -308,6 +309,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







                    DisableDevSettingsDialogFragment.show(this /* host */);









                }









            }









            FeatureFactory.getFactory(









                    getContext()).getSearchFeatureProvider().sendPreIndexIntent(getContext());









        }









    }










































src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -240,6 +240,8 @@ public class BuildNumberPreferenceController extends BasePreferenceController im







        mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on,









                Toast.LENGTH_LONG);









        mDevHitToast.show();



















        FeatureFactory.getFactory(mContext).getSearchFeatureProvider().sendPreIndexIntent(mContext);









    }



















    @VisibleForTesting
































src/com/android/settings/dream/DreamSettings.java



+4
−2






























Original line number
Diff line number
Diff line







@@ -90,12 +90,14 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan







        }









    }



















    static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting) {









    static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting,









            boolean enabledOnBattery) {









        switch (dreamSetting) {









            case WHILE_CHARGING:









                return R.string.screensaver_settings_summary_sleep;









            case WHILE_DOCKED:









                return R.string.screensaver_settings_summary_dock;









                return enabledOnBattery ? R.string.screensaver_settings_summary_dock









                        : R.string.screensaver_settings_summary_dock_and_charging;









            case EITHER:









                return R.string.screensaver_settings_summary_either_long;









            case NEVER: