Commit Graph

29547 Commits

Author SHA1 Message Date
Milton Wu
8e42d7c85a [BiometricsV2] Refactor Fingerprint intro fragment
Refactor FingerprintEnrollIntroFragment to kotlin and add bindView()
method for it.

Bug: 286197823
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I44157bf2c2bea6f49382335438b16aae3e3e5b4c
2023-06-17 18:16:17 +08:00
Chaohui Wang
f355bc2e01 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:24:26 +00:00
Chaohui Wang
78981afdc2 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 08:40:02 +00:00
Lifu Tang
5ef1e90b53 Update location settings status text to use slash
This change is to comply with the new UX guideline that requires the
punctuation used after "On" or "Off" state to be a slash instead of a
dash.

Bug: 259364228
Test: manual.
Change-Id: I0e63fd66aa6f4479a6f0c6e5a58d3e0f9b5b10e9
2023-06-15 13:58:51 -07:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Rhed Jao
07f9d1ccbe Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:19:57 +00:00
Rhed Jao
721a7bacaa Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:34:53 +00:00
Rhed Jao
e1c9d65cda Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev 2023-06-15 04:55:45 +00:00
Rhed Jao
b7a4a7daa4 [Settings] Add a verification flow for exiting repair mode
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
      settings put global repair_mode_active 1
      am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
      The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
2023-06-15 02:14:41 +00:00
Hao Dong
9e1435a0dc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de am: a9f1ed3501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev 2023-06-15 01:22:22 +00:00
Bill Yi
e689c94435 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-14 13:21:34 +00:00
Bill Yi
bf7dfbc5fe Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-14 13:21:34 +00:00
TreeHugger Robot
3b89844e7f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-13 19:58:54 +00:00
Bill Yi
c1407e61f1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If3945f0ac9f4368b2cd50e66554accadc49e31ed
2023-06-13 01:00:54 -07:00
Bill Yi
1b3fa16402 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0491470fdf46e7b84b67fc3b8c10ba02af05b25d
2023-06-13 00:58:29 -07:00
Bill Yi
8430cda6d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85702c2b4ddd2485683d5bb16bed43244e70022b
2023-06-13 00:56:19 -07:00
Bill Yi
daea733ce1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71ab2f9c50e9d2c3af6f9005a69e01271e8ef2cc
2023-06-13 00:55:08 -07:00
Han Xu
fc05f6766e Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:53:23 +00:00
Han Xu
e319c686e7 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:24 +00:00
Han Xu
24fc0d6744 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:18 +00:00
Han Xu
1a9a892ff3 Add manufactured year into hardware info page am: b452bc9f9d am: eefb4e777d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:10 +00:00
Han Xu
eefb4e777d Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I75182c66daf65a4b48cfe7a66fb67cbbfba74b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:43:48 +00:00
Han Xu
15da26329f Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:43:44 +00:00
Han Xu
b452bc9f9d Add manufactured year into hardware info page
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Jason Hsu
82bc64d4ee Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icc2928b5a74fdad3390dc89d43fe8c4604344d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:29:34 +00:00
Jason Hsu
bab462f1d6 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Id50ea2a480c6d674a77764e285642f2087df9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:52:00 +00:00
Jason Hsu
50ac77ebfe Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia74f7630061811583ba8b9c94ca79598593292e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:50:10 +00:00
Jason Hsu
51f58b5933 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 842eda9339
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I537ba7aa4f9e74cd8a8303859f0028aa949ea640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:49:58 +00:00
Jason Hsu
3608d5bf18 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia809e0cc8fa6e1503496e9ae7cbbeda5300d6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:19:35 +00:00
Jason Hsu
842eda9339 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I46a25dd5193e7077a3122e8c1bfa94131cd62ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:19:33 +00:00
Jason Hsu
fecfa96723 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev 2023-06-12 03:54:11 +00:00
Mady Mellor
0be0c80a7c Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: f55de6cdd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I522e268341ca3b7bab8cab7be5ca736ebaeb3c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:43:43 +00:00
Oli Thompson
1a883223d2 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: ca697c000a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ic85a04f5844fe373393a0811e07f553f83722827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:42:40 +00:00
Mady Mellor
50cacfcc1e Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I55c42684f0af8cbcc8550d0b2491b7b132ab490d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:03:03 +00:00
Oli Thompson
f35b1be8ac Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:02:43 +00:00
Mady Mellor
ebfa483008 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: d219333161
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9e9b9fb1e07d65903b7e5482d1068df3fff5b5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 17:00:25 +00:00
Oli Thompson
e20d5d34f8 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: 03bd83270a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I8f3631be2dc924fe8cf61278ccc6c2b9547c1629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:59:57 +00:00
Mady Mellor
f55de6cdd1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9b9c6a097b60c2a08c5f69b6b3c02beb73bbeb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:59:18 +00:00
Oli Thompson
ca697c000a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ifcde9f0a8fc75fc01909771df880f2b6ee70dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:58:49 +00:00
Mady Mellor
d219333161 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: Icd172f86a9893c0733b5ed5791c7e7017dd227d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:17:58 +00:00
Mady Mellor
0399987aa1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9ba9a9b9a7fb9ba79d5b3f28a4627f28937eb7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:17:46 +00:00
Oli Thompson
03bd83270a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: If1f8a496fc6fec8419619d9c399bddb21bfcc232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:17:41 +00:00
Oli Thompson
e86146d685 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I7aa48065cbc087ff4135a93983e3b32b97dc6204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:16:59 +00:00
Mady Mellor
57406435cf Merge "Update the colors for bubbles settings based on new spec" into udc-dev 2023-06-09 15:33:30 +00:00
Oli Thompson
01b382546e Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev 2023-06-09 15:31:17 +00:00
Oli Thompson
dcce8fa662 Fix emergency button not visible on pattern work challenge screen
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing

Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Zoey Chen
943d6e1c9b Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev am: 593028ca32 am: db4bede383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23615216

Change-Id: Ia07c39769f77ed05dab029a8cedf57f1008402ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:34:21 +00:00