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

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

Snap for 13135932 from 55153495 to 25Q2-release 

Change-Id: Ie0d910ac493b806091a9d6004d7ba8dbc4225e9f
parents 594f6430 55153495

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -5508,6 +5508,24 @@ 
                       android:value="com.android.settings.applications.contacts.ContactsStorageSettings"/>

        </activity>



        <activity

            android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingJoinHandlerActivity"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:excludeFromRecents="true"

            android:launchMode="singleTop"

            android:permission="android.permission.BLUETOOTH_PRIVILEGED"

            android:taskAffinity="com.android.settings.connecteddevice.audiosharing.AudioSharingJoinHandlerActivity"

            android:theme="@style/Transparent"

            android:exported="false">

            <intent-filter android:priority="1">

                <action android:name="android.settings.AUDIO_SHARING_JOIN_HANDLER" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data

                android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.audiosharing.AudioSharingJoinHandlerDashboardFragment" />

        </activity>



        <service

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"

            android:foregroundServiceType="mediaPlayback"

res/drawable/keyboard_arrow_left.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2025 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal" android:autoMirrored="true">

    <path android:fillColor="@color/settingslib_materialColorPrimary" android:pathData="M560,720L320,480L560,240L616,296L432,480L616,664L560,720Z"/>

</vector>
 
 No newline at end of file

res/drawable/keyboard_arrow_right.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2025 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal" android:autoMirrored="true">

    <path android:fillColor="@color/settingslib_materialColorPrimary" android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z" />

</vector>
 
 No newline at end of file

res/layout/accessibility_text_reading_preview.xml

+40 −13
Original line number Diff line number Diff line
@@ -38,20 +38,47 @@ 
            android:text="@string/screen_zoom_preview_title"

            style="@style/AccessibilityTextReadingPreviewTitle" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <com.android.settings.accessibility.TextReadingPreviewPager

                android:id="@+id/preview_pager"

            android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="217dp"

                android:contentDescription="@string/preview_pager_content_description"

                android:nestedScrollingEnabled="true" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:layout_gravity="center_horizontal"

                android:gravity="center_horizontal">

                <ImageButton

                    android:id="@+id/preview_left_button"

                    android:src="@drawable/keyboard_arrow_left"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_gravity="center_vertical"

                    android:contentDescription="@string/preview_pager_previous_button"

                    style="?android:attr/borderlessButtonStyle" />

                <com.android.settings.widget.DotsPageIndicator

                    android:id="@+id/page_indicator"

                    style="@style/PreviewPagerPageIndicator"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

                    android:layout_gravity="center_vertical"

                    android:padding="6dp"

                    android:visibility="gone" />

                <ImageButton

                    android:id="@+id/preview_right_button"

                    android:src="@drawable/keyboard_arrow_right"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_gravity="center_vertical"

                    android:contentDescription="@string/preview_pager_next_button"

                    style="?android:attr/borderlessButtonStyle" />

            </LinearLayout>

        </LinearLayout>

    </LinearLayout>

</FrameLayout>

res/values/strings.xml

+23 −9
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ 
    <string name="preview_pager_content_description">Preview</string>

    <!-- Content description for qrcode image. [CHAR LIMIT=none]-->

    <string name="qr_code_content_description">QR code</string>

    <!-- Previous button for preview pager. [CHAR LIMIT=NONE] -->

    <string name="preview_pager_previous_button">Previous preview</string>

    <!-- Next button for preview pager. [CHAR LIMIT=NONE] -->

    <string name="preview_pager_next_button">Next preview</string>









    <!-- Description for the button that makes interface elements smaller. [CHAR_LIMIT=NONE] -->









    <string name="font_size_make_smaller_desc">Make smaller</string>








@@ -174,6 +178,12 @@







    <string name="bluetooth_ambient_volume_control_left">Left</string>









    <!-- Connected devices settings. The text to show the control is for right side device. [CHAR LIMIT=30] -->









    <string name="bluetooth_ambient_volume_control_right">Right</string>









    <!-- Connected devices settings. Content description for unified ambient control slider. [CHAR LIMIT=NONE] -->









    <string name="bluetooth_ambient_volume_control_description">Surroundings</string>









    <!-- Connected devices settings. Content description for left ambient control slider. [CHAR LIMIT=NONE] -->









    <string name="bluetooth_ambient_volume_control_left_description">Left surroundings</string>









    <!-- Connected devices settings. Content description for right ambient control slider.. [CHAR LIMIT=NONE] -->









    <string name="bluetooth_ambient_volume_control_right_description">Right surroundings</string>









    <!-- Connected devices settings. Content description for a button, that mute ambient volume [CHAR_LIMIT=NONE] -->









    <string name="bluetooth_ambient_volume_mute">Mute surroundings</string>









    <!-- Connected devices settings. Content description for a button, that unmute ambient volume [CHAR LIMIT=NONE] -->








