summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author lbill <lbill@google.com> 2022-06-07 07:27:05 +0000
committer lbill <lbill@google.com> 2022-08-01 17:58:56 +0000
commitb021157176e5210e8d50b93b782e495718f7f8ad (patch)
tree230adfa06bdc72d9dad21a327161836ae5d3a52d
parenta7457a15a43cd3f3bc904c1134c08cf3a78f0f0c (diff)
Customize input field style for Auth Credential ImeAwareEditText
There are differnt UI between Settings & framework biometric 1. [SysUI] AuthCredentialPasswordView.java 2. [Settings ]ConfirmLockPassword Due to framework sysui do not include androidx material design lib TextInputLayout, but Settings does through SUW lib, the input field UI looks quite different. We try to customize a 9patch drawable to looks like filled style input layout. Bug: 230698721 Test: Settings > Passwords & accounts > add or remove account Test: Settings > Security > Fingerprint Test: atest SystemUITests Change-Id: If22a5624471ced22faa6d068ab08116aa61709bf
-rw-r--r--packages/SystemUI/res/drawable-hdpi/textfield_default_filled.9.pngbin0 -> 5959 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/textfield_default_filled.9.pngbin0 -> 5927 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/textfield_default_filled.9.pngbin0 -> 5781 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/textfield_default_filled.9.pngbin0 -> 5843 bytes
-rw-r--r--packages/SystemUI/res/drawable/edit_text_filled.xml36
-rw-r--r--packages/SystemUI/res/values/styles.xml1
6 files changed, 37 insertions, 0 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/textfield_default_filled.9.png b/packages/SystemUI/res/drawable-hdpi/textfield_default_filled.9.png
new file mode 100644
index 000000000000..3dd997fade6c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/textfield_default_filled.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/textfield_default_filled.9.png b/packages/SystemUI/res/drawable-mdpi/textfield_default_filled.9.png
new file mode 100644
index 000000000000..80aba01091fe
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/textfield_default_filled.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/textfield_default_filled.9.png b/packages/SystemUI/res/drawable-xhdpi/textfield_default_filled.9.png
new file mode 100644
index 000000000000..b3f89ed7ea7a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/textfield_default_filled.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/textfield_default_filled.9.png b/packages/SystemUI/res/drawable-xxhdpi/textfield_default_filled.9.png
new file mode 100644
index 000000000000..efa2cb988ac1
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xxhdpi/textfield_default_filled.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/edit_text_filled.xml b/packages/SystemUI/res/drawable/edit_text_filled.xml
new file mode 100644
index 000000000000..cca34d456078
--- /dev/null
+++ b/packages/SystemUI/res/drawable/edit_text_filled.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetLeft="4dp"
+ android:insetRight="4dp"
+ android:insetTop="10dp"
+ android:insetBottom="10dp">
+ <selector>
+ <item android:state_enabled="false">
+ <nine-patch android:src="@drawable/textfield_default_filled"
+ android:tint="?android:attr/colorControlNormal" />
+ </item>
+ <item android:state_pressed="false" android:state_focused="false">
+ <nine-patch android:src="@drawable/textfield_default_filled"
+ android:tint="?android:attr/colorControlNormal" />
+ </item>
+ <item>
+ <nine-patch android:src="@drawable/textfield_default_filled"
+ android:tint="?android:attr/colorControlActivated" />
+ </item>
+ </selector>
+</inset>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 22279785a773..33b5a9611f76 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -230,6 +230,7 @@
<item name="android:singleLine">true</item>
<item name="android:textColor">?android:attr/colorForeground</item>
<item name="android:textSize">24sp</item>
+ <item name="android:background">@drawable/edit_text_filled</item>
</style>
<style name="AuthCredentialHeaderStyle">