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

Merge "Improve caption layout" into tm-qpr-dev

Browse Source
This commit is contained in:
Ats Jenk
2022-10-17 19:39:17 +00:00
committed by Android (Google) Code Review
parent 88c9f3af10 2b6902c91c
commit 1de186f84a
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/res/drawable/decor_back_button_dark.xml
View File

@@ -22,8 +22,8 @@
>
<group android:scaleX="0.5"
android:scaleY="0.5"
android:translateX="8.0"
android:translateY="8.0" >
android:translateX="4.0"
android:translateY="4.0" >
<path
android:fillColor="@android:color/black"
android:pathData="MM24,40.3 L7.7,24 24,7.7 26.8,10.45 15.3,22H40.3V26H15.3L26.8,37.5Z"/>

1
libs/WindowManager/Shell/res/drawable/decor_caption_title.xml
View File

@@ -17,4 +17,5 @@
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/white" />
<corners android:radius="20dp" />
</shape>

4
libs/WindowManager/Shell/res/drawable/decor_close_button_dark.xml
View File

@@ -21,8 +21,8 @@
android:viewportHeight="32.0">
<group android:scaleX="0.5"
android:scaleY="0.5"
android:translateX="8.0"
android:translateY="8.0" >
android:translateX="4.0"
android:translateY="4.0" >
<path
android:fillColor="@android:color/black"
android:pathData="M12.45,38.35 L9.65,35.55 21.2,24 9.65,12.45 12.45,9.65 24,21.2 35.55,9.65 38.35,12.45 26.8,24 38.35,35.55 35.55,38.35 24,26.8Z"/>

6
libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml
View File

@@ -18,6 +18,8 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black" android:pathData="M3,5V3H21V5Z"/>
<group android:translateY="8.0">
<path
android:fillColor="@android:color/black" android:pathData="M3,5V3H21V5Z"/>
</group>
</vector>

2
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java
View File

@@ -218,7 +218,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL
View handle = caption.findViewById(R.id.caption_handle);
VectorDrawable handleBackground = (VectorDrawable) handle.getBackground();
handleBackground.setTintList(buttonTintColor);
caption.setBackgroundColor(v == View.VISIBLE ? Color.WHITE : Color.TRANSPARENT);
caption.getBackground().setTint(v == View.VISIBLE ? Color.WHITE : Color.TRANSPARENT);
}
private void closeDragResizeListener() {