TreeHugger Robot
d3fdbf5def
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours am: b41a74c1a9
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I171f729159e3093bb8d317feaab681c889fc0db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:41:55 +00:00
TreeHugger Robot
8eacc8a8dc
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:27:04 +00:00
TreeHugger Robot
b41a74c1a9
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I6b0a4bc63732cb838bac6d6d16625ca44f6ba4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:26:08 +00:00
TreeHugger Robot
7bd23716c3
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I3f91cd3600b1b581beac0b262a35cbf66fed209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:03:28 +00:00
TreeHugger Robot
bb5466b1f8
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: Ib9c9b6702b9d7f541debd2b9f0677590d8e3149f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:57:10 +00:00
TreeHugger Robot
0b507f0203
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I03622a4803112de1f7b2f2fb3000b007444bc19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:48:29 +00:00
TreeHugger Robot
52ea95aa55
Merge "Warnings at top of per-app settings page" into tm-dev
2022-04-01 17:40:09 +00:00
PETER LIANG
26ec8e895b
Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625
Change-Id: Id85adfbb740b5214310762c8e1d185f3d0130c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 16:22:30 +00:00
TreeHugger Robot
ed29b05dcd
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I8bba0ed0611a7cef34b210e7e7553de70dbf9aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-04-01 16:13:50 +00:00
PETER LIANG
93d4886297
Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev
2022-04-01 16:03:10 +00:00
danielwbhuang
baa59815d8
Warnings at top of per-app settings page
...
1. Check getInstallPackageName() and isSystemApp()
2. Link to play store
Bug: 221164159
Test: local
Change-Id: I5727a4b99d945ae5c1b517020026654796a34d98
2022-04-01 23:41:56 +08:00
Xiaowen Lei
f3dce9d7d4
Update the function used to log the dream picking events.
...
The behavior is identical to before (for StatsLogWriter), but switching
to the generic function with the appropriate field names.
Bug: 213906448
Test: on device via `statsd_testdrive 97`
Change-Id: I241d110b531567cb828a2ed849c79b6595a4b4d1
2022-04-01 15:28:20 +00:00
Xinyi Zhou
bc54b145ab
Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006
Change-Id: I8d3fc050c99a97944418d69ec184b4eb33a12da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 15:26:51 +00:00
Xinyi Zhou
a809f491e5
Merge "Turn off Fast Pair MainSwitch" into tm-dev
2022-04-01 15:13:09 +00:00
TreeHugger Robot
e6e739d8b0
Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 12:58:31 +00:00
TreeHugger Robot
74ff164972
Merge "Prevent exfiltration of system files via user image settings." into qt-dev
2022-04-01 12:42:31 +00:00
TreeHugger Robot
2500cd25c7
Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306
Change-Id: Ic4041ad3e187031151850612acfae2738fbc02bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 12:22:54 +00:00
TreeHugger Robot
ba1f3dc8df
Merge "[Panlingual] Add error message on per-app language page." into tm-dev
2022-04-01 12:04:17 +00:00
Peter_Liang
454f21cb21
Update the preview of the conversation message in the "Display size and text" page.
...
Bug: 227076211
Test: manual test
Change-Id: Ie83f95ba223a42f596c2a4ef68f33f4152a2cc07
2022-04-01 18:09:28 +08:00
TreeHugger Robot
dfd1c2043e
Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487
Change-Id: I07943c63bc8631c150d53361f76788f9b99eef1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:41:56 +00:00
Arc Wang
b7409f8b39
Add work profile badge for icon of free up space
...
- Get badged icon from target app.
- Add card_preference layout file to align icon & text
with other Preference.
Bug: 192555970
Test: manual visual
Change-Id: Id98d05e8871032ad61627783b8e47bfee1363448
2022-04-01 17:41:08 +08:00
TreeHugger Robot
046d174a55
Merge "Fine tune background color for dual pane in homepage" into tm-dev
2022-04-01 09:34:07 +00:00
TreeHugger Robot
e4ae02c6ae
Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344
Change-Id: I60fd5cd005e6206778cca368f4d4b25fb6b25448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:29:02 +00:00
Weng Su
32ebc2afd9
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: I4556ce153de8f8524bbb92b47ef9202689c0b1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 09:28:29 +00:00
tom hsu
40a6de1ec4
[Panlingual] Add error message on per-app language page.
...
Bug: 226032712
Test: local
Change-Id: I12aae66116cc8c00fa7c6b0ba256d4726620ea4c
(cherry picked from commit a9184f43c5
)
2022-04-01 09:28:01 +00:00
TreeHugger Robot
91be4fbe35
Merge "Fine tune Select time zone Settings UI" into tm-dev
2022-04-01 09:18:05 +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
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
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
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
Mill Chen
ee41ad89a9
Add cache mechanism for secondary users in Storage
...
To prevent from the flicker happening, the size info for secondary users
will be cached.
Bug: 220259287
Test: manual test
1) Create secondary user
2) Finish setup flow
3) Install any types of apps and try to change the storage size
4) Navigate to Settings > Storage
5) Observe the storage size and progress bar, they should have animation
when storage size info updated.
Change-Id: Iff706b20446603f08334a0b782dd505ca78bdab2
2022-04-01 15:42:31 +08: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
cnchen
27536c8333
Properly apply the SUW dynamic color theme
...
Activity should apply a base theme before apply dynamic color theme
Bug: 225800660
Test: Manual testing
Change-Id: Iad6e03b1750e1a4bd29878c9eb88e8c4a08a867f
2022-04-01 14:57:58 +08:00
Treehugger Robot
0159ca5d9c
Merge "Settings: Fix cellular internet option Not seen after internet reset"
2022-04-01 06:52:44 +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
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
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
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
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
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