@@ -521,6 +531,8 @@







    <string name="language_selection_title">Add a language</string>









    <!-- Title for the region picker [CHAR LIMIT=25] -->









    <string name="region_selection_title">Choose a region</string>









    <!-- Title for the numbering system selection screen [CHAR LIMIT=25] -->









    <string name="numbering_system_selection_title">Number System</string>









    <!-- Title for the region selection screen [CHAR LIMIT=25] -->









    <string name="country_selection_title">Region preference</string>









    <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] -->








@@ -536,7 +548,7 @@







    <!-- Message for asking to change system locale region or not. [CHAR LIMIT=50]-->









    <string name="body_change_system_locale_region">Your device will keep <xliff:g id="system_language" example="English">%1$s</xliff:g> as a system language</string>









    <!-- Description for the numbering system language. [CHAR LIMIT=NONE]-->









    <string name="top_intro_numbering_system_title">Most apps will use your regional preferences</string>









    <string name="top_intro_numbering_system_title">Choose how your device, websites, and apps display numbers</string>

















    <!-- Regional Preferences begin -->









    <!-- The title of the menu entry of regional preferences. [CHAR LIMIT=50] -->








@@ -3163,6 +3175,7 @@







    <string name="dark_ui_summary_on_auto_mode_modes">Will turn off when <xliff:g name="modeName" example="Bedtime">%1$s</xliff:g> ends</string>









    <!-- Dark theme screen, description of Dark theme feature. [CHAR LIMIT=NONE] -->









    <string name="dark_ui_text">Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.</string>









    <string name="dark_ui_text_force_invert">Use a dark background to make your screen more comfortable to view and reduce battery usage on some screens. Your theme will change if you have a schedule, when the screen is off.</string>









    <!-- Dark UI screen footer summary text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->









    <string name="dark_ui_bedtime_footer_summary">Dark theme is currently following your Bedtime mode schedule</string>









    <!-- Dark UI screen footer action text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->








@@ -5560,7 +5573,7 @@







    <!-- Title for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=35] -->









    <string name="accessibility_force_invert_title">Make more apps dark</string>









    <!-- Summary for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=100] -->









    <string name="accessibility_force_invert_summary">Automatically convert light theme apps to dark theme</string>









    <string name="accessibility_force_invert_summary">Expands dark theme to more apps. May not work with all apps.</string>









    <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->









    <string name="accessibility_disable_animations">Remove animations</string>









    <!-- Summary for the accessibility preference for disabling animations. [CHAR LIMIT=60] -->








@@ -6981,7 +6994,8 @@ Data usage charges may apply.</string>















    <!-- 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">Learn more</string>









    <!-- Text on the link that lets user learn more about restricted screen timeout options. [CHAR LIMIT=NONE] -->









    <string name="admin_more_details">Learn more about disabled screen timeout options</string>









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

















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








@@ -9315,7 +9329,7 @@ Data usage charges may apply.</string>







    <string name="nls_feature_settings_summary">It can turn Do Not Disturb on or off and change related settings.</string>









    <string name="nls_feature_modes_settings_summary">It can manage and activate Modes, and change related settings.</string>









    <string name="notification_listener_disable_warning_summary">









        If you turn off notification access for <xliff:g id="notification_listener_name">%1$s</xliff:g>, Do Not Disturb access may also be turned off.









        If you turn off notification access for <xliff:g id="notification_listener_name">%1$s</xliff:g>, Do Not Disturb control may also be turned off.









    </string>









    <string name="notification_listener_disable_modes_warning_summary">









        If you turn off notification access for <xliff:g id="notification_listener_name">%1$s</xliff:g>, Modes access may also be turned off.








@@ -9498,14 +9512,14 @@ Data usage charges may apply.</string>







    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->









    <string name="interact_across_profiles_install_app_summary">Tap to get the app</string>

















    <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->









    <string name="manage_zen_access_title">Do Not Disturb access</string>









    <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb control option. [CHAR LIMIT=40] -->









    <string name="manage_zen_access_title">Do Not Disturb control</string>

















    <!-- Button title that grants 'Do Not Disturb' permission to an app [CHAR_LIMIT=60]-->









    <string name="zen_access_detail_switch">Allow Do Not Disturb</string>

















    <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <string name="zen_access_empty_text">No installed apps have requested Do Not Disturb access</string>









    <!-- Sound & notification > Do Not Disturb control > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <string name="zen_access_empty_text">No installed apps have requested Do Not Disturb control</string>

















    <!-- Special App Access: Title for managing Modes access option. [CHAR LIMIT=40] -->









    <string name="manage_zen_modes_access_title">Modes access</string>








@@ -9513,7 +9527,7 @@ Data usage charges may apply.</string>







    <!-- Button title that grants 'Modes' permission to an app [CHAR_LIMIT=60]-->









    <string name="zen_modes_access_detail_switch">Allow Modes access</string>

















    <!-- Special App Access > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <!-- Special App Access > Do Not Disturb control > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <string name="zen_modes_access_empty_text">No installed apps have requested Modes access</string>

















    <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->