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

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

Snap for 11959661 from 076b7ee2 to 24Q3-release 

Change-Id: I751144b8ab0d9d594a74d699eb004fa4c8435ea3
parents d7b417b2 076b7ee2

res/values/strings.xml

+8 −8
Original line number Diff line number Diff line
@@ -4458,15 +4458,15 @@ 
    <string name="trackpad_pointer_speed">Pointer speed</string>

    <!-- Title text for mouse pointer fill style. [CHAR LIMIT=35] -->

    <string name="pointer_fill_style">Pointer fill style</string>

    <!-- Content description for black pointer fill style. [CHAR LIMIT=35] -->

    <!-- Content description for black pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_black_button">Change pointer fill style to black</string>

    <!-- Content description for green pointer fill style. [CHAR LIMIT=35] -->

    <!-- Content description for green pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_green_button">Change pointer fill style to green</string>

    <!-- Content description for yellow pointer fill style. [CHAR LIMIT=35] -->

    <!-- Content description for yellow pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_yellow_button">Change pointer fill style to yellow</string>

    <!-- Content description for pink pointer fill style. [CHAR LIMIT=35] -->

    <!-- Content description for pink pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_pink_button">Change pointer fill style to pink</string>

    <!-- Content description for blue pointer fill style. [CHAR LIMIT=35] -->

    <!-- Content description for blue pointer fill style. [CHAR LIMIT=60] -->

    <string name="pointer_fill_style_blue_button">Change pointer fill style to blue</string>

    <!-- Title for the button to trigger the 'touch gesture' education. [CHAR LIMIT=35] -->

    <string name="trackpad_touch_gesture">Learn touchpad gestures</string>
@@ -8732,9 +8732,9 @@ 
    <string name="notif_listener_more_settings_desc">More settings are available inside this app</string>









    <!-- Title for Polite Notifications setting  [CHAR LIMIT=45]-->









    <string name="notification_polite_title">Cooldown</string>









    <string name="notification_polite_main_control_title">Use Cooldown</string>









    <string name="notification_polite_description">When you get many notifications within a short time span, your device will minimize sound interruptions and pop-ups on the screen. Calls, alarms, and priority conversations will still alert as notmal, and all delivered notifications are easy to find in the Shade.</string>









    <string name="notification_polite_title">Adaptive Notifications</string>









    <string name="notification_polite_main_control_title">Use adaptive notifications</string>









    <string name="notification_polite_description">When you get many notifications within a short time, your phone will lower volume and minimize pop-ups on screen for up to two minutes. Calls, alarms, and priority conversations still vibrate, make a sound, or show up on the screen, and all notifications are easy to find when you pull down from the top of the screen.</string>









    <string name="notification_polite_work">Apply to work profiles</string>









    <string name="notification_polite_work_summary">Apply to work profile apps</string>

































res/xml/configure_notification_settings.xml



+19
−16






























Original line number
Diff line number
Diff line







@@ -116,9 +116,19 @@







    <PreferenceCategory









        android:key="advanced_section_header"









        android:title="@string/advanced_section_header">



















        <!--Adaptive Notifications-->









        <Preference









            android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"









            android:key="polite_notifications_preference"









            android:order="17"









            android:persistent="false"









            android:title="@string/notification_polite_title"









            settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />



















        <com.android.settingslib.RestrictedPreference









            android:key="zen_mode_notifications"









            android:order="17"









            android:order="18"









            android:title="@string/zen_mode_settings_title"









            settings:useAdminDisabledSummary="true"









            android:fragment="com.android.settings.notification.zen.ZenModeSettings"








@@ -127,7 +137,7 @@

















        <SwitchPreferenceCompat









            android:key="lock_screen_show_only_unseen_notifs"









            android:order="18"









            android:order="19"









            android:title="@string/unseen_notifs_lock_screen"









            android:summary="@string/unseen_notifs_lock_screen_summary"









            settings:controller="com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController"








@@ -136,7 +146,7 @@







        <Preference









            android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"









            android:key="flash_notifications_preference"









            android:order="19"









            android:order="20"









            android:persistent="false"









            android:title="@string/flash_notifications_title"









            settings:searchable="false"








@@ -144,7 +154,7 @@

















        <com.android.settingslib.RestrictedPreference









            android:key="app_and_notif_cell_broadcast_settings"









            android:order="20"









            android:order="21"









            android:title="@string/cell_broadcast_settings"









            settings:useAdminDisabledSummary="true">









            <intent








@@ -155,43 +165,36 @@

















        <SwitchPreferenceCompat









             android:key="silent_icons"









             android:order="21"









             android:order="22"









             android:title="@string/silent_notifications_status_bar"









             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>



















        <SwitchPreferenceCompat









            android:key="show_snooze_options"









            android:order="22"









            android:order="23"









            android:title="@string/snooze_options_title"









            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />



















        <!-- Notification badging -->









        <SwitchPreferenceCompat









            android:key="notification_badging"









            android:order="23"









            android:order="24"









            android:title="@string/notification_badging_title"









            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>



















        <!-- Pulse notification light, on devices that support it -->









        <SwitchPreferenceCompat









            android:key="notification_pulse"









            android:order="24"









            android:order="25"









            android:title="@string/notification_pulse_title"









            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>



















        <SwitchPreferenceCompat









            android:key="notification_assistant"









            android:order="25"









            android:order="26"









            android:title="@string/notification_assistant_title"









            android:summary="@string/notification_assistant_summary"









            settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>



















        <Preference









            android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"









            android:key="polite_notifications_preference"









            android:order="26"









            android:persistent="false"









            android:title="@string/notification_polite_title"









            settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />









    </PreferenceCategory>









</PreferenceScreen>
























src/com/android/settings/ResetNetworkRequest.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -270,6 +270,7 @@ public class ResetNetworkRequest {







        if ((mResetOptions & RESET_IMS_STACK) != 0) {









            builder.resetIms(mSubscriptionIdToResetIms);









        }









        // Reset phone process and RILD may impact above components, keep them at the end









        if ((mResetOptions & RESET_PHONE_PROCESS) != 0) {









            builder.restartPhoneProcess();









        }
































src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -148,7 +148,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC

















        // Check if another side of LE audio hearing aid is connected as a pair









        final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice();









        if (memberDevices.stream().anyMatch(m -> m.isConnected())) {









        if (memberDevices.stream().anyMatch(m -> m.getDevice().isConnected())) {









            return mContext.getString(









                    R.string.accessibility_hearingaid_left_and_right_side_device_summary,









                    name);








@@ -156,7 +156,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC

















        // Check if another side of ASHA hearing aid is connected as a pair









        final CachedBluetoothDevice subDevice = device.getSubDevice();









        if (subDevice != null && subDevice.isConnected()) {









        if (subDevice != null && subDevice.getDevice().isConnected()) {









            return mContext.getString(









                    R.string.accessibility_hearingaid_left_and_right_side_device_summary, name);









        }
































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



+3
−2






























Original line number
Diff line number
Diff line







@@ -28,9 +28,10 @@ import com.android.settingslib.development.AbstractEnableAdbPreferenceController







public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements









        PreferenceControllerMixin {



















    private final DevelopmentSettingsDashboardFragment mFragment;









    @Nullable private final DevelopmentSettingsDashboardFragment mFragment;



















    public AdbPreferenceController(Context context, DevelopmentSettingsDashboardFragment fragment) {









    public AdbPreferenceController(Context context,









        @Nullable DevelopmentSettingsDashboardFragment fragment) {









        super(context);









        mFragment = fragment;









    }