Bill Yi
51f6e4c339
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9067d1cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467926
Change-Id: Iec85b9d61bcbb8639c50e5d26e86f5f88af731af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:01:01 +00:00
TreeHugger Robot
25bf6297ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 53b782e43b
-s ours am: 7c7881640f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: I4dbb9ade81291b211850df595a1f921ff0c63127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:00:54 +00:00
Bill Yi
09d19a9a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 317c0985d1
-s ours am: ebcd2d6ee8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: I98cb6a6d40d5317b019cc9132d4ba0ede8ecc53c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:00:36 +00:00
Treehugger Robot
3418cffd8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 013aed012a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467933
Change-Id: I4a75de05a19c03adb2bea94002d2a2e12a0ea451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:54:59 +00:00
Bill Yi
22673a7231
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2e9162b88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467933
Change-Id: Iad81ddc9b1a75e394e939c6e023426613f18d50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:54:57 +00:00
Treehugger Robot
04343f8ed1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: fe6c1e7437
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467929
Change-Id: Ib41b71c74dcaafae56e80238cabf25c9f859d09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:54:53 +00:00
Bill Yi
1e9bb20a49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1af47ef5a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467929
Change-Id: I6fef75490382c7aa0de3fc2f214e2476b9408d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:54:32 +00:00
Treehugger Robot
576268bb6f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e564ae2e4c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467927
Change-Id: Ib0016a905a9b0294bf830667a0ff44b6cd3d6e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:54:14 +00:00
Bill Yi
52d77fa14e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b4ed66d79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467927
Change-Id: Ida129ef04654acdcffa6d3d938e9f7ae2d6009d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:56 +00:00
TreeHugger Robot
17edc47fb9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6bbc4c9532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: Ie8672f535c49be624ee9e2fa69679a904da2496a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:18 +00:00
Bill Yi
89cda21ba5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 241da8be39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: I26b6f1c38762398dbb30752bd9bb03d6c9fb7d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:12 +00:00
TreeHugger Robot
176f3d9c6a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2d464152ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467683
Change-Id: Ie8fc9fe6989f68072219cfffd2a18643340cb074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:53:04 +00:00
Bill Yi
09361a4214
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f09268e95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467683
Change-Id: Iccdb957d15f0218e8a6730a07375d9d802694c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:52:50 +00:00
TreeHugger Robot
7c7881640f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 53b782e43b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: Ia18d2b9d37924f98e1a9de774319c698530c79ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:52:31 +00:00
Bill Yi
ebcd2d6ee8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 317c0985d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: I20d803a0963a8d6efb36481bfe134bb2dbb54cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:52:13 +00:00
TreeHugger Robot
b41b11ddd3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6bbc4c9532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: Ie0bcc8a5fabe612a520d09b75180f9dd0808dc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:51:06 +00:00
Bill Yi
76c29b520e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 241da8be39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467804
Change-Id: I29301926593e934d6cd14c4d8a5d2cd387b2c8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:51:05 +00:00
TreeHugger Robot
a51413c799
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2d464152ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467683
Change-Id: If2bf134aef6a203e08769825a32ab791779b4649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:51:01 +00:00
Bill Yi
3cabb3e153
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f09268e95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467683
Change-Id: Iaff26a500a6a5e198c61f29d60bb421eb7a3c98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:50:35 +00:00
TreeHugger Robot
82a95ec955
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 53b782e43b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: Ibed584f4b796cedf3c1594e83ea8eb80b3cbed36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:50:14 +00:00
Bill Yi
f3dcf615af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 317c0985d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467679
Change-Id: I83c1394716b5e9f01ae679ce388c9741f6edb27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:49:50 +00:00
Treehugger Robot
f38ea12f37
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5445cfaca3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23468908
Change-Id: Ifb39100fa5edcbb14a24d376f6fdfc481e57ddec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:47:25 +00:00
Bill Yi
92dd79f217
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9b56de09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23468908
Change-Id: I0979bb25860e61f77a0e34e10dd1cbb228ab224f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 17:47:18 +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
12f8414700
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-31 16:53:38 +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
TreeHugger Robot
6bbc4c9532
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
TreeHugger Robot
2d464152ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
TreeHugger Robot
53b782e43b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
Treehugger Robot
5445cfaca3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-31 16:48:50 +00:00
Treehugger Robot
013aed012a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-31 16:47:54 +00:00
Treehugger Robot
fe6c1e7437
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-31 16:47:54 +00:00
Treehugger Robot
e564ae2e4c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-31 16:47:54 +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
73672ac280
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 623fd259f7
am: cb4888680c
am: c77b227cd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: I1213841c18c476f89c489f1fefd71fdbf2af101c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 10:32:44 +00:00
Matías Hernández
01c30221ce
Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731
am: e2afcd0d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451080
Change-Id: I5d67fe79ce3dcc309256da8d05f8cc8461aa6f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 10:32:18 +00:00
SongFerng Wang
51654e9c74
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 2d2f90fa38
am: a5a435e222
am: ccc43d7258
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Ic1fc2b1dcd204c611a175e434fb9ca6031ade32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 10:31:58 +00:00
SongFerng Wang
0333517e9b
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 623fd259f7
am: 15935328bd
am: 827f732795
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Iff33594e37ac733c0dd1e20b8cee3fb4fe0194aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 10:31:36 +00:00
SongFerng Wang
c77b227cd0
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 623fd259f7
am: cb4888680c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: If5264e86e0d6815d855f9f3af7506130477fd69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 09:50:43 +00:00
Matías Hernández
e2afcd0d8b
Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451080
Change-Id: I8aa1e5b94cf06e14a18dcdc3f246b6f30990a3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 09:50:35 +00:00
SongFerng Wang
ccc43d7258
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 2d2f90fa38
am: a5a435e222
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Ia5eb0abb311c11967b0f89a7be69f1fe483424fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 09:48:18 +00:00
SongFerng Wang
827f732795
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: 623fd259f7
am: 15935328bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Id5a4c80a034afaed12ef738caeb87f2095527f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 09:47:59 +00: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
cb4888680c
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: If755aeb7884febe1c5a54aee654aaa114212e131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 08:43:29 +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
945600b878
Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
am: e4807eb9b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439
Change-Id: Ia4c58c0bf0ef30646ee01434a71fb584e1c14638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 08:39:19 +00:00