TreeHugger Robot
de73c2ff4f
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I7473173f5cb5c326e472af2091dfd472e10d5a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:30:25 +00:00
TreeHugger Robot
2484fa72d6
Merge "Add more search terms for WPP" into udc-dev
2023-05-31 22:02:49 +00:00
Bill Yi
482e804031
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 2d3730c6e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I97e3326beded265be1c410580efc01077c73f3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:56:50 +00:00
TreeHugger Robot
cc1e3a7a22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I1b0095baee859ac3b3dfa4cdfaebb13277791f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:41:13 +00:00
Bill Yi
e4de5ed4b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I5be6bca492488cab97da3e60e3d2b8b3f8a5c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:41:08 +00:00
Bill Yi
fea2cb0758
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours am: 58162acd2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I21d97a78635752f7ba3adae52999aee4d4cad573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:32:17 +00:00
TreeHugger Robot
d26db6ce5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ic4012aae2ed5a39fa30a765714bfcc3fa5f3dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:30:10 +00:00
Bill Yi
16f5f3cf3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ie5bbdf284bed5731ff348b7b86bdd008e09b6d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:59 +00:00
Bill Yi
58162acd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I382bc02d9c504043841a8e67e304ca35fb893b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:29:09 +00:00
TreeHugger Robot
e665a6bb57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours am: 53a315463c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I385978b643fca0743bf421c42c37b732327327c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:34 +00:00
Bill Yi
b0a242da0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours am: 5b8058c497
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I714eab2049db6e8709067fb5282fcfa6d47ddcf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:30 +00:00
TreeHugger Robot
53a315463c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I7a579cd60448e331cbdbdf709df9d851862ffe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:16:00 +00:00
Bill Yi
5b8058c497
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I13e43682afabb06f4b6b2db967b6b3ab485f0ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:15:53 +00:00
Bill Yi
446ae41bbb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 3365a09592
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: Ie8a161fcf159665d1741e7c058dc60d4e03c0a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:15:05 +00:00
TreeHugger Robot
55ddd4aa31
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: If959b9ca068f1c1cc6f0081a9bdf7aac40c119cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:39 +00:00
Bill Yi
c5b80e0c99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: I88f7826501fb79728b400c55b47f1cc9c2752b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:35 +00:00
TreeHugger Robot
a93397786a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: Ic209ddcfd7417e43f1bbb2934fb97d21086eaa61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:27 +00:00
TreeHugger Robot
dbe17de3a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Ib3956999b9a5c41d10ef04d10b0022f4894846a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:27 +00:00
Bill Yi
13df8b2d97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I8bc84d7b3f6821476666db24e11855e15a103f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:23 +00:00
Bill Yi
c7d989394d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Idced454dc447d47a055395d13045712b7f1c5797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:10 +00:00
TreeHugger Robot
0c23e24eb8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: Ie20d4e1e662aa379c9fc128c19e193f3f5c24915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:51 +00:00
Bill Yi
e306564e29
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: Idac10a099a63c691ef6b7e573a7ec8bde54b103d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:34 +00:00
Bill Yi
2d3730c6e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I80facf9912d1fccb9e1b9e6264d9bb699112d2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:31 +00:00
Bill Yi
3365a09592
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: Ida66b7c7e1e05bbab33e21143f9af1f812136dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:06 +00:00
TreeHugger Robot
672ba73070
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-31 16:55:16 +00:00
TreeHugger Robot
34ee142399
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-31 16:55:11 +00:00
TreeHugger Robot
6834cfffe4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
TreeHugger Robot
c2a92b394e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
TreeHugger Robot
fef0572018
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +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
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
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
Android Build Coastguard Worker
13e9e3bf1b
Snap for 10225371 from a171a9d426
to udc-release
...
Change-Id: Ifbe5058eec4b7a925d5fd3ed322b471193a2d4ac
2023-05-30 23:29:49 +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
a171a9d426
Merge "Update string to be phone/tablet agnostic" into udc-dev
2023-05-30 16:48:52 +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
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
Edgar Wang
2917c0c1c0
Revert "Revert "Update theme for ChannelPanelActivity""
...
This reverts commit bbef903b88
.
Reason for revert: This CL is fixing notification panel theme issue.
Change-Id: I6bcd8c8f1e8d2f2bd2f7896ebf45d36f67f570b9
2023-05-30 08:28:30 +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
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
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
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
2bcb8c25fd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
2023-05-29 00:55:43 -07:00