Chaohui Wang
2e5180884a
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: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:55:08 +00:00
Peiyong Lin
7ef70db34d
Merge "Remove GameSettings and ExtraAppInfo." into tm-dev
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
Chaohui Wang
f2178a48ee
Merge "Clean up unused Sliceable.copy()" into tm-dev
2022-04-07 17:31:08 +00:00
TreeHugger Robot
793846e887
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626545
Change-Id: I797acd66aa4acb7b39a8d84cc068120301b4a40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:25:36 +00:00
Bill Yi
10b4940a2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17626545
Change-Id: I7171f6e0493773705bff5ccabac56d8bb6ecbec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:25:29 +00:00
TreeHugger Robot
9e81a99857
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625452
Change-Id: Ifd5fc4a5daedab1839b13153caf395ed8643fb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:24:46 +00:00
Bill Yi
90f845a535
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625452
Change-Id: Ic549f6d8e099580d27740f838fe9a998ac75aa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:24:42 +00:00
TreeHugger Robot
d08cae367a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-07 17:00:11 +00:00
TreeHugger Robot
8e9c30933a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-07 17:00:05 +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
Bill Yi
d0019169fc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731
Change-Id: Ib47f17b9aa3f4e067a9c7d4b203c4286356f9d87
2022-04-07 14:12:41 +00:00
Bill Yi
2c4b82e04b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9df9e2fad6107338e395c58a794596f8f388c32e
2022-04-07 14:12:33 +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
Bill Yi
0ac1b5fd50
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7e6739e6fe1765e5a20e4719310354e8043db4e
2022-04-07 14:05:29 +00:00
TreeHugger Robot
aa240f4299
Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d
am: e406597fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094
Change-Id: I7647536f6b08d202aeee5136d4f5ad2c701250f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 12:09:44 +00:00
TreeHugger Robot
e406597fe2
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: I2b91d4ac1320ce79037c073f913800f0f0ca785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 11:54:52 +00:00
TreeHugger Robot
59c849da4d
Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev
2022-04-07 11:47:51 +00:00
Edgar Wang
ee2934072b
Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af
am: 4bd3057db3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526
Change-Id: Iba1cfcb3eaa38f724535989c522bb56d777baa11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 10:32:19 +00:00
TreeHugger Robot
2181b9ccbf
Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c
am: 739b57cf0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Change-Id: I629e7d500dd52bc7c3995d00c624829e54be3f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 10:32:04 +00:00
Menghan Li
32c12991d0
Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141
am: e7ab9f38cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083
Change-Id: I730d63469054a69735a0aa3d60fe9a223f867247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 10:31:42 +00:00
Edgar Wang
4bd3057db3
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: I4108bcb152acbec025978c294761b0411b78f572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:55:50 +00:00
TreeHugger Robot
739b57cf0e
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: Ieebd00482a3532bae1b12546b2ec45d2dc9300ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:55:33 +00:00
Menghan Li
e7ab9f38cf
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: I82e22e6cea7c46cf0da52fd0977a74cee7f6de85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:54:55 +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
Josh Hou
98490cc740
[Panlingual] Screen title is displayed incorrectly
...
Fix the issue that the screen title name of the app language page is displayed incorrectly
Bug: 227285277
Test: Verify the issue by testing between the system language and app
language page
Change-Id: I5dbb10763bd5cc346bff9c270b14b945eb499273
2022-04-07 14:02:22 +08: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
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
c4121c15e4
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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:44:12 +00:00
Arc Wang
d10662cf97
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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:42:30 +00:00
Arc Wang
c55b5b54d2
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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:42:02 +00:00
Arc Wang
abf3369340
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Bug: 181962311
Change-Id: Ic87c5c0052ae76f4b5a689a34768e678210c64b0
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:38:37 +00:00
Arc Wang
3357f3071a
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Bug: 181962311
Change-Id: Ia1f3c9944e2ef886366719b754c89e7c4d99478a
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:38:36 +00:00
Arc Wang
d0a23dc840
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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:38:24 +00:00
Arc Wang
1c8edd20a3
[automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095
Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449
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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 11:33:54 +08:00
Bonian Chen
5a78d70376
[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: c823a9e0a4
-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: I89ec4ac726f22f9ec5f1e94eb5283f2268224584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:31:35 +00:00
Tom Hsu
5f6351588e
Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694
am: e82ca817a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Change-Id: Idfc3df7710c48cdfb63c0c7fca44fde52f4f25f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:31:30 +00:00
Bonian Chen
c823a9e0a4
[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: Iaa733eab6ba349d892ee0fb0d0265543a22eabe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:10:53 +00:00
Tom Hsu
e82ca817a1
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: Id9675919d94a715e77c930f79ba5f471c467ba4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:10:44 +00:00
Bonian Chen
86a4d78651
[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: 5bcd2f7fa5
-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: I7e5e4149aafe0aabcb04477df8abd142c746ad81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:04:04 +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
a9d7aae694
Merge "[Panlingual] Fix the back button press" into tm-dev
2022-04-07 02:52:23 +00:00
Bonian Chen
5bcd2f7fa5
[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: If24a54c4e68cbeede4352be068af500e3116941e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:42:24 +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