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

Commit 54ee888b authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge changes Id3f120db,I02424fc4 

* changes:
  Trigger re-inflation when configuration changed
  Style the Magnification Window - Window Mode Drag
parents b7f7dfa2 922b1a2d

packages/SystemUI/res/drawable/accessibility_window_magnification_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        <shape android:shape="rectangle">

            <corners android:radius="@dimen/magnifier_outer_corner_radius" />

            <stroke

                android:color="@android:color/black"

                android:color="@color/magnification_drag_handle_stroke"

                android:width="@dimen/magnifier_stroke_width"/>

        </shape>

    </item>

packages/SystemUI/res/drawable/accessibility_window_magnification_drag_handle_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <stroke

        android:color="@android:color/black"

        android:color="@color/magnification_drag_handle_stroke"

        android:width="@dimen/magnifier_stroke_width"/>

    <corners android:radius="@dimen/magnifier_corner_radius" />

    <solid android:color="@color/magnification_border_color" />

packages/SystemUI/res/drawable/accessibility_window_magnification_drag_handle_background_change.xml

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

  ~ Copyright (C) 2023 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.

  -->

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

       android:shape="rectangle">

    <stroke

        android:color="@color/magnification_border_color"

        android:width="@dimen/magnifier_stroke_width"/>

    <corners android:radius="@dimen/magnifier_corner_radius" />

    <solid android:color="@color/magnification_drag_handle_background_change" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_magnification_menu_large.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    limitations under the License.

-->

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

    android:width="48dp"

    android:height="48dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

packages/SystemUI/res/drawable/ic_magnification_menu_medium.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    limitations under the License.

-->

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

    android:width="48dp"

    android:height="48dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">