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

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

Snap for 12368321 from 428829bf to 24Q4-release 

Change-Id: I657935e185a2cf0d3543c26f0e553ea87fcc5ec3
parents 2c93e6c8 428829bf

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -94,8 +94,10 @@ android_library { 
        "MediaDrmSettingsFlagsLib",

        "Settings-change-ids",

        "SettingsLib",

        "SettingsLibDataStore",

        "SettingsLibActivityEmbedding",

        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "contextualcards",

AndroidManifest.xml

+15 −5
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ 
        <activity

            android:name="Settings$ModesSettingsActivity"

            android:label="@string/zen_modes_list_title"

            android:icon="@drawable/ic_homepage_notification"

            android:icon="@*android:drawable/ic_zen_priority_modes"

            android:exported="true">

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">
@@ -2813,6 +2813,9 @@ 
        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"

            android:exported="false"

            android:theme="@style/GlifTheme.Light" />

        <activity android:name=".biometrics.fingerprint.FingerprintEnroll"

            android:exported="true"

            android:theme="@style/GlifTheme.Light">

            <intent-filter>
@@ -2826,6 +2829,10 @@ 
              android:exported="false"

              android:theme="@style/GlifTheme.Light"

              android:taskAffinity="com.android.settings.root" />

        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$InternalActivity"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:taskAffinity="com.android.settings.root" />



        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"

            android:exported="false"
@@ -2833,6 +2840,10 @@ 
        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"

            android:exported="false"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light" />

        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$SetupActivity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light">
@@ -2842,7 +2853,6 @@ 
            </intent-filter>

        </activity>





        <activity android:name=".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

res/values/strings.xml

+7 −3
Original line number Diff line number Diff line
@@ -7867,7 +7867,9 @@ 
    <string name="keywords_keyboard_vibration">keyboard, haptics, vibrate,</string>















    <!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->













    <string name="sound_dashboard_summary">Volume, vibration, Do Not Disturb</string>













    <string name="sound_dashboard_summary">Volume and vibration</string>













    <!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->













    <string name="sound_dashboard_summary_with_dnd">Volume, vibration, Do Not Disturb</string>





























    <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->















    <string name="media_volume_option_title">Media volume</string>










@@ -13366,9 +13368,9 @@













    <!-- Summary of the Live Caption enabled state. -->















    <string name="live_caption_enabled">On</string>















    <!-- State description for the Audio Balance seek bar, with left reported before right. -->













    <string name="audio_seek_bar_state_left_first">Audio %1$d%% left, %2$d%% right</string>













    <string name="audio_seek_bar_state_left_first">Audio <xliff:g id="percent_left">%1$s</xliff:g> left, <xliff:g id="percent_right">%2$s</xliff:g> right</string>















    <!-- State description for the Audio Balance seek bar, with right reported before left. -->













    <string name="audio_seek_bar_state_right_first">Audio %1$d%% right, %2$d%% left</string>













    <string name="audio_seek_bar_state_right_first">Audio <xliff:g id="percent_right">%1$s</xliff:g> right, <xliff:g id="percent_left">%2$s</xliff:g> left</string>





























    <!--  Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->















    <string name="about_phone_device_name_warning">Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>










@@ -13577,6 +13579,8 @@













    <string name="audio_streams_dialog_cannot_play">Can\u0027t play this audio stream on <xliff:g example="LE headset" id="device_name">%1$s</xliff:g>.</string>















    <!-- The preference summary when add source succeed [CHAR LIMIT=NONE] -->















    <string name="audio_streams_listening_now">Listening now</string>













    <!-- The preference summary when source is present on sinks [CHAR LIMIT=NONE] -->













    <string name="audio_streams_present_now">Paused by host</string>















    <!-- Le audio streams service notification leave broadcast text [CHAR LIMIT=NONE] -->















    <string name="audio_streams_media_service_notification_leave_broadcast_text">Stop listening</string>















    <!-- Le audio streams no le device dialog title [CHAR LIMIT=NONE] -->

























res/xml/top_level_settings.xml



+3
−2




























Original line number
Diff line number
Diff line








@@ -104,8 +104,9 @@













        android:key="top_level_sound"















        android:order="-90"















        android:title="@string/sound_settings"













        android:summary="@string/sound_dashboard_summary"













        settings:highlightableMenuKey="@string/menu_key_sound"/>













        android:summary="@string/sound_dashboard_summary_with_dnd"













        settings:highlightableMenuKey="@string/menu_key_sound"













        settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>































    <com.android.settings.widget.HomepagePreference















        android:fragment="com.android.settings.DisplaySettings"

































res/xml/top_level_settings_v2.xml



+3
−2




























Original line number
Diff line number
Diff line








@@ -79,8 +79,9 @@













            android:key="top_level_sound"















            android:order="-40"















            android:title="@string/sound_settings"













            android:summary="@string/sound_dashboard_summary"













            settings:highlightableMenuKey="@string/menu_key_sound"/>













            android:summary="@string/sound_dashboard_summary_with_dnd"













            settings:highlightableMenuKey="@string/menu_key_sound"













            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>































        <com.android.settings.widget.RestrictedHomepagePreference















            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"