Commit Graph

128951 Commits

Author SHA1 Message Date
SongFerng Wang
daf2fdc6f5 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I28c20f78b759b6fd08ace5d5de632d1030cdb8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:43:12 +00:00
SongFerng Wang
07d8970208 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I5c9c9ef6d4d58542b7277ea67b16c222577967cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:38:53 +00:00
SongFerng Wang
c4ed48cbe4 Merge "Try to avoid the timing UI issue" into udc-dev 2023-05-30 12:00:39 +00:00
Zoey Chen
663f274168 [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: ec08c23c6e am: 9b6d377e32 -s ours
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 1f76872d78 is already in history

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

Change-Id: Ia8de5624f71456b57feca224f1b34190e402fff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:00:07 +00:00
Zoey Chen
9197f2af19 [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: 6c5b2f34cf -s ours am: 733b751cea -s ours
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 1f76872d78 is already in history

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

Change-Id: Ib52c924f16d24e9d9d2da22a5596eedaf2465693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:55:02 +00:00
Zoey Chen
3398d9da9b [Panlingual] Remove the large space when searching language am: 1f76872d78 am: ec08c23c6e am: 12cd65cfb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: Ieb25ffffdb0fc84dafecc0f99037cebdad220143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:54:48 +00:00
Chaohui Wang
d38e08c97b Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev am: 232ab65146 am: 614de9cad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467965

Change-Id: Idddb11cc94b78b98f738c170729ec682ea60b469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:37 +00:00
Zoey Chen
733b751cea [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: 6c5b2f34cf -s ours
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 1f76872d78 is already in history

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

Change-Id: I4b049069355041d457a69d09614f52f2c4115c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:32 +00:00
Zoey Chen
9b6d377e32 [Panlingual] Remove the large space when searching language am: 1f76872d78 am: ec08c23c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: Ied36c7f01013d864c3a7a0173dd9a6375ae63b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:04 +00:00
Zoey Chen
12cd65cfb1 [Panlingual] Remove the large space when searching language am: 1f76872d78 am: ec08c23c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I1506e24f73a976c99062f77cc4d5cea6e7ae4d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:09:59 +00:00
Zoey Chen
001ce1a120 [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: 24b9862450 -s ours
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 e2a9ee2f35 is already in history

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

Change-Id: I3b55b4ce255decc921ca36b1b1ece6f19987f29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:09:52 +00:00
Chaohui Wang
614de9cad8 Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev am: 232ab65146
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467965

Change-Id: I047939c39a931a7be3d28bf394bf73adb00299ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:30:08 +00:00
Zoey Chen
ec08c23c6e [Panlingual] Remove the large space when searching language am: 1f76872d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I8baa97b805f451606e4f07d473e580bdd0b3fa9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:29:14 +00:00
Zoey Chen
6c5b2f34cf [Panlingual] Remove the large space when searching language am: 1f76872d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I319f8070f4cd02842f397789d6495a8f27e2ad5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:29:14 +00:00
Zoey Chen
24b9862450 [Panlingual] Remove the large space when searching language am: 1f76872d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: Ife8d5ebaf1567a4114a3d8266913442eeb8f91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:26:56 +00:00
Chaohui Wang
232ab65146 Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev 2023-05-30 09:29:58 +00:00
Edgar Wang
1341de6527 Protect App pinning
When user try to disable lock device when unpinning:
If set screen lock, we should confirm pattern/pin/password.

Fixes: 277578736
Test: manual verify
Change-Id: I7193944c4ba0113b14c16dcf0109b0d114227a68
2023-05-30 08:32:27 +00:00
SongFerngWang
0f3f6086e9 Try to avoid the timing UI issue
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
2023-05-30 15:18:28 +08:00
Daniel Huang
78f32fafa6 Merge "Display gesture education button in touchpad settings" into udc-qpr-dev am: 58aab66f51 am: 3021c1d3bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23428477

Change-Id: If09157eba3da520c4b364c8d108f4cb0498a30b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 07:04:17 +00:00
Treehugger Robot
58e1c5c143 Merge "[Panlingual] Remove the large space when searching language" 2023-05-30 06:42:26 +00:00
Daniel Huang
3021c1d3bf Merge "Display gesture education button in touchpad settings" into udc-qpr-dev am: 58aab66f51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23428477

Change-Id: I23f3608d3b46d43c6e431348c98131946375921f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:41:57 +00:00
TreeHugger Robot
b4924fd041 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84 am: 106525cd10 am: 2dfd21e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I804d093dce49fee52672068ab8ecba4fdae11dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:40:28 +00:00
TreeHugger Robot
bcfb7a13ee Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 597f143627 am: 476cd05e1d am: 9d5b91d15a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I13b86926096e528287c62b335db22f435f0703a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:39:50 +00:00
TreeHugger Robot
b50a36a479 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84 am: 71e6d2e29e am: 1f22a21b0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I3a6d333bce9b8aabd5f284da565e6b3a7a298279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:38:49 +00:00
Daniel Huang
58aab66f51 Merge "Display gesture education button in touchpad settings" into udc-qpr-dev 2023-05-30 06:23:59 +00:00
TreeHugger Robot
2dfd21e760 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84 am: 106525cd10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Ib3949766d9f6f8ae1492cfee0e481f69190ae814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:17:41 +00:00
TreeHugger Robot
9d5b91d15a Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 597f143627 am: 476cd05e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I203dce90afcde392c9ca8b6a7dfae189bfb6ab92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:12:34 +00:00
TreeHugger Robot
1f22a21b0a Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84 am: 71e6d2e29e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I7149441acacf4a302eb639e81f9c7a6d0ab60570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:12:04 +00:00
Chaohui Wang
4aeb362668 Replace deprecated fields with ImsManager fields
Bug: 284913888
Test: m Settings
Change-Id: Iac56df24f571e1c8268b8b217ec1a05f67f7a2b2
2023-05-30 14:08:21 +08:00
Zoey Chen
1f76872d78 [Panlingual] Remove the large space when searching language
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:44:13 +00:00
Zoey Chen
e2a9ee2f35 [Panlingual] Remove the large space when searching language
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:42:42 +00:00
TreeHugger Robot
476cd05e1d Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 597f143627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0cde8c33b27a86354e26a03768535ab7d5119b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:31:56 +00:00
TreeHugger Robot
106525cd10 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Ida476028924b3c33f92e98c20fbf3a27f5482b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:31:17 +00:00
TreeHugger Robot
71e6d2e29e Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Iaaed0f91044266c6fe5846422a95faa30bf57d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:27:12 +00:00
TreeHugger Robot
cc9c278168 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 43bb90a8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I56529ad6971d358fd017499da2ee3f6816837a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:27:10 +00:00
Chaohui Wang
b35703e422 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a am: b5ab3b9cbb am: 368069b04a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Ifc0e78820890c1ce72fda6997f27e4ad2e942875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:48:09 +00:00
Chaohui Wang
72699cc987 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a am: d8f569dba5 am: 89b7bb08ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I043a675ec0b780c2e258b4218e5b1289c29d3380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:48:01 +00:00
Chaohui Wang
325c2f42c3 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: baf7e7e2a7 am: 93d86268e8 am: c45145b14b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Icceb2ad8ad7e9e15f8a426b5106b2e71c8c490b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:47:52 +00:00
TreeHugger Robot
43bb90a8f5 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I2ba239dbb707c1f84cbb66e4a134c449fbcb32ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:47:30 +00:00
TreeHugger Robot
261a252a84 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:47:26 +00:00
TreeHugger Robot
597f143627 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0ae4060e85b81360d84e22d55aa113c65e08f114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:43:09 +00:00
Chaohui Wang
368069b04a Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a am: b5ab3b9cbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iafacbadfdf00add7f39663a804105dc929dafcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:26:37 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Chaohui Wang
89b7bb08ac Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a am: d8f569dba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I119e44869a2b1db52bcd0e0fe10ac5946fef3c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:59:48 +00:00
Chaohui Wang
c45145b14b Update activity name for ManageFullScreenIntent am: 94906cfe3d am: baf7e7e2a7 am: 93d86268e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iafab853e45dd1eafcf2870f12de4fe2cdb0d9331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:59:38 +00:00
Chaohui Wang
b5ab3b9cbb Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I97184fb54627cc0756c60ca2e67cc13bf61cb171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:42:59 +00:00
Chaohui Wang
09c631eb01 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 22b3c0462f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I64bd83bc46de6fb969a0ee01c08367096c9fa600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:38:56 +00:00
Chaohui Wang
d8f569dba5 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I3f83cfe633a88ac1362aaac4c8972b6d368eb3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:38:38 +00:00
Chaohui Wang
93d86268e8 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: baf7e7e2a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I1a63eb36f333a3ffc0e663fbfc69414ff1d62402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:20:58 +00:00
Chaohui Wang
1d7e22ee3a Update activity name for ManageFullScreenIntent am: 94906cfe3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iff1262707d748b08ce5818b0e9d558026d877502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 02:37:28 +00:00