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

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

Snap for 13070131 from 28f5fbb5 to 25Q2-release 

Change-Id: I7a14c4cb789ffdc88ef529c91d9d00b35ce07263
parents b3b382a3 28f5fbb5

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ android_library { 
        "device_policy_aconfig_flags_lib",

        "keyboard_flags_lib",

        "settings_connectivity_flags",

        "com_android_systemui_flags_lib",

    ],



    plugins: [

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="@android:color/white" 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="@android:color/white" android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z" />

</vector>
 
 No newline at end of file

res/layout/accessibility_text_reading_preview.xml

+38 −13
Original line number Diff line number Diff line
@@ -38,20 +38,45 @@ 
            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"

                    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"

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

            </LinearLayout>

        </LinearLayout>

    </LinearLayout>

</FrameLayout>

res/layout/display_topology_preference.xml

+7 −1
Original line number Diff line number Diff line
@@ -14,13 +14,19 @@ 
     limitations under the License.

-->



<!-- TODO(b/396116157): I cannot find the correct src of ImageView to set to

     match the other preference items. I tried

     @drawable/android:selectable_item_background but this is private so will

     not compile. It should match the other items so that theme migration will

     switch to the correct final color. -->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/display_topology_pane_holder"

    android:importantForAccessibility="no"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:paddingHorizontal="@dimen/display_topology_pane_margin"

    android:layout_marginVertical="@dimen/display_topology_pane_vertical_margin"

    android:layout_marginHorizontal="@dimen/display_topology_pane_margin"

    android:orientation="horizontal">

    <ImageView

        android:importantForAccessibility="no"