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

Merge "[Home Controls] Fix sizing and color of chevron." into tm-dev am: 8f083530de

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

Change-Id: Ic6abf01948c961b6e95bf9339cf1975d45c1e8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-05-12 15:23:35 +00:00
committed by Automerger Merge Worker
parent 7239e76089 8f083530de
commit 805f2dcd63
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/res/drawable/ic_chevron_icon.xml
View File

@@ -15,14 +15,6 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal">
android:width="18dp" <path android:fillColor="@android:color/white" android:pathData="M9.4,18 L8,16.6 12.6,12 8,7.4 9.4,6 15.4,12Z"/>
android:height="31dp" </vector>
android:viewportWidth="18"
android:viewportHeight="31">
<path
android:pathData="M0.0061,27.8986L2.6906,30.5831L17.9219,15.3518L2.6906,0.1206L0.0061,2.8051L12.5338,15.3518"
android:strokeAlpha="0.7"
android:fillColor="#FFFFFF"
android:fillAlpha="0.7"/>
</vector>

8
packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
View File

@@ -472,7 +472,6 @@ class ControlViewHolder(
updateContentDescription() updateContentDescription()
status.setTextColor(color) status.setTextColor(color)
chevronIcon.imageTintList = color
control?.getCustomIcon()?.let { control?.getCustomIcon()?.let {
icon.setImageIcon(it) icon.setImageIcon(it)
@@ -495,10 +494,13 @@ class ControlViewHolder(
icon.imageTintList = color icon.imageTintList = color
} }
} }
chevronIcon.imageTintList = icon.imageTintList
} }
private fun setEnabled(enabled: Boolean) { private fun setEnabled(enabled: Boolean) {
status.setEnabled(enabled) status.isEnabled = enabled
icon.setEnabled(enabled) icon.isEnabled = enabled
chevronIcon.isEnabled = enabled
} }
} }