Commit Graph

121823 Commits

Author SHA1 Message Date
Wesley Wang
5d18287b3b Fix battery saver switch test case
- Fix the test fail which cause by ag/21784766, and also mentioned at
   ag/21644522

Bug: 260380584
Test: make SettingsRoboTests
Change-Id: I72a7a24f57a7eeeacefeb40eef3025398329379b
2023-03-07 11:44:55 +00:00
Automerger Merge Worker
fc19678102 Merge "Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db am: ea5b2854af" 2023-03-07 10:40:30 +00:00
Sunny Shao
cc7eeb6f55 Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db am: f336246896
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I6b1d8d7d542891f55aa42224682d473ca086cf0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:40:00 +00:00
Sunny Shao
5a2cf2e096 Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db am: ea5b2854af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I4cc393f330b6d9c684ea2cc0724b2c02f31e23d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:40:00 +00:00
Automerger Merge Worker
a498eaf481 Merge "Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec am: fb03625f42" 2023-03-07 10:39:54 +00:00
Daniel Huang
416a13846d Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec am: fb03625f42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: I464a915916a19d00aac13bccf6e7580b60f87093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:39:51 +00:00
Daniel Huang
ce1a944c95 Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec am: bb54f76325
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: I3b23c7538cf37cde0cda1b105c09bd1e6e16077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:39:49 +00:00
Automerger Merge Worker
47d792da47 Merge "Merge "Using upper case country code" into udc-dev am: 524b15c627 am: 79d519346f" 2023-03-07 10:39:39 +00:00
SongFerng Wang
c80f98383a Merge "Using upper case country code" into udc-dev am: 524b15c627 am: 79d519346f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: I0db4d66e8e32984c33e5bfef0fc90f814adf5883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:39:34 +00:00
SongFerng Wang
6e4b026138 Merge "Using upper case country code" into udc-dev am: 524b15c627 am: c680bd69c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Ic14bcd396809aff2522d9c8f935c7abb04bfe6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:39:33 +00:00
Sunny Shao
ea5b2854af Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I81f0cfcabbf2480c5a5b5083012597d465d457f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:23:23 +00:00
Sunny Shao
f336246896 Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I68678e710d61ca13a8a7f1790a83880e6e26b486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:22:58 +00:00
Daniel Huang
fb03625f42 Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: Ied198e591c3d003dc6a9f763f8268c3f457ef0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:22:18 +00:00
Daniel Huang
bb54f76325 Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: Ibeb356895d1f22653afb70ee50b7e4819167e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:22:10 +00:00
Sunny Shao
cb24cb29db Merge "Add the SPA page enter/leave logging metrcis." into udc-dev 2023-03-07 10:12:55 +00:00
Daniel Huang
a2375807ec Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev 2023-03-07 10:08:10 +00:00
SongFerng Wang
c680bd69c3 Merge "Using upper case country code" into udc-dev am: 524b15c627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Id4b6f60415b6d029df04c60d956b88a8cfb0558b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:05:05 +00:00
SongFerng Wang
79d519346f Merge "Using upper case country code" into udc-dev am: 524b15c627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Id81fe803e40d276ec2cb53a11f43cef0918864f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:05:03 +00:00
SongFerng Wang
524b15c627 Merge "Using upper case country code" into udc-dev 2023-03-07 09:43:30 +00:00
danielwbhuang
cf4be05b64 Update KeyboardLayoutPickerControllerTest
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png)

Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)

Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
2023-03-07 16:31:15 +08:00
SongFerngWang
d1d1ecc9d3 Using upper case country code
According to the ISO 3166-1, the two letters country code is upper case.

Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
2023-03-07 16:27:36 +08:00
Sunny Shao
de797e1198 Add the SPA page enter/leave logging metrcis.
- Add the SpaLogProvider and SpaLogData for logging writing.
- Write the SPA page enter/leave logging.

Fixes: 271793388
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I0ad5af39ba207ac00d58f6392496effa3adc42f4
2023-03-07 16:10:56 +08:00
Angela Wang
0e81d7b2fc Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f am: 8ec2b4b113
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: Ib2b1d2cd7c707f4c856ad1af6fae7a474e8e794b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:51:21 +00:00
Angela Wang
c325b89877 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f am: 4efb1f47f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: I1d0711035c54f4a80eade62cc1d06c8f31c13d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:50:06 +00:00
Angela Wang
4efb1f47f9 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: Id824e4ebb5c9701db8af67e155d242a89c5160ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:20:04 +00:00
Angela Wang
8ec2b4b113 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: Idf61369b8241d9b6da635e45c6986560a35c3cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:19:20 +00:00
Angela Wang
ccb009c34f Merge "Updates to use flash notification settings keys in settings provider" into udc-dev 2023-03-07 06:58:53 +00:00
Automerger Merge Worker
97c858065d Merge "Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 1d2a29ace5" 2023-03-07 04:25:35 +00:00
Tom Hsu
6fe484d60a Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 1d2a29ace5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Ie3ec976ca05911c203a50e995b1093b3909dd63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:23:53 +00:00
Tom Hsu
437434f9bc Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 358c2d9aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Id6fb6f6b3a7cc3a4a659ff0a8b07e69178917598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:23:45 +00:00
Tom Hsu
1d2a29ace5 Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Ic22299672f5063265dd6c024fae2e6442c83ae02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:50:08 +00:00
Tom Hsu
358c2d9aaa Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: I0e603ed199f26e043502408da66f12c71280309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:47:11 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Julia Reynolds
4783c87896 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours am: 90811b8f61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9357252af78d3e8555d3b08862815de8cebc965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:51:14 +00:00
Valentin Iftime
f5276b8373 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours am: 940d0ca617 -s ours am: d1d457c8ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I593190ab10b119a7e18d45f0f566f75118c3fd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:51:10 +00:00
Julia Reynolds
d5e7639d91 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours am: c469bfbaa2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f962f8f163c7dad75b38ee56ba97f05874b63e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:48:58 +00:00
Valentin Iftime
3c0f4e1bac [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours am: 940d0ca617 -s ours am: 2bc54ad6aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d9b24773e3e50b850bd2bc0092f361e475e7458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 02:48:30 +00:00
Julia Reynolds
c469bfbaa2 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idec70387698702bbcbfea68d4d5d2b61606595cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:56:11 +00:00
Valentin Iftime
2bc54ad6aa [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours am: 940d0ca617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I004cd894f001436cc8173bec66a3a71b8990acfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:56:10 +00:00
Julia Reynolds
90811b8f61 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0546316e2537d9d7c128cd4691e465a85c5aca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:53 +00:00
Valentin Iftime
d1d457c8ef [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours am: 940d0ca617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I813d6d4d45bbf4138459fc135214cade84e341d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:51 +00:00
Julia Reynolds
0cb9c59631 Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ie62d086193232e8a13e44c922f332ce1d9541ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:22 +00:00
Valentin Iftime
1dd5830b05 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I95599c7885cfe417a60db4b18044dec3019bd9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:13 +00:00
Julia Reynolds
769dc23f37 Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I51889453230cabae593a2b1f712f721f218543ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:18:37 +00:00
Valentin Iftime
b25fcaab93 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: If68221c5187809f18c0d0d3e9775d351017f2f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:18:33 +00:00
Julia Reynolds
a5cb399e33 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48f619653dd7d9c93200c7dcff5167f3be4a032d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:54 +00:00
Valentin Iftime
940d0ca617 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd3fa951f0536c29edf94fffd8b6ab9a4550041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:46 +00:00
Becca Hughes
53936d0ec3 Merge "Move CredentialProviderInfo for test/settings (settings)" 2023-03-07 00:44:57 +00:00
Julia Reynolds
56e2a08f3f Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ie7171fe36f6fda62ce827c41b18e8c625c94359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:43:17 +00:00
Valentin Iftime
fe2ad5085f [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I4942c2bb54de7d06d147d1a592ae25ac5184ab9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:43:14 +00:00