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

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

Snap for 13204655 from 67b21fb2 to 25Q2-release 

Change-Id: I14e3b84b0d79c7a1aa38226e732171a517a0a95b
parents e6db3bfd 67b21fb2

Android.bp

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

        "aconfig_settingslib_flags",

        "android.app.flags-aconfig",

        "android.app.supervision.flags-aconfig",

        "android.provider.flags-aconfig",

        "android.security.flags-aconfig",

        "android.view.contentprotection.flags-aconfig",

AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -2817,6 +2817,15 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".supervision.ConfirmSupervisionCredentialsActivity"

            android:exported="true"

            android:featureFlag="android.app.supervision.flags.supervision_manager_apis">

            <intent-filter>

                <action android:name="android.app.supervision.action.CONFIRM_SUPERVISION_CREDENTIALS" />

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

            </intent-filter>

        </activity>



        <activity android:name=".SetupRedactionInterstitial"

            android:enabled="false"

            android:exported="true"

aconfig/settings_desktop_flag_declarations.aconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system_ext"



flag {

    name: "settings_search_result_deep_link_in_same_task"

    namespace: "desktop_personalization"

    description: "Show the search result deep link in the same task (same window)"

    bug: "381127948"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

res/layout/dialog_keyboard_a11y_input_setting_keys.xml

+30 −12
Original line number Diff line number Diff line
@@ -122,20 +122,38 @@ 
                        android:layout_gravity="center_vertical"

                        android:layout_marginTop="8dp"

                        android:visibility="gone"/>

                    <LinearLayout

                        android:id="@+id/input_setting_keys_custom_seekbar_layout"

                        android:orientation="horizontal"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_horizontal"

                        android:gravity="center_vertical"

                        android:paddingEnd="36dp">

                        <ImageView

                            android:layout_marginTop="8dp"

                            android:layout_width="16dp"

                            android:layout_height="16dp"

                            android:tint="@androidprv:color/materialColorPrimary"

                            android:importantForAccessibility="no"

                            android:src="@drawable/ic_remove_24dp" />

                        <SeekBar

                            android:id="@+id/input_setting_keys_value_custom_slider"

                        android:paddingStart="8dp"

                        android:paddingEnd="36dp"

                            style="@android:style/Widget.Material.SeekBar"

                            android:min="1"

                            android:max="50"

                        android:progressBackgroundTint="@color/input_dialog_slider_progress_background"

                        android:progressTint="@color/input_dialog_slider_progress"

                        android:thumbTint="@color/input_dialog_slider_progress"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:layout_gravity="center_vertical"

                            android:layout_marginTop="8dp" />

                        <ImageView

                            android:layout_marginTop="8dp"

                        android:visibility="gone"/>

                            android:layout_width="16dp"

                            android:layout_height="16dp"

                            android:tint="@androidprv:color/materialColorPrimary"

                            android:importantForAccessibility="no"

                            android:src="@drawable/ic_add_24dp" />

                    </LinearLayout>

                </LinearLayout>

            </LinearLayout>

        </RadioGroup>

res/values-night/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -94,8 +94,5 @@ 
    <!-- Volume seekbar colors -->

    <color name="seekbar_thumb_tint_color">@android:color/system_accent1_100</color>

    <color name="seekbar_progress_tint_color">@android:color/system_accent1_100</color>



    <!-- Keyboard a11y input dialog -->

    <color name="input_dialog_slider_progress">@android:color/system_on_primary_container_dark</color>

</resources>