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

Commit 87567f86 authored by Candice Lo's avatar Candice Lo Committed by Automerger Merge Worker
Browse files

Merge "Style the Magnification Window - Window Mode Drag" into udc-dev am: 529d82eb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779985



Change-Id: I562622f5efd3f4df45feb974b466dce7d0d7576e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c41a9f6 529d82eb

packages/SystemUI/res/drawable/accessibility_window_magnification_background.xml

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

        <shape android:shape="rectangle">

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

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

            <stroke

            <stroke

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

                android:color="@color/magnification_drag_handle_stroke"

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

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

        </shape>

        </shape>

    </item>

    </item>

packages/SystemUI/res/drawable/accessibility_window_magnification_drag_handle_background.xml

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

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

       android:shape="rectangle">

       android:shape="rectangle">

    <stroke

    <stroke

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

        android:color="@color/magnification_drag_handle_stroke"

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

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

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

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

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

    <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 Original line 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_move_magnification.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,6 @@ 
    android:viewportHeight="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

    android:tint="?attr/colorControlNormal">

  <path

  <path

      android:fillColor="@color/magnification_drag_handle_tint"

      android:fillColor="@color/magnification_drag_handle_stroke"

      android:pathData="M12,15Q10.75,15 9.875,14.125Q9,13.25 9,12Q9,10.75 9.875,9.875Q10.75,9 12,9Q13.25,9 14.125,9.875Q15,10.75 15,12Q15,13.25 14.125,14.125Q13.25,15 12,15ZM12,22 L7.75,17.75 9.15,16.35 12,19.15 14.85,16.35 16.25,17.75ZM6.25,16.25 L2,12 6.25,7.75 7.65,9.15 4.85,12 7.65,14.85ZM9.15,7.65 L7.75,6.25 12,2 16.25,6.25 14.85,7.65 12,4.85ZM17.75,16.25 L16.35,14.85 19.15,12 16.35,9.15 17.75,7.75 22,12Z"/>

      android:pathData="M12,15Q10.75,15 9.875,14.125Q9,13.25 9,12Q9,10.75 9.875,9.875Q10.75,9 12,9Q13.25,9 14.125,9.875Q15,10.75 15,12Q15,13.25 14.125,14.125Q13.25,15 12,15ZM12,22 L7.75,17.75 9.15,16.35 12,19.15 14.85,16.35 16.25,17.75ZM6.25,16.25 L2,12 6.25,7.75 7.65,9.15 4.85,12 7.65,14.85ZM9.15,7.65 L7.75,6.25 12,2 16.25,6.25 14.85,7.65 12,4.85ZM17.75,16.25 L16.35,14.85 19.15,12 16.35,9.15 17.75,7.75 22,12Z"/>

</vector>
 
</vector>

packages/SystemUI/res/values/colors.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -163,8 +163,8 @@ 
    <color name="magnification_border_color">#F29900</color>

    <color name="magnification_border_color">#F29900</color>

    <color name="magnification_switch_button_color">#7F000000</color>

    <color name="magnification_switch_button_color">#7F000000</color>

    <color name="magnification_drag_corner_background">#E5FFFFFF</color>

    <color name="magnification_drag_corner_background">#E5FFFFFF</color>

    <color name="magnification_drag_handle_color">#B3000000</color>

    <color name="magnification_drag_handle_stroke">#000000</color>

    <color name="magnification_drag_handle_tint">#111111</color>

    <color name="magnification_drag_handle_background_change">#111111</color>

    <color name="accessibility_magnifier_bg">#FCFCFC</color>

    <color name="accessibility_magnifier_bg">#FCFCFC</color>

    <color name="accessibility_magnifier_bg_stroke">#E0E0E0</color>

    <color name="accessibility_magnifier_bg_stroke">#E0E0E0</color>

    <color name="accessibility_magnifier_icon_color">#252525</color>

    <color name="accessibility_magnifier_icon_color">#252525</color>