Commit Graph

101482 Commits

Author SHA1 Message Date
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
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +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
8e23b02de5 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: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:54 +00:00
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
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
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
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
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
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
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
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
Bonian Chen
cbf8100332 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: c058392a70 -s ours am: 06b9bf362e -s ours am: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974

Change-Id: Idfbc390fa99709e2ab63eec941539afe7e1ff156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 01:18:33 +00:00
Bonian Chen
76206644d1 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -s ours am: f52fc37869 -s ours am: 0293401f09 -s ours am: aa208d9ad6 -s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974

Change-Id: I93bc59c480504ba58eea649529add95ae9273842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 01:18:32 +00:00
Bonian Chen
4a77355af6 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours am: b82af15ea9 -s ours am: da5f4be369 -s ours am: dcbe3315c2 -s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973

Change-Id: I92b180576845533321b73321e7a9c7ee3d83169b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 01:18:24 +00:00