Merge "Update BiometricPrompt colors" into qt-dev (09688e30) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/face_dialog_dark_to_checkmark.xml

+11 −11

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@
		<path
		android:name="_R_G_L_0_G_D_0_P_0"
		android:fillAlpha="0"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 "
		android:trimPathStart="0"
		@@ -58,7 +58,7 @@
		android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 "
		android:strokeWidth="20"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="0"
		android:trimPathOffset="0" />
		@@ -68,7 +68,7 @@
		android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "
		android:strokeWidth="2.5"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -85,7 +85,7 @@
		android:pathData=" M4.71 1.1 C3.71,2.12 2.32,2.75 0.79,2.75 C-2.25,2.75 -4.7,0.29 -4.7,-2.75 "
		android:strokeWidth="2"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -99,7 +99,7 @@
		<path
		android:name="_R_G_L_0_G_D_4_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -112,7 +112,7 @@
		<path
		android:name="_R_G_L_0_G_D_5_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -125,7 +125,7 @@
		<path
		android:name="_R_G_L_0_G_D_6_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " />
		</group>
		@@ -386,8 +386,8 @@
		android:duration="67"
		android:propertyName="strokeColor"
		android:startOffset="0"
		android:valueFrom="?android:attr/colorAccent"
		android:valueTo="?android:attr/colorAccent"
		android:valueFrom="@color/biometric_dialog_accent"
		android:valueTo="@color/biometric_dialog_accent"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -397,8 +397,8 @@
		android:duration="17"
		android:propertyName="strokeColor"
		android:startOffset="67"
		android:valueFrom="?android:attr/colorAccent"
		android:valueTo="?android:attr/colorAccent"
		android:valueFrom="@color/biometric_dialog_accent"
		android:valueTo="@color/biometric_dialog_accent"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />

packages/SystemUI/res/drawable/face_dialog_dark_to_error.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "
		android:strokeWidth="2.5"
		android:strokeAlpha="1"
		android:strokeColor="@color/biometric_face_icon_gray"
		android:strokeColor="@color/biometric_dialog_gray"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -45,7 +45,7 @@
		android:pathData=" M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 "
		android:strokeWidth="2"
		android:strokeAlpha="1"
		android:strokeColor="@color/biometric_face_icon_gray"
		android:strokeColor="@color/biometric_dialog_gray"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -58,7 +58,7 @@
		<path
		android:name="_R_G_L_0_G_D_2_P_0"
		android:fillAlpha="1"
		android:fillColor="@color/biometric_face_icon_gray"
		android:fillColor="@color/biometric_dialog_gray"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -71,7 +71,7 @@
		<path
		android:name="_R_G_L_0_G_D_3_P_0"
		android:fillAlpha="1"
		android:fillColor="@color/biometric_face_icon_gray"
		android:fillColor="@color/biometric_dialog_gray"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -82,7 +82,7 @@
		<path
		android:name="_R_G_L_0_G_D_4_P_0"
		android:fillAlpha="1"
		android:fillColor="@color/biometric_face_icon_gray"
		android:fillColor="@color/biometric_dialog_gray"
		android:fillType="nonZero"
		android:pathData=" M2.6 3.25 C2.6,3.25 -2.6,3.25 -2.6,3.25 C-2.6,3.25 -2.6,1.25 -2.6,1.25 C-2.6,1.25 0.6,1.25 0.6,1.25 C0.6,1.25 0.6,-3.25 0.6,-3.25 C0.6,-3.25 2.6,-3.25 2.6,-3.25 C2.6,-3.25 2.6,3.25 2.6,3.25c " />
		</group>
		@@ -99,8 +99,8 @@
		android:duration="50"
		android:propertyName="strokeColor"
		android:startOffset="0"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -110,8 +110,8 @@
		android:duration="17"
		android:propertyName="strokeColor"
		android:startOffset="50"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -127,8 +127,8 @@
		android:duration="50"
		android:propertyName="strokeColor"
		android:startOffset="0"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -138,8 +138,8 @@
		android:duration="17"
		android:propertyName="strokeColor"
		android:startOffset="50"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -369,8 +369,8 @@
		android:duration="50"
		android:propertyName="fillColor"
		android:startOffset="0"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -380,8 +380,8 @@
		android:duration="17"
		android:propertyName="fillColor"
		android:startOffset="50"
		android:valueFrom="@color/biometric_face_icon_gray"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_gray"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />

packages/SystemUI/res/drawable/face_dialog_error_to_idle.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "
		android:strokeWidth="2.5"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorError"
		android:strokeColor="@color/biometric_dialog_error"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -38,7 +38,7 @@
		android:pathData=" M34.78 38.76 C33.83,38.75 31.54,38.75 30.01,38.75 C26.97,38.75 26.14,38.75 24.3,38.76 "
		android:strokeWidth="2.5"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorError"
		android:strokeColor="@color/biometric_dialog_error"
		android:trimPathStart="0.34"
		android:trimPathEnd="0.5700000000000001"
		android:trimPathOffset="0" />
		@@ -51,7 +51,7 @@
		<path
		android:name="_R_G_L_0_G_D_2_P_0"
		android:fillAlpha="0"
		android:fillColor="@color/biometric_face_icon_gray"
		android:fillColor="@color/biometric_dialog_gray"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.1,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -64,7 +64,7 @@
		<path
		android:name="_R_G_L_0_G_D_3_P_0"
		android:fillAlpha="0"
		android:fillColor="@color/biometric_face_icon_gray"
		android:fillColor="@color/biometric_dialog_gray"
		android:fillType="nonZero"
		android:pathData=" M-2.1 0 C-2.1,1.2 -1.2,2.1 0,2.1 C1.2,2.1 2.1,1.2 2.1,0 C2.1,-1.2 1.2,-2.1 0,-2.1 C-1.2,-2.1 -2.1,-1.2 -2.1,0c " />
		</group>
		@@ -75,7 +75,7 @@
		<path
		android:name="_R_G_L_0_G_D_4_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorError"
		android:fillColor="@color/biometric_dialog_error"
		android:fillType="nonZero"
		android:pathData=" M0.9 3.25 C0.9,3.25 -1.5,3.25 -1.5,3.25 C-1.5,3.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,1.25 -1.5,1.25 C-1.5,1.25 -1.5,-11.71 -1.5,-11.71 C-1.5,-11.71 0.9,-11.71 0.9,-11.71 C0.9,-11.71 0.9,3.25 0.9,3.25c " />
		</group>
		@@ -91,8 +91,8 @@
		android:duration="83"
		android:propertyName="strokeColor"
		android:startOffset="0"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -102,8 +102,8 @@
		android:duration="17"
		android:propertyName="strokeColor"
		android:startOffset="83"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -119,8 +119,8 @@
		android:duration="83"
		android:propertyName="strokeColor"
		android:startOffset="0"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -130,8 +130,8 @@
		android:duration="17"
		android:propertyName="strokeColor"
		android:startOffset="83"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -427,8 +427,8 @@
		android:duration="83"
		android:propertyName="fillColor"
		android:startOffset="0"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="?android:attr/colorError"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_error"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		@@ -438,8 +438,8 @@
		android:duration="17"
		android:propertyName="fillColor"
		android:startOffset="83"
		android:valueFrom="?android:attr/colorError"
		android:valueTo="@color/biometric_face_icon_gray"
		android:valueFrom="@color/biometric_dialog_error"
		android:valueTo="@color/biometric_dialog_gray"
		android:valueType="colorType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />

packages/SystemUI/res/drawable/face_dialog_pulse_dark_to_light.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "
		android:strokeWidth="2.5"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -27,26 +27,26 @@
		android:pathData=" M33.75 42.75 C32.75,43.77 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 "
		android:strokeWidth="2"
		android:strokeAlpha="1"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		<path
		android:name="_R_G_L_0_G_D_2_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M39 23.8 C39,25 39.9,25.9 41.1,25.9 C42.2,25.9 43.2,25 43.2,23.8 C43.2,22.6 42.3,21.7 41.1,21.7 C39.9,21.7 39,22.6 39,23.8c " />
		<path
		android:name="_R_G_L_0_G_D_3_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M16.5 23.8 C16.5,25 17.4,25.9 18.6,25.9 C19.8,25.9 20.7,25 20.7,23.8 C20.7,22.6 19.8,21.7 18.6,21.7 C17.4,21.7 16.5,22.6 16.5,23.8c " />
		<path
		android:name="_R_G_L_0_G_D_4_P_0"
		android:fillAlpha="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M33.33 34.95 C33.33,34.95 28.13,34.95 28.13,34.95 C28.13,34.95 28.13,32.95 28.13,32.95 C28.13,32.95 31.33,32.95 31.33,32.95 C31.33,32.95 31.33,28.45 31.33,28.45 C31.33,28.45 33.33,28.45 33.33,28.45 C33.33,28.45 33.33,34.95 33.33,34.95c " />
		</group>

packages/SystemUI/res/drawable/face_dialog_pulse_light_to_dark.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "
		android:strokeWidth="2.5"
		android:strokeAlpha="0.5"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		@@ -27,26 +27,26 @@
		android:pathData=" M33.75 42.75 C32.75,43.77 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 "
		android:strokeWidth="2"
		android:strokeAlpha="0.5"
		android:strokeColor="?android:attr/colorAccent"
		android:strokeColor="@color/biometric_dialog_accent"
		android:trimPathStart="0"
		android:trimPathEnd="1"
		android:trimPathOffset="0" />
		<path
		android:name="_R_G_L_0_G_D_2_P_0"
		android:fillAlpha="0.5"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M39 23.8 C39,25 39.9,25.9 41.1,25.9 C42.2,25.9 43.2,25 43.2,23.8 C43.2,22.6 42.3,21.7 41.1,21.7 C39.9,21.7 39,22.6 39,23.8c " />
		<path
		android:name="_R_G_L_0_G_D_3_P_0"
		android:fillAlpha="0.5"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M16.5 23.8 C16.5,25 17.4,25.9 18.6,25.9 C19.8,25.9 20.7,25 20.7,23.8 C20.7,22.6 19.8,21.7 18.6,21.7 C17.4,21.7 16.5,22.6 16.5,23.8c " />
		<path
		android:name="_R_G_L_0_G_D_4_P_0"
		android:fillAlpha="0.5"
		android:fillColor="?android:attr/colorAccent"
		android:fillColor="@color/biometric_dialog_accent"
		android:fillType="nonZero"
		android:pathData=" M33.33 34.95 C33.33,34.95 28.13,34.95 28.13,34.95 C28.13,34.95 28.13,32.95 28.13,32.95 C28.13,32.95 31.33,32.95 31.33,32.95 C31.33,32.95 31.33,28.45 31.33,28.45 C31.33,28.45 33.33,28.45 33.33,28.45 C33.33,28.45 33.33,34.95 33.33,34.95c " />
		</group>