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

Commit b6b15818 authored by Tyler Freeman's avatar Tyler Freeman Committed by Automerger Merge Worker
Browse files

Merge "fix(magnification thumbnail): pretty up the thumbnail for better... 

Merge "fix(magnification thumbnail): pretty up the thumbnail for better visibility" into udc-dev am: ffc35a3e

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



Change-Id: I067b1a030d41dfcc43ecf929470885a02a3f9546
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19392b77 ffc35a3e

core/res/res/drawable/accessibility_magnification_thumbnail_background_bg.xml

+7 −7
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
  <item>

    <shape android:shape="rectangle">

      <stroke

            android:width="1dp"

            android:color="@color/accessibility_magnification_thumbnail_stroke_color" />

        <corners android:radius="4dp"/>

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

          android:width="@dimen/accessibility_magnification_thumbnail_container_stroke_width"

          android:color="@color/accessibility_magnification_thumbnail_container_stroke_color" />

      <corners android:radius="8dp"/>

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

    </shape>

  </item>

</layer-list>

core/res/res/drawable/accessibility_magnification_thumbnail_background_fg.xml

0 → 100644
+29 −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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item>

    <shape android:shape="rectangle">

      <!-- We draw the border as a foreground too so the thumbnail doesn't encroach and overlap

          the rounded corners.

          We also draw it on the background, otherwise you can see a tiny bit of the black fill

          poking out around the white border. -->

      <stroke

          android:width="@dimen/accessibility_magnification_thumbnail_container_stroke_width"

          android:color="@color/accessibility_magnification_thumbnail_container_stroke_color" />

      <corners android:radius="8dp"/>

    </shape>

  </item>

</layer-list>

core/res/res/drawable/accessibility_magnification_thumbnail_bg.xml

+7 −4
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item>

    <shape android:shape="rectangle">

      <stroke

          android:width="2dp"

          android:color="@color/accessibility_magnification_thumbnail_stroke_color" />

      <corners android:radius="2dp"/>

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

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

    </shape>

  </item>

</layer-list>

core/res/res/layout/thumbnail_background_view.xml

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/accessibility_magnification_thumbnail_background_bg">

    android:background="@drawable/accessibility_magnification_thumbnail_background_bg"

    android:foreground="@drawable/accessibility_magnification_thumbnail_background_fg"

    android:padding="@dimen/accessibility_magnification_thumbnail_container_stroke_width"

>

    <View

        android:padding="@dimen/accessibility_magnification_thumbnail_container_stroke_width"

        android:id="@+id/accessibility_magnification_thumbnail_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

core/res/res/values/colors.xml

+4 −3
Original line number Diff line number Diff line
@@ -557,9 +557,10 @@ 
    <color name="accessibility_color_inversion_background">#546E7A</color>



    <!-- Fullscreen magnification thumbnail color -->

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

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

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

    <color name="accessibility_magnification_thumbnail_stroke_color">#0C0C0C</color>

    <color name="accessibility_magnification_thumbnail_background_color">#B3FFFFFF</color>

    <color name="accessibility_magnification_thumbnail_container_background_color">#99000000</color>

    <color name="accessibility_magnification_thumbnail_container_stroke_color">#FFFFFF</color>



    <!-- Color of camera light when camera is in use -->

    <color name="camera_privacy_light_day">#FFFFFF</color>