Commit Graph

114912 Commits

Author SHA1 Message Date
Chaohui Wang
92c5ef7a89 Navigate to Install unknown apps in SPA
Guarded by feature flag SETTINGS_ENABLE_SPA, default false.
When flag enabled, will navigate to the new "Install unknown apps" page
which is implemented by SPA.

Bug: 235727273
Test: Manual test with Settings app
Change-Id: Ife038e4b2b23520f6cc46075a6bae6282f11f1af
2022-08-31 06:03:06 +00:00
Chaohui Wang
046ea61cf0 Merge "Add SpaLib for Settings" 2022-08-31 05:25:26 +00:00
Jason Chiu
f53c8be271 Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da28893958 am: f9baa40744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356

Change-Id: I5593f67b9fcc0e2168dbaf8abf4b64447debc093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 03:29:20 +00:00
Jason Chiu
f9baa40744 Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da28893958
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356

Change-Id: I583f5c78e43b2b76405e2e7dc1f1794bf1c69cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:59:48 +00:00
Jason Chiu
da28893958 Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev 2022-08-31 02:19:07 +00:00
Bill Yi
bfb7760c6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 82a71299f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I953eaa1e505d0abdc8efbb70b32ad03742814424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:16:09 +00:00
Bill Yi
7ff71d263d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: 51807dac75 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: Ib68ff951ae60c8d50a8e197e8fd539a6642aeaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:16:00 +00:00
Bill Yi
93f0d41f27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: cce6207801 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I03da9403342adf5f45846fa7acb2d5cde3d3c789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:15:46 +00:00
Bill Yi
7b899106d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 9a94a6d844 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I7bfa1add778a712ff7ff4604d7543d0d6272de82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:15:35 +00:00
TreeHugger Robot
5dc2dce4d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3ed0987f48 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739233

Change-Id: I25e0229af6339ce1fd8631c0de05bb67d1c36a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:14:10 +00:00
TreeHugger Robot
13c7b1afa9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 664d68cb05 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19737811

Change-Id: Id1c7c88ee7b4458240901d8e2fa4923f1d95b988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:12:23 +00:00
Joe Bolinger
ef10dfc797 Merge "Add product variants for unicorn strings." 2022-08-31 01:37:56 +00:00
Joseph Oh
f3bfcb9c0a Import translations. DO NOT MERGE ANYWHERE
Change-Id: I529e96d2788a36231146e9bd004ac3eeccd88e5d
Bug: 244360697
2022-08-30 22:43:42 +00:00
Joe Bolinger
185b868808 Add product variants for unicorn strings.
Bug: 243897496
Test: N/A
Change-Id: Iac80e0aefe7a45603217e50b9b177b28329632e8
2022-08-30 22:13:00 +00:00
Austin Delgado
6c5b859da2 Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967 am: 71b2bb8f5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: Ifdefdaadcc36b326ac498eed1cca79e1574cb2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:06:53 +00:00
Austin Delgado
71b2bb8f5c Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:37:21 +00:00
Austin Delgado
bbcdc91967 Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev 2022-08-30 17:15:49 +00:00
Omer Osman
5d78a3aac6 Merge "Update Opus over A2DP to use BluetoothCodecConfig api" 2022-08-30 16:19:27 +00:00
Bill Lin
7ab0629412 Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f am: 2db995725b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: I71ec6e696bc2a145c1deffdc76404bcaa2f58a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:54:19 +00:00
Bill Lin
2db995725b Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: If2c57ce270318368690eba8ed6680ab20f3dd260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:24:51 +00:00
Bill Lin
7d15cb501f Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev 2022-08-30 12:06:47 +00:00
Chaohui Wang
805f903ae4 Add SpaLib for Settings
SPA main activity can be launched by:
adb shell am start com.android.settings/.spa.SpaActivity

Bug: 235727273
Test: Manual launch SPA main activity
Change-Id: I7b196b0169f91732a6b37ff53a3f79b54267d93f
2022-08-30 16:39:03 +08:00
Daniel Huang
7505e97ce9 Merge "Separate "Keyboard" from "Language & input"" 2022-08-30 08:20:14 +00:00
TreeHugger Robot
749c963f2b Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6 am: a8fe097b6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508

