TreeHugger Robot
b407f5f9e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638133
Change-Id: Idd0304529f8f337b90cc9c5e3440eb8dc4f8f958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:18:41 +00:00
Bill Yi
e1e0224940
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638133
Change-Id: I790fd5c3a88a6134102868ed939db45519414a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:18:40 +00:00
TreeHugger Robot
325c68c26e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625447
Change-Id: I49f93ec8939a212f3d3ecb8489dc2d37ac825a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:18:33 +00:00
Bill Yi
60170e3ab0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625447
Change-Id: I94a5a02665caea3d7d0b06747a369ca16ed79ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:18:32 +00:00
TreeHugger Robot
932550da08
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637730
Change-Id: I5f74bf4bb40f2fdeed2eaf4c4ff6e57f8a044d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:18:06 +00:00
TreeHugger Robot
3cc2f49ffc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638133
Change-Id: I697483b01380c9a58968aaaf3f05b73c52bef72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:11:25 +00:00
Bill Yi
1b10109a03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638133
Change-Id: Ibab16e0884b63f27be3b3e318b3aacfa46fb460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:11:16 +00:00
TreeHugger Robot
03353d6449
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625447
Change-Id: I6192a7567342f40e2dfb0816ac5dfa9f8fa2e9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:10:58 +00:00
Bill Yi
b447a5f3b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625447
Change-Id: I61bf8ed909c9483c9a1fa836dfe54d1c9cdcaf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:10:48 +00:00
TreeHugger Robot
6b7c737c5e
Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:05:07 +00:00
TreeHugger Robot
ecb28bd73e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-07 18:05:07 +00:00
Peiyong Lin
f38e00f223
Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733
Change-Id: I50773da7dafbdde67ff5ace7bc5fb15a3e16f024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:55:00 +00:00
Chaohui Wang
1aebd5fb02
Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525
Change-Id: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:54:53 +00:00
Peiyong Lin
7ef70db34d
Merge "Remove GameSettings and ExtraAppInfo." into tm-dev
2022-04-07 17:48:18 +00:00
Peiyong Lin
c3ce36da27
Merge changes from topic "remove_game_dashboard" into tm-mainline-prod
...
* changes:
[automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
Remove GameSettings and ExtraAppInfo.
2022-04-07 17:48:18 +00:00
TreeHugger Robot
6336dc03b4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-07 17:40:35 +00:00
TreeHugger Robot
ce51beb64d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-07 17:40:13 +00:00
TreeHugger Robot
a18724de22
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-07 17:40:11 +00:00
Chaohui Wang
f2178a48ee
Merge "Clean up unused Sliceable.copy()" into tm-dev
2022-04-07 17:31:08 +00:00
Bill Yi
6ed1350a4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I82c6955438591932f9801878562cbdbea36b368a
2022-04-07 14:21:45 +00:00
Bill Yi
f94a8a9af3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a31725689e388e013ea1122842c7aa0250e41a7
2022-04-07 14:17:44 +00:00
Giulio Fiscella
416e5d6f9b
Merge "Use more unique ids for safety sources" into tm-mainline-prod
2022-04-07 14:17:11 +00:00
Bill Yi
64ad35274d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637730
Change-Id: Iea650a2f6d4b0a8b51d12d73caea027f1335e58f
2022-04-07 14:10:02 +00:00
Bill Yi
5468439c4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d6144e79f9c3b5e3826d5d755842975c459ed7b
2022-04-07 14:09:14 +00:00
TreeHugger Robot
1e7feb7b9b
Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094
Change-Id: Id4f0d167c496affda936b8e49ddfdd0e97f2ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 12:07:17 +00:00
TreeHugger Robot
59c849da4d
Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev
2022-04-07 11:47:51 +00:00
TreeHugger Robot
faad3dfd0d
Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod
...
* changes:
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
Restrict Wi-Fi toggle in Internet Settings
2022-04-07 11:47:51 +00:00
Edgar Wang
7bd6182c36
Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526
Change-Id: I611d1e07c92eda0e74b6749d3938c47ce4a5eedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:54:32 +00:00
TreeHugger Robot
55dc052eeb
Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Change-Id: I4a432c7345688490508a21e898462613baf1cd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:52:46 +00:00
Menghan Li
f2bfd08570
Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083
Change-Id: I940f854a1b6418b9f7d1f7fbb3c32bf1cea1235d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:52:06 +00:00
Edgar Wang
e27296e7af
Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev
2022-04-07 08:01:57 +00:00
TreeHugger Robot
746502e98c
Merge "Hide non-system overlay window on ActivityPicker" into tm-dev
2022-04-07 06:51:35 +00:00
Menghan Li
b62b37b141
Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev
2022-04-07 06:51:19 +00:00
menghanli
7280add032
Avoid accessibility pages display on notification bar in setup
...
Root cause: ag/7505195 introduce to set clipToPadding false on scrollView to make it extend below navbar to overlaps with sibling views. In this case anything pinned on top of screen (switchbar, pinned header for most UIs, and preview indicator for font size page).So, the recycler draw content outside of its bounds.
Solution: Defines whether a child is limited to draw inside of its bounds and the ViewGroup will clip its drawing surface so as to exclude the padding area for SuW flow.
Bug: 227349626
Bug: 227409455
Bug: 222022439
Test: Manual testing
Change-Id: I439508c8e8c90e7303a72a4990c7ef1b9e5bc19d
2022-04-07 05:45:44 +00:00
Presubmit Automerger Backend
e1705a25b4
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094
Bug: 203168097
Change-Id: I461037a25eddce597752cc085a8f9ef3942a2767
2022-04-07 04:08:20 +00:00
Weng Su
22c8bf81e1
Restrict Wi-Fi toggle in Internet Settings
...
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.
- Show restriction message in Wi-Fi toggle summary.
- See the result screenshot in b/203168097#comment24
Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest
Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
2022-04-07 12:06:13 +08:00
Arc Wang
2315d0f20e
[automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Bug: 181962311
Change-Id: Ia9438766ed1f6651b52f6e604a243d2be433eb45
2022-04-07 03:20:31 +00:00
Bonian Chen
afbae7aa88
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours am: 59ecb81133 -s ours am: 5751635a03 -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I7d02351db2810eb8c9a8273f90796b8c13c43b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:09:52 +00:00
Tom Hsu
a070470d59
Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Change-Id: I3fdb718d576e205aa43fa0c63f11b270bd0d2a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:09:47 +00:00
Bonian Chen
5751635a03
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours am: 59ecb81133 -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I9cfcc382d3ac00b1015517cf399c22e4f4802946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:02:17 +00:00
Tom Hsu
94b0789323
Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod
...
* changes:
[automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3
[Panlingual] Fix the back button press
2022-04-07 02:52:23 +00:00
Tom Hsu
a9d7aae694
Merge "[Panlingual] Fix the back button press" into tm-dev
2022-04-07 02:52:23 +00:00
Bonian Chen
9c11a15f75
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: a171ca8477 -s ours am: c5c5072587 -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: Ie1b6b953e57a49c787ae3c3744ea5f2889aae2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:41:52 +00:00
Bonian Chen
59ecb81133
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: Id708691389716abaa0424a6dfde3f685df297409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:40:27 +00:00
Arc Wang
877a41b054
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 10:39:13 +08:00
Bonian Chen
b834eacedb
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I34086ad2baee255f9413529edcfed89cdc95eb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:25:48 +00:00
Bonian Chen
c5c5072587
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: a171ca8477 -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I8c700c4d502a8fded1048daedba5fb8098a53714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:25:43 +00:00
Bonian Chen
62694fefcb
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I5097c99851620d39004d0b62f6479d4d71b46d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:03:06 +00:00
Bonian Chen
a171ca8477
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I5b13cb302d6d75a217428c05401ae52e6a9b1a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:02:04 +00:00
Bonian Chen
ad3fef885f
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I912d9f1baa62559df394f95080fdde71ac91c318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:39:53 +00:00