Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(magnification thumbnail): pretty up the thumbnail for better visibility

Browse Source 
Make larger. Make transparent

Fix: 273592063
Test: manual
Change-Id: I1dd25224b419d7559f1abaa614a3accc9a2d138c
This commit is contained in:
Tyler Freeman
2023-03-14 22:46:38 +00:00
parent 3d2226d210
commit eedf5f71e8
8 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/res/res/drawable/accessibility_magnification_thumbnail_background_bg.xml
View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<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" />
<stroke
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>
</item>
</layer-list>

29
core/res/res/drawable/accessibility_magnification_thumbnail_background_fg.xml Normal file
View File

@@ -0,0 +1,29 @@
<?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>

11
core/res/res/drawable/accessibility_magnification_thumbnail_bg.xml
View File

@@ -14,10 +14,13 @@
limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<item>
<shape android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/accessibility_magnification_thumbnail_color" />
<stroke
android:width="2dp"
android:color="@color/accessibility_magnification_thumbnail_stroke_color" />
<corners android:radius="2dp"/>
<solid android:color="@color/accessibility_magnification_thumbnail_background_color" />
</shape>
</item>
</item>
</layer-list>

6
core/res/res/layout/thumbnail_background_view.xml
View File

@@ -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"

7
core/res/res/values/colors.xml
View File

@@ -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>

3
core/res/res/values/dimens.xml
View File

@@ -609,6 +609,9 @@
<!-- padding of fullscreen magnification thumbnail -->
<dimen name="accessibility_magnification_thumbnail_padding">12dp</dimen>
<!-- width of the border of the magnification thumbnail -->
<dimen name="accessibility_magnification_thumbnail_container_stroke_width">4dp</dimen>
<!-- The padding ratio of the Accessibility icon foreground drawable -->
<item name="accessibility_icon_foreground_padding_ratio" type="dimen">21.88%</item>

5
core/res/res/values/symbols.xml
View File

@@ -4510,10 +4510,13 @@
<!-- FullScreenMagnification thumbnail -->
<java-symbol type="layout" name="thumbnail_background_view" />
<java-symbol type="drawable" name="accessibility_magnification_thumbnail_background_bg" />
<java-symbol type="drawable" name="accessibility_magnification_thumbnail_background_fg" />
<java-symbol type="drawable" name="accessibility_magnification_thumbnail_bg" />
<java-symbol type="color" name="accessibility_magnification_thumbnail_stroke_color" />
<java-symbol type="color" name="accessibility_magnification_thumbnail_background_color" />
<java-symbol type="color" name="accessibility_magnification_thumbnail_color" />
<java-symbol type="color" name="accessibility_magnification_thumbnail_container_background_color" />
<java-symbol type="color" name="accessibility_magnification_thumbnail_container_stroke_color" />
<java-symbol type="dimen" name="accessibility_magnification_thumbnail_container_stroke_width" />
<java-symbol type="dimen" name="accessibility_magnification_thumbnail_padding" />
<java-symbol type="id" name="accessibility_magnification_thumbnail_view" />
<!-- Package with global data query permissions for AppSearch -->

7
services/accessibility/java/com/android/server/accessibility/magnification/MagnificationThumbnail.java
View File

@@ -63,7 +63,7 @@ public class MagnificationThumbnail {
private final WindowManager.LayoutParams mBackgroundParams;
private boolean mVisible = false;
private static final float ASPECT_RATIO = 28f;
private static final float ASPECT_RATIO = 14f;
private static final float BG_ASPECT_RATIO = ASPECT_RATIO / 2f;
private ObjectAnimator mThumbNailAnimator;
@@ -261,9 +261,10 @@ public class MagnificationThumbnail {
mThumbNailView.setScaleY(scaleDown);
}
if (!Float.isNaN(centerX)) {
var padding = mThumbNailView.getPaddingTop();
var ratio = 1f / BG_ASPECT_RATIO;
var centerXScaled = centerX * ratio - mThumbNailView.getWidth() / 2f;
var centerYScaled = centerY * ratio - mThumbNailView.getHeight() / 2f;
var centerXScaled = centerX * ratio - (mThumbNailView.getWidth() / 2f + padding);
var centerYScaled = centerY * ratio - (mThumbNailView.getHeight() / 2f + padding);
if (DEBUG) {
Log.d(