Weng Su
2f87645c47
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
am: 9ed56d081c
am: 057c17fec8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I364fb8f0a45839ce8a7b14dee7de0c2b120eca95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:48:05 +00:00
Weng Su
057c17fec8
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
am: 9ed56d081c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: If6d2c0fa6b1b73eccc14678072907a9c2e055215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:27:42 +00:00
Tom Hsu
aaac7dd777
Merge "[Panlingual] Add error message on per-app language page."
2022-04-01 09:20:10 +00:00
Weng Su
9ed56d081c
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I71a0799dd5561b069d587491f78957e48fa87541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:06:51 +00:00
Weng Su
c422d95147
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:47:33 +00:00
Tom Hsu
2fb36ce893
Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
am: 45dae0ff5d
am: 710d01d4f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345
Change-Id: I19ad703e92681902484871ef4717923cbbefebcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:29:29 +00:00
Treehugger Robot
03181f299c
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
am: 537cf057b2
am: fb55419577
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: If2d390c383fa4ea178f088617be47cb4e478c639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:29:21 +00:00
Josh Hou
12f7c6584a
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534
am: 37164a1af7
am: 55a7e3e1f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431
Change-Id: Ibf6f9550b6870ac64aafbb5012406fb25a575c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:29:11 +00:00
Weng Su
ec1b6c308a
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: Ib5462706a20ca6565144faae9c5009939bf2eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:28:28 +00:00
Tom Hsu
710d01d4f6
Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
am: 45dae0ff5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345
Change-Id: Idfc90fb90b1f2fddecc2f36749194a56c7dea412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:44 +00:00
Treehugger Robot
fb55419577
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
am: 537cf057b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I5313b751631a80ed881a322c4b10cd3ec30a557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:39 +00:00
Josh Hou
55a7e3e1f7
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534
am: 37164a1af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431
Change-Id: Ie286a75243f08fc0cda47f7c292bfcb5ebc08387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:32 +00:00
Tom Hsu
0553dd13ac
Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
am: 567fdcd782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345
Change-Id: I2c477c71e8035af1591440320e964ac2aeaab8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:24 +00:00
Treehugger Robot
8339d051b0
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
am: babd81d61c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: Ia9d800a7681ddb35741839eb224d290ab1a2bdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:17 +00:00
Josh Hou
47ca0952d4
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534
am: 96f0d3cab9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431
Change-Id: I8ae7dda42061203a1dbeed366714ee5f88a4a4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:16:07 +00:00
Weng Su
c68e241fa6
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation"
2022-04-01 08:08:51 +00:00
Tom Hsu
45dae0ff5d
Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345
Change-Id: I8b0aa19bcb5bff35d30e43c493e106a511dc38f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:57:22 +00:00
Treehugger Robot
537cf057b2
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I459260827839a534dfb749bd967e23fd70054c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:57:15 +00:00
Josh Hou
37164a1af7
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431
Change-Id: Ida5deaf3abd029a81b2210207acc0a243c95afbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:57:08 +00:00
Tom Hsu
567fdcd782
Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345
Change-Id: I8b14063c39d39ad4538ea6aefd83c10943329223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:56:26 +00:00
Treehugger Robot
babd81d61c
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
am: 973031b290
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I6bed9c01092867f480d4c28900c1443c700cfd5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:56:19 +00:00
Josh Hou
96f0d3cab9
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431
Change-Id: I7f2eeebba3c61392566aa039d9d7219b1370f21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:56:12 +00:00
Tom Hsu
84f78bc493
Merge "Fix System language option missing and locale region missing issue" into tm-dev
2022-04-01 07:52:52 +00:00
Treehugger Robot
973031b290
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
am: 3fb5213538
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I3e34f4f6ef32064e7de1ca0a9aee94c02f94e7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:49:23 +00:00
Josh Hou
6ead6df534
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev
2022-04-01 07:38:00 +00:00
Treehugger Robot
3fb5213538
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:36:46 +00:00
Treehugger Robot
a1a5091f12
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I854bc6abd439b952f15627ea1859176c4b0665aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:13:19 +00:00
Menghan Li
65e13ca685
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227
am: ee19a81e10
am: ada78d9978
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488
Change-Id: Ib2e6fbd67cd9c1ff12d915fc84fcd6463a570f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 06:59:03 +00:00
Treehugger Robot
0159ca5d9c
Merge "Settings: Fix cellular internet option Not seen after internet reset"
2022-04-01 06:52:44 +00:00
Bonian Chen
b1d2a68312
Merge "[Settings] Adjusting the control of display sequence (part 2)"
2022-04-01 06:47:12 +00:00
Menghan Li
ada78d9978
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227
am: ee19a81e10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488
Change-Id: I47dcbc3f842f18a229c3984d6f13c0d8bddbe9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 06:39:25 +00:00
Menghan Li
0b5e543f9d
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227
am: b08cb9b548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488
Change-Id: Idfa32f4657f414bc61a39d7407ab941ed8fb4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 06:24:01 +00:00
Menghan Li
ee19a81e10
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488
Change-Id: Ibf92aace6506e1fa43480198a56a15ed4eeca57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 06:11:28 +00:00
Menghan Li
b08cb9b548
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488
Change-Id: I6cad4d059b1414e97d0c61e1b50dc71e19d3626e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 06:10:35 +00:00
Menghan Li
1031406227
Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev
2022-04-01 05:56:13 +00:00
tom hsu
d766c58268
[automerger skipped] [Panlingual] Improve and refactor revamped UI am: 213b3ce4af
am: 5d5416be98
am: ccb3c1f6ef
-s ours
...
am skip reason: Merged-In I4564f432143e7e31ba5beff1dd32d7bc7764f9bf with SHA-1 213b3ce4af
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518127
Change-Id: Ia8f8cb428fd9da6a2f728c941dca330fbf947560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 05:23:31 +00:00
tom hsu
ccb3c1f6ef
[Panlingual] Improve and refactor revamped UI am: 213b3ce4af
am: 5d5416be98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518127
Change-Id: Ib7774f4b870b0b03f4f3ce7a99be36fee04cf65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 05:05:07 +00:00
tom hsu
a7e7658002
[automerger skipped] [Panlingual] Improve and refactor revamped UI am: 213b3ce4af
am: 99c60e1984
-s ours
...
am skip reason: Merged-In I4564f432143e7e31ba5beff1dd32d7bc7764f9bf with SHA-1 ded10f8e24
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518127
Change-Id: Ieff4a78e7ff220016351aaa8add94426f0131b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 05:05:02 +00:00
Josh Hou
e32d422d3d
[Panlingual] Fix the app language is shown incorrectly in the work profile
...
The root cause is that the context corresponding to the specified
profile Id is not correctly used when using LocaleManager to query the
app language.
Bug: 222769707
Test: Verify the issue by using the steps provided in the bug
Change-Id: Ic1f9e4cc9e90f5aecfa5e1094184aa63f3d94ffb
2022-04-01 13:00:47 +08:00
tom hsu
5d5416be98
[Panlingual] Improve and refactor revamped UI am: 213b3ce4af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518127
Change-Id: Ic67082f3910917bac56e3411185d6f92ca41ac61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 04:50:37 +00:00
tom hsu
99c60e1984
[Panlingual] Improve and refactor revamped UI am: 213b3ce4af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518127
Change-Id: Ie93ab3b8c9b34c5d6105cad1944c3baed24db9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 04:50:04 +00:00
Calvin Pan
cfb04f4c35
Fix System language option missing and locale region missing issue
...
- Taking app package name into LocalePickerWithRegion
- Using toLanguageTag() instead of getLanguage() to prevent locale
region missing
Bug: 226278910
Bug: 226280740
Change-Id: Ieac42616192065abc0cf82db023e4e50f1ca562d
Test: To be verified
(cherry picked from commit c117a89a53
)
2022-04-01 04:31:44 +00:00
Treehugger Robot
569dc99b07
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
am: a31477d5ea
am: 449ebff481
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I7597a9a8f1b105f537705fd97da5e3eda7949e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 03:21:11 +00:00
Treehugger Robot
449ebff481
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
am: a31477d5ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I38bdcb26a0c4b348e32f37b8eb244ee56e1f0813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 03:07:53 +00:00
Treehugger Robot
9731f01852
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
am: 652f81e035
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I9fb8807007f56d66eaa8ab8348de2d371f6095fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 03:07:32 +00:00
menghanli
18ddc6525b
Remove dependency of SudGlifTheme from SettingsTheme
...
Root cause: Inherit from the glif themes in setupdesign library
Solution: Not inherit from the glif themes and set Setting theme before
applying the dynamic color
Bug: 225800660
Test: Manual testing
Change-Id: Ic4d71bf7a754888c1ed1590c0483360d65f5da44
2022-04-01 11:00:45 +08:00
Treehugger Robot
a31477d5ea
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I47428f0c20cc9d6cd2367200012b5c29333f2de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:46:15 +00:00
Treehugger Robot
652f81e035
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
am: 4440e7a067
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I6fd148bd6ee6cce0eb48e4e5f00782d9be400d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:45:22 +00:00
TreeHugger Robot
56ff7b0376
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 22233430fc
am: e18a842e90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I0af5f93c3cbc8ca8f2409cd1d542f251d7f8eb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:40:39 +00:00
TreeHugger Robot
f774c6f5c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours am: 285c9c9807
-s ours am: d63489c96d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I5e6a0ff0c1156f8f19d92d046f43c4c4f3aa4699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:40:17 +00:00