Change-Id: I32d8a438fa3a017b14782f3a9fceef909b90464e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 07:08:33 +00:00
TreeHugger Robot
e3777635c4 Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6 am: 8c232535cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527

Change-Id: Icf0e9dd027596c52594bc76f9bf6b9c54c50d966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 07:07:51 +00:00
Jason Chiu
0e2147c5e2 Fix the injection disappearance in the Account detail page
displayTile() requires some parameters to determine whether to show the
injection tiles and update the intent, but the parameters were not
initialized.

Move the parameter initialization before super.onCreate() since
displayTile() will be called in super.onCreate().

Test: visual, robotest
Fix: 242673595
Change-Id: Idf2d758a8b8c4230e644bcd0d286a278d258b736
2022-08-30 06:46:39 +00:00
TreeHugger Robot
a8fe097b6a Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508

Change-Id: I19b929cca3d6c9f0b48fa8a29c2245ff92c88ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 06:38:39 +00:00
TreeHugger Robot
8c232535cf Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527

Change-Id: Ic0537775efd1294e9896adf5de3e61b84900fa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 06:38:20 +00:00
TreeHugger Robot
baa3f3a3c6 Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev 2022-08-30 06:22:53 +00:00
TreeHugger Robot
226107f1d6 Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev 2022-08-30 06:22:14 +00:00
danielwbhuang
c9cb6806f6 Separate "Keyboard" from "Language & input"
1. Separate "Keyboard" from "Language & input".
2. Use FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI to control the
   different UI until Settings launches the new UI design.

Bug: 242680328
Test: local test
Change-Id: Id1ea6d3e3c2e6b83bc4b4d835c6b27e31311c530
2022-08-30 14:22:05 +08:00
Jenhou (Alan) Huang
c0461e645c Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9 am: 6983f5867c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988

Change-Id: Ic5ec27462b8472b1f1ac7fd268be64764ed139c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 06:12:29 +00:00
Jenhou (Alan) Huang
6983f5867c Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988

Change-Id: I1891fca86dcff9c0251ba56f81f183ac76120162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 05:43:38 +00:00
Jenhou (Alan) Huang
95912773f9 Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev 2022-08-30 05:11:39 +00:00
TreeHugger Robot
196f517c75 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb am: a585bebcc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: Ibe3607cfaaf8b91c8ab6beccc6d305e8edcb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:23:59 +00:00
Milton Wu
bffaaf671d [automerger skipped] Fix udfps fingerprint setting flow am: d3a1f700ee am: 7856ab058d -s ours
am skip reason: Merged-In I62d945f2c2e980edf2a885234e54acae109e7672 with SHA-1 936dd31312 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077

Change-Id: I25caed3661bb7516392600e4526fcc22e5959ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:23:58 +00:00
Milton Wu
60496c13c6 [automerger skipped] Use setting as base activity for fingerprint am: 561a68db20 am: 84c9a6308f -s ours
am skip reason: Merged-In Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd with SHA-1 84b39c3ed0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076

Change-Id: I1da88e2a818b696febde02a0724846738de93378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:23:56 +00:00
Milton Wu
127fb0ae8e [automerger skipped] Use Mockito 4.6.1 FingerprintEnrollFindSensorTest am: e167286a37 -s ours am: 9ebaaa87b8 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19750962

Change-Id: I7dd9d8bddefd48f5b2147bb72fd5a021ee57e1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:23:53 +00:00
TreeHugger Robot
a585bebcc8 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: I3b0053910613af42ecc91b8a416b131c662c1837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:37 +00:00
Milton Wu
7856ab058d Fix udfps fingerprint setting flow am: d3a1f700ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077

Change-Id: Ib1e8d3aa448dca12b656bb4e0fcb3a3e85c394ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:35 +00:00
Milton Wu
84c9a6308f Use setting as base activity for fingerprint am: 561a68db20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076

Change-Id: I84e533045cb9043e71634400081d02d2f04faf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:34 +00:00
Milton Wu
9ebaaa87b8 [automerger skipped] Use Mockito 4.6.1 FingerprintEnrollFindSensorTest am: e167286a37 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19750962

Change-Id: I17940dd52a3a941112cc4c39a70dfec30086de17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:30 +00:00
TreeHugger Robot
c8f45f75eb Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev
* changes:
  Bypass cancel error code during "Add another"
  Fix udfps fingerprint setting flow
  Use setting as base activity for fingerprint
  Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
2022-08-30 00:22:53 +00:00
Lauren Winston
28b4b34f92 Add toggles for two Software Cursor settings: keyboard shift and trigger
hints.

Bug: 242218807
Test: atest SoftwareCursorKeyboardShiftPreferenceControllerTest and
SoftwareCursorTriggerHintsPreferenceControllerTest

Change-Id: I872291ee90b54842b237868a72d61b38efbfd886
2022-08-29 22:12:46 +00:00
Alan Huang
a0da5b36bc [VolumePanel] Redirect volume panel action to SystemUI
The volume panel is moved to SystemUIDialog, so we
redirect the volume
panel creation to SystemUI.

Bug: 202262476
Test: manual build and use adb to launch with the volume panel action
intent. $adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I9f23eb68fb7c83d6f0f023f5eefc4290a35db3c3
2022-08-29 18:50:30 +00:00
Xiaowen Lei
6a6fca85a5 Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev am: 6a6374bc9b am: f4ead190ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19748830

Change-Id: Ic3f4b16dca9c2deb36d5b37ff66982f7ab6fc699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-29 17:08:38 +00:00
Xiaowen Lei
f4ead190ef Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev am: 6a6374bc9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19748830

Change-Id: I3ce6d60442ba1dd4d3b49406910eab7559da8d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-29 16:49:19 +00:00
Xiaowen Lei
6a6374bc9b Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev 2022-08-29 16:32:40 +00:00
Milton Wu
af5a7d8dc0 Bypass cancel error code during "Add another"
1. When user chooses "Add another" on latest fingerprint enroll page, we
   shall bypass RESULT_CANCELED from FingerprintEnrollEnrolling. This is
   because user has successfully enrolled a fingerprint before enter
   FingerprintEnrollFinish page.

2. In FingerprintEnrollFindSensor
   A. Do not call startLookingForFingerprint() if mNextClick is true
      because it is wating the result back from
      FingerprintEnrollEnrolling, and let onActivityResult() mehtod to
      handle correct behavior.
   B. Add tests for following cases
      a. Sidecar existence
      b. Activity recycled and recreate in order to get activity result.

Bug: 243701933
Bug: 243762418

Test: ROBOTEST for SetupFingerprintEnrollFindSensorTest,
   FingerprintEnrollFindSensorTest, SetupFingerprintEnrollFinishTest

Test: Test scenarios w/ and w/o always_finish_activities
  1. Enroll a fingerprint but cancel it during enrolling in SuW
  2. Enroll a fingerprint in SuW
  3. Add another fingerprint in SuW
  4. Run "Add another" but cancel it during enrolling in SuW
  5. W/o enrolled fingerprint, add first fingerprint in settings
  6. W/o enrolled fingerprint, add first fingerprint but cancel it
     during enrolling in settings
  7. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" in settings
  8. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" then cancel it during enrolling in settings
  9. W/ 1 enrolled fingerprint, add fingerprint in settings
  10. W/ 1 enrolled fingerprint, add fingerprint but cancel it during
      enrolling in settings
  11. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" in settings
  12. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" then canel it during enrolling in settings

Change-Id: I03d8d8ebc39eb34f8fc28acb5cd267e37c7a0311
2022-08-29 07:22:45 +00:00
Milton Wu
d3a1f700ee Fix udfps fingerprint setting flow
1. on udfps + faceunlock devices, fingerprint settings shall not be
   launched if no fingerprint enrolled.
2. on udfps device, after first fingerprint enrollment successfully,
   fingerprint settings shall be shown.
3. Update FingerprintEnrollFindSensorTest to support udfps cases.

Bug: 243701933
Bug: 243003012
Test: manully adding first fingerprint on udfps + faceunlock device
Test: manully suw on udfps + faceunlock device
Test: run robotest for FingerprintEnrollFindSensorTest
      and SetupFingerprintEnrollFindSensorTest

Merged-In: I62d945f2c2e980edf2a885234e54acae109e7672
Change-Id: I62d945f2c2e980edf2a885234e54acae109e7672
(cherry picked from commit 936dd31312)
2022-08-29 07:22:40 +00:00