TreeHugger Robot
53b782e43b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
Pavel Grafov
8112fb3828
Avoid double quiet mode requests
...
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.
Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2
Fix TetherSettings crash issue
...
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
- Avoid to setup ViewModel when UI is restricted
Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest
Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
2023-05-31 20:38:36 +08:00
SongFerng Wang
a5a435e222
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 2d2f90fa38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Ifadd1d82b31d5c4295cb3443f7d3adf8c82f18f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 08:44:08 +00:00
SongFerng Wang
15935328bd
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 623fd259f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Ide603aabe80f369d705903ffa29c14200d04404d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 08:39:29 +00:00
SongFerng Wang
2d2f90fa38
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: I569db5421a70731f2f0666e9ef187422cff712e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 07:57:05 +00:00
SongFerng Wang
623fd259f7
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: I5e3335db194374187c3d3ad575e0db04795e2f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 07:56:29 +00:00
SongFerng Wang
bbf55cafb9
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev
2023-05-31 07:24:36 +00:00
Chaohui Wang
f0dc0933c3
Fix padding issue on Scan QR code screen
...
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
2023-05-31 06:41:34 +00:00
Julia Reynolds
75e3741b27
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: f842b7754b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: I280c3ba10991ec9b592800eb2378d0dd5c5ad68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 18:17:30 +00:00
Julia Reynolds
1346017c04
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: d8cfa9ad5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: Ifae0ae3fdff889116862ac7bb658e4b39e5569c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 18:14:32 +00:00
Julia Reynolds
f842b7754b
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: I5d11d6500b35be8b59f9e298c701775638b60858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 17:31:26 +00:00
Julia Reynolds
d8cfa9ad5f
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: Ia98d55bdd0625ff9ee7fea83915b1f81bf591159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 17:31:25 +00:00
Julia Reynolds
a171a9d426
Merge "Update string to be phone/tablet agnostic" into udc-dev
2023-05-30 16:48:52 +00:00
SongFerng Wang
9e4d4858d8
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
am: 07d8970208
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: Id7589cc252520d1b2b4d6e6f9e243878fe7e7f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:32:02 +00:00
SongFerng Wang
77d7480e86
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
am: 3eb25a2df0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: I35abd7338759986fe870252cd2f2b87debee5bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:27:11 +00:00
SongFerng Wang
3eb25a2df0
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: I0c24c04fb3bb769026e3794c461dddb926308219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 12:43:14 +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
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
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
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
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
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
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
TreeHugger Robot
b98d6644ed
Merge "[Settings] Remove redundant sort" into udc-dev
2023-05-30 04:05:22 +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
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
3f97401447
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a3f1cb5958809c0b34692b456170a921df0a7dc
2023-05-29 00:54:17 -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
Bill Yi
cd3e51654c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I50112e91300526751158c02ab03960f005b60c39
2023-05-29 00:51:07 -07:00
Bill Yi
e9d26cfdce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I481b414f50fc988072ec462c2e6ac4f48fe69585
2023-05-29 00:49:34 -07:00
Weng Su
25d259e3e2
Restrict SimDialogActivity
...
- Restrict UI if user is a guest
- Restrict UI if user has DISALLOW_CONFIG_MOBILE_NETWORKS
Bug: 262242946
Bug: 271849181
Test: manual test
atest -c SimDialogActivityTest
Change-Id: I227400aa71880895d8356f3d2961cb610ad2a357
2023-05-29 07:03:19 +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
TreeHugger Robot
081b525ba5
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: ba5bf3e18f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I03e4f57164e78e90edc8e578d383654438ba5a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:48 +00:00
Treehugger Robot
a451e2cb2a
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f8b14c6049
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I472a9b27cc33bd5adb55cc115502c3c54195feb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:02 +00:00
Julia Reynolds
a4d98455c9
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 08145209c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I0f879939b4a94eb7d5ac387826801cc9188203aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:41 +00:00