Commit Graph

125324 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Chaohui Wang
baf7e7e2a7 Update activity name for ManageFullScreenIntent am: 94906cfe3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iab8361606bdb337c987498784f648da4b80e7a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 02:33:09 +00:00
Chaohui Wang
94906cfe3d Update activity name for ManageFullScreenIntent
Bug: 243421660
Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac
Test: m Settings
Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent
2023-05-29 17:11:08 +00:00
Bill Yi
e2e9162b88 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I986c30fc58468ecfbaa356e66bb4f56aa4f9cded
2023-05-29 05:31:30 -07:00
Bill Yi
1af47ef5a9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8f5fb23a8ad8aaf95316d293f7f26daa2e968480
2023-05-29 05:22:43 -07:00
Bill Yi
6b4ed66d79 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I53abd58ecf6aee9716b0fbdbcaffc733c3d749ca
2023-05-29 05:18:36 -07:00
Bill Yi
241da8be39 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c387f01cd7090a26c171a311717564f1ce45dd2
2023-05-29 01:02:42 -07:00
Bill Yi
b57ebe9c3b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If0dd51dfcd926f41da7f563eff00939b54fb2f03
2023-05-29 01:01:54 -07:00
Bill Yi
adefb73221 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I783506712d5b1c5887f9d955cbd838f44cde34b7
2023-05-29 00:59:12 -07:00
Bill Yi
7f09268e95 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I168bc52fa4cf69d3deec0d29dbfe4b34308f3dfb
2023-05-29 00:57:24 -07:00
Bill Yi
2bcb8c25fd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
2023-05-29 00:55:43 -07:00
Bill Yi
317c0985d1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe62fd0f3c35b0786f4e3b846174540802d8b2da
2023-05-29 00:53:30 -07:00
Bill Yi
e841794da4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82e853e8a4336fd40b50451a83a435740719a87b
2023-05-29 00:52:42 -07:00
Hao Dong
81587b1864 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

Change-Id: Ifd0ca0b6881b2e8d0ff8f57e9fa4876208f9e520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:05:55 +00:00
Automerger Merge Worker
3408ac49ea Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387 am: 18af57da3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I40bb30e4616d6755cc03d5d9fa0950cd82ef9e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:05:01 +00:00
TreeHugger Robot
4881a81aac Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c am: a6f32e2cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I3987ff735c19972c965e8502fcc0b90d32d8c302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:04:49 +00:00
Treehugger Robot
8e74f78dc3 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d am: 67b9234806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I895759538a49ec9cfe59ddb7dedf8360f2a45df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:04:41 +00:00
Julia Reynolds
0b768d10c5 Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 19c2f617aa am: f27723619a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I4ba2a5b636881af0593d645c3f8111c77d806d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:04:32 +00:00
TreeHugger Robot
0701b5ae08 Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: ba5bf3e18f am: 081b525ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: Ib5d4956b7341a33baf552680a8989b5dcbfd29aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:04:17 +00:00
Treehugger Robot
e9fd47eda4 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: f8b14c6049 am: a451e2cb2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa2e4dc558e55d385f0cb4733e0754f766f4aae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:04:08 +00:00
Julia Reynolds
da5f294f40 Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 08145209c6 am: a4d98455c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I21e6fe2a648f33dd5ee6ee2fb04ebcdbf571fc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:03:57 +00:00
TreeHugger Robot
a14d53163c Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c am: 6e9b0d97da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I93be3c2d16321bacec5253332a6dc83e4e0b2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:34 +00:00
Treehugger Robot
0934c3e881 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d am: 9abd002f0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I38e0b893872feca32d26aa62f48b2f1e69f8e9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:22 +00:00
Julia Reynolds
6ff2b3296c Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 19c2f617aa am: d9cc409fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I548af73340c2a3a3d5c8e32c85e39289859e7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:09 +00:00
Hao Dong
6cb1f9401d Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev 2023-05-26 20:35:34 +00:00
Automerger Merge Worker
18af57da3e Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I035428529ea1c0815d15614f97f28ab956f8a8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:23:59 +00:00