Commit Graph

103146 Commits

Author SHA1 Message Date
Bill Yi
f2c568bba1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I289db8c8c10f3d04b794241a437d86770025a511
2022-04-07 14:14:03 +00:00
Bill Yi
68b586ae46 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d0019169fc 2p: 847f203c73
Blank merge reason: parent was merged -s ours

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

Change-Id: I0acb21c2ef531123c81fc39a52e5cf35a333d3c3
2022-04-07 14:12:57 +00:00
Bill Yi
847f203c73 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc
Blank merge reason: parent was merged -s ours

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

Change-Id: I8f35bf1389a6c7e796319d525daf0060d73065ce
2022-04-07 14:12:50 +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
48b2c35816 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c 2p: 64ad35274d
Blank merge reason: parent was merged -s ours

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

Change-Id: I35d78b4b6f14925b412f6e70f51a2e2f6014e2db
2022-04-07 14:10:13 +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
Bill Yi
e5caaf913f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50 2p: 27226cae62
Blank merge reason: parent was merged -s ours

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

Change-Id: I16dda7d60a7a119dd4eb20f4890d7d2c5627cecb
2022-04-07 14:05:48 +00:00
Bill Yi
27226cae62 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50
Blank merge reason: commit message contains skip directive

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

Change-Id: I20d817ba03611a51f006e32bd0bdc55eebb911bc
2022-04-07 14:05:40 +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
bc6e5d6c0e Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d am: e406597fe2 am: aa240f4299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I04860071c822e73dc7dbd91a9f91002af53e7918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:39:47 +00:00
TreeHugger Robot
d029615ee7 Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d am: 1e7feb7b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: Ifd5d7014803f71ac3f1ed1afb57285081785ddbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:09:59 +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
68c7c609f5 Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod am: faad3dfd0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I7eecf47f494dab5a618d76fd0775e878db9e169d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:07:51 +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
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
TreeHugger Robot
3081690749 Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8"
* changes:
  [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4
  [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
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
fe4e95a3e5 Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af am: 4bd3057db3 am: ee2934072b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526

Change-Id: Ia3f91b21289d5bddcebbcb5e719033e3b9b7b37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:54:32 +00:00
TreeHugger Robot
2bc777c1a9 Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c am: 739b57cf0e am: 2181b9ccbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: Ic637e7dff37be993813499a18daea5d611bf563c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:54:19 +00:00
Menghan Li
6df55a9bec Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141 am: e7ab9f38cf am: 32c12991d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083

Change-Id: I9b5d960a8df89533ef67e37ea523eba783a8867c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:52:21 +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
1c7b6ee70c Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af am: 7bd6182c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526

Change-Id: I2d50c0da5b8f42bf8270979f182733b8887ff744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:59:27 +00:00
TreeHugger Robot
1f02f62347 Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c am: 55dc052eeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: If509e9e15a0b40117d3874dec249b72034fd4c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:57:31 +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
Menghan Li
f723648342 Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141 am: f2bfd08570
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083

Change-Id: Ie5385e489621d1b334a1503d7f887b8d8aae37f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:55:49 +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
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
Arc Wang
e0983d4920 [automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054 am: 2315d0f20e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: I0b1c44dec3dd3d22f487fff825d383b2a5ee8536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 09:54:03 +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
b2b0822ee9 [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Bug: 203168097
Change-Id: I6be138b4f338e0e3a8c255e4a3d2d02bfb23253b
2022-04-07 04:08:28 +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
Bonian Chen
4829301a97 [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: 5a78d70376 -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: I0a3fa60a9529869bef4545c9a1e78f4fe5237be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 03:55:03 +00:00
Tom Hsu
edb2110c9b Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 am: e82ca817a1 am: 5f6351588e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: I7f5ee4fc83005a119c63cd3faa1c0ba83669bec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 03:54:29 +00: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
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
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