TreeHugger Robot
cf96e65a6f
[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: 8eacc8a8dc
-s ours am: 6d9631779d
-s ours am: b3e3a33a3e
-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: I7bac3a571de92ee247cbdc6dc60454da472175c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 19:18:35 +00:00
TreeHugger Robot
b3e3a33a3e
[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: 8eacc8a8dc
-s ours am: 6d9631779d
-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: I45a103b233c117cd88564ff7c7dc594d446e6cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 19:02:55 +00:00
TreeHugger Robot
6d9631779d
[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: 8eacc8a8dc
-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: I19f3ca5069da1b3bcce1e50583b06f5f6e0d2fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:41:57 +00:00
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
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
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
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
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
046d174a55
Merge "Fine tune background color for dual pane in homepage" into tm-dev
2022-04-01 09:34:07 +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
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
Treehugger Robot
0159ca5d9c
Merge "Settings: Fix cellular internet option Not seen after internet reset"
2022-04-01 06:52:44 +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
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
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
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
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
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
ad5acbdc23
Merge "WiFi restricted connection when scan QR code" into tm-dev
2022-04-01 01:28:56 +00:00
Treehugger Robot
f558fc27d9
Merge "Settings: Fix WifiSettings FC when rotating screen"
2022-04-01 01:23:47 +00:00
Xinyi Zhou
5ad94e7c56
Turn off Fast Pair MainSwitch
...
Bug: 227513829
Test: Built and verified no FP UI in settings
Change-Id: I68d049e3a9d08215bfc6e754de80a67312ae7f98
2022-03-31 18:09:23 -07:00
TreeHugger Robot
119dc79558
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-01 00:38:03 +00:00
Weng Su
2088b4985d
WiFi restricted connection when scan QR code
...
- Use WifiEntry#canConnect() to determine if the network can be
connected.
- Add WiFi network but don't connect if WiFi restricted connection.
- See the result screenshot in b/203168943#comment16
Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: I06d1e832176e540ddd1adce8da46ef8659534ab7
2022-04-01 06:04:34 +08:00
Joshua Mccloskey
ca7f2dbe4a
Merge "Updated UDFPS strings." into tm-dev
2022-03-31 18:47:51 +00:00
Edgar Wang
bc0f6f7639
Fine tune Select time zone Settings UI
...
- remove space between title and region
Bug: 227132664
Test: visual
Change-Id: Ie7d3ca8e170be62b48f26a756d71de5cda7596a2
2022-04-01 02:37:06 +08:00
Quang Luong
4cffe5c223
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
am: 6ca8dd1b1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: Iff78312fbc3045e09d251026756a5f41d0035b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:01:33 +00:00
Quang Luong
6ca8dd1b1a
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I50e3649c21bb83ee9130fa98a71560fe261198a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:45:25 +00:00
Jason Hsu
a0eeda0d65
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev
2022-03-31 17:26:41 +00:00
jasonwshsu
f02c069f3d
Extract inner helper from AccessibilitySettings to public
...
* Need to be used in 'Connected device' page for hearing aid device
Bug: 225117933
Bug: 227172850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RestrictedPreferenceHelperTest
Change-Id: Icda456aa9c7597dc113775d1359acb0a8430768c
2022-03-31 21:49:13 +08:00