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
Tsung-Mao Fang
f4514b9fbf
Fine tune background color for dual pane in homepage
...
Follow the spec and change the background color.
Test: See the screen
Bug: 223329504
Change-Id: Ibcbf0e898ae949e1354f5af810a2347eba42b508
2022-04-01 13:35:17 +08: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
Bill Yi
d798e37a07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: f16b21ff25
-s ours am: 51709467ab
-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: Ib8656a937d2148ca6cdb20395efee55b5365caaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:40:01 +00:00
tom hsu
213b3ce4af
[Panlingual] Improve and refactor revamped UI
...
- Remove useless file
- Make Icon be able to scroll up and down
Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
(cherry picked from commit ded10f8e24
)
Merged-In: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-04-01 10:33:22 +08:00
TreeHugger Robot
d286b52223
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 587dba5e1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I7be92ca85e7fc28ff7923da65c4b1b15301f8e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:24:03 +00:00
Treehugger Robot
4440e7a067
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I56e489c2867242dfc425aba6dea8896d903ab4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:16:00 +00:00
TreeHugger Robot
e18a842e90
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 22233430fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: Ia77eee52b9995d9e4f43558efc683e6a2fecc43f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:12:16 +00:00
TreeHugger Robot
d63489c96d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours am: 285c9c9807
-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: I3ca72aa2389dbc139583bb4760e22e8001bbd6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:10:17 +00:00
Bill Yi
51709467ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: f16b21ff25
-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: I60ca605598356044bea7c1a156cd5f4954078f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:10:15 +00:00
Treehugger Robot
caa0bbd931
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Iffb14760e676a66d061f500a1e9fc383c2a317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:01:14 +00:00
TreeHugger Robot
587dba5e1d
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I80a8ed3418a0947e8377b66da1ab13a6c1b7e262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:00:18 +00:00
TreeHugger Robot
22233430fc
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: Ida748419818b6d4e90c89027eca12af6e82cee14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:50:00 +00:00
TreeHugger Robot
806cea3017
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours am: e845259c25
-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: I9696cd371fb312a886dbc1ce5322125fed19f7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:48:24 +00:00
Bill Yi
5c27a5d78e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: ff374ac1ba
-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: Ic219dfa2bb92681acfe3f8c0e906b526befabd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:48:23 +00:00
TreeHugger Robot
285c9c9807
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-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: I9a4cb64c2b9b73614b3a169d53517f36ae4ee221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:47:12 +00:00
Bill Yi
f16b21ff25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-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: I70cbfa5479d40c6cf39e36658f2a280006dd25a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:47:07 +00:00
Treehugger Robot
3531a34760
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Id3a72177089ca58c1e8e092220835dd3e5f41064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:44:08 +00:00
TreeHugger Robot
59068297b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2d30e67512
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17516530
Change-Id: I2c636a8b7a03d504b4ec6e55850aa7c9e2bb51c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:35:35 +00:00
Bill Yi
c8469e7a54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80cccc92a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17516530
Change-Id: I30c3cb308188f19878f32cbc919f3521862da1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:35:16 +00:00