Commit Graph

82696 Commits

Author SHA1 Message Date
YUKAI HUNG
4a81146e9e Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865

Change-Id: I39f42b2bb93efd2b09ef32d8e249de2b307b63be
2021-04-27 09:43:13 +00:00
Jeremy Goldman
3affba45cd Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: I2106b497c20f3c1f4206355eb8303a33c67ed4a8
2021-04-27 09:42:58 +00:00
YUKAI HUNG
95b5d0393d Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev 2021-04-27 09:19:17 +00:00
Peter_Liang
50efd602b9 Update the BC style for the vision settings in SuW.
Bug: 179234608
Test: manual test
Change-Id: I152eaab8ad77c7a1fccbc82d7ed8cef406fc1821
2021-04-27 16:29:56 +08:00
Jeremy Goldman
f1ee6987e6 Merge "Combine 5G and recommended strings" into sc-dev 2021-04-27 07:41:45 +00:00
ykhung
2f441d2a3e Draw timestamp information into BatteryChartView manually (1/2)
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: Ib4ac21ba2d12a6cb65b46ba3f1023fe9f14c539b
2021-04-27 07:25:53 +00:00
Yanting Yang
67c3e12075 Merge "Update homepage icon for Wallpaper & style" into sc-dev am: 72ba46a9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319863

Change-Id: Ic17ee95e6faf9244311fa2e52d77b2ebf057569b
2021-04-27 07:19:08 +00:00
Yanting Yang
72ba46a9bb Merge "Update homepage icon for Wallpaper & style" into sc-dev 2021-04-27 07:04:40 +00:00
Lucas Lin
806105acf2 Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401

Change-Id: I74bdafcfba1833835a2e6b4e1650a6e501c3f093
2021-04-27 06:15:07 +00:00
Lucas Lin
614f653aeb Merge "Use [set|get]PrivateDnsMode directly" into sc-dev 2021-04-27 06:03:14 +00:00
Joy Babafemi
70d929d061 Merge "Update UWB toggle state with a getter API" into sc-dev am: 4b19eae08b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283946

Change-Id: I2e4b4d83754d8b0a848c39b489f781ca901efbe4
2021-04-27 05:27:19 +00:00
Joy Babafemi
4b19eae08b Merge "Update UWB toggle state with a getter API" into sc-dev 2021-04-27 05:10:52 +00:00
Yanting Yang
b70bf60b09 Merge "Update string for the wallpaper title on homepage" into sc-dev am: db74d13d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297856

Change-Id: I23875a533fe7f22501908b9e3b0623d707e3920b
2021-04-27 03:48:13 +00:00
Joy Babafemi
7cf391dddd Update UWB toggle state with a getter API
Also updates capitalization for strings

Test: Manual on Raven & Robotest
Bug: 183254940
Change-Id: I9d3a4694746b44e80c60a9097abd0cbb647c1348
2021-04-27 03:46:39 +00:00
Yanting Yang
243956834d Update homepage icon for Wallpaper & style
Bug: 185334720
Bug: 178363516
Test: visual
Change-Id: Iebc213be301e157a10299ff611817e8b03704c8a
2021-04-27 03:07:15 +00:00
Yanting Yang
db74d13d4f Merge "Update string for the wallpaper title on homepage" into sc-dev 2021-04-27 03:05:18 +00:00
Dmitri Plotnikov
422fcf36af Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev am: dd9c9a8c17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14298485

Change-Id: Ib441b84f92ec2d417a00bc5eced4ca2b5d86eccc
2021-04-26 22:47:37 +00:00
Dmitri Plotnikov
dd9c9a8c17 Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev 2021-04-26 22:44:26 +00:00
Evan Chen
399773c949 Merge "Companion Device App showing in Settings" into sc-dev am: e14cc634dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14148351

Change-Id: I21a203f4a26741b9fc79bda84bc2d85698dbd9cb
2021-04-26 19:00:18 +00:00
Evan Chen
e14cc634dc Merge "Companion Device App showing in Settings" into sc-dev 2021-04-26 18:22:02 +00:00
Edgar Wang
0a61b4774e Merge "Remove divider in Date & Time Settings" into sc-dev am: c603e02d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187783

Change-Id: Ic2ce6a99ec190b3f8baa2963f0888b8c3a946a33
2021-04-26 16:36:35 +00:00
Edgar Wang
c603e02d11 Merge "Remove divider in Date & Time Settings" into sc-dev 2021-04-26 16:15:55 +00:00
TreeHugger Robot
59300a8055 Merge "Tweak title in privacy page" into sc-dev am: 42e05a07b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297858

Change-Id: If2b5409203277cde379c8870905819cd8ea46aab
2021-04-26 14:24:18 +00:00
TreeHugger Robot
42e05a07b5 Merge "Tweak title in privacy page" into sc-dev 2021-04-26 13:54:51 +00:00
Edgar Wang
4f3ee93285 Remove divider in Date & Time Settings
- Add preferenceCategory for Time zone

Fixes: 183578528
Test: robotest & visual
Change-Id: If275c569d810a8bc4d2e2620c51b54379dca31b4
2021-04-26 20:50:23 +08:00
Tsung-Mao Fang
9142869526 Tweak title in privacy page
There's an item under Settings > Privacy called "Privacy".
The strings should not be repeating the page title.

Test: see screen
Fix: 186131466
Change-Id: If60cbabd163e8168b02a63a96c82d93ad6ee3c8d
2021-04-26 20:31:01 +08:00
YUKAI HUNG
bd338983d1 Merge "Draw percentage information into BatteryChartView manually" into sc-dev am: f634831de7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297854

Change-Id: I6199a0a639b333907285e8b3676540dc6d8a2f0a
2021-04-26 12:12:09 +00:00
YUKAI HUNG
f634831de7 Merge "Draw percentage information into BatteryChartView manually" into sc-dev 2021-04-26 11:59:19 +00:00
Yanting Yang
2713eaaddc Update string for the wallpaper title on homepage
Bug: 185334720
Test: visual
Change-Id: I17d7050e63ed8ec5c3eba98b96b1151dbe4b3bdd
2021-04-26 10:03:29 +00:00
PETER LIANG
62c2dd0b44 Merge "Fix the GAR issue of TalkBack said "double-tap to activate" on the slider title of Accessibility button page." into sc-dev am: 921c677320
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297848

Change-Id: I17c45718e62c3f086d8009c1565131d328ee4982
2021-04-26 08:20:41 +00:00
PETER LIANG
921c677320 Merge "Fix the GAR issue of TalkBack said "double-tap to activate" on the slider title of Accessibility button page." into sc-dev 2021-04-26 08:00:28 +00:00
ykhung
1001614b14 Draw percentage information into BatteryChartView manually
screen: https://screenshot.googleplex.com/Bw4Whpzff5pCT5J

Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I61c0f73e27dc2980d0812e00c2fdfda9a628b696
2021-04-26 07:53:49 +00:00
TreeHugger Robot
bfcbd03fd3 Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev am: 5f876de174
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292670

Change-Id: Ia6a9e646d30d6659499c01cc468c38d174bea44b
2021-04-26 07:37:02 +00:00
TreeHugger Robot
5f876de174 Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev 2021-04-26 07:16:02 +00:00
TreeHugger Robot
3415b49779 Merge "Make app usage page support legacy version" into sc-dev am: e39066c388
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271580

Change-Id: I8e66168175fa7dda0c248408b7c818803c7da704
2021-04-26 06:40:05 +00:00
Betty Chang
5ea5709004 Merge "Add TextWatcher for the ip config field" into sc-dev am: 75d6293a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299194

Change-Id: Ic56e04f4e56a3e42bd5d0858e34437643e27329a
2021-04-26 06:39:54 +00:00
TreeHugger Robot
e39066c388 Merge "Make app usage page support legacy version" into sc-dev 2021-04-26 06:34:28 +00:00
Betty Chang
75d6293a50 Merge "Add TextWatcher for the ip config field" into sc-dev 2021-04-26 06:17:56 +00:00
Wesley.CW Wang
d67f878c67 Make app usage page support legacy version
- Add a flag to divide legacy and new design
 - Add new layout for tristate design

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I61f694cad8ac9cea8195191feacbe80bac2df62e
2021-04-26 13:18:33 +08:00
jasonwshsu
5e729dafdb Wrap a white adaptive background if it is not an AdaptiveIcon am: 9b284a9af1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233640

Change-Id: I2670f1a27dd8ee2e8f196ce2e3fd00d0a3b7df11
2021-04-26 05:18:23 +00:00
jasonwshsu
9b284a9af1 Wrap a white adaptive background if it is not an AdaptiveIcon
Bug: 183501919
Test: manual test
Change-Id: I6a899aa0fcb724d5318274190f359080fc2d0615
2021-04-26 05:01:00 +00:00
changbetty
244268b98d Add TextWatcher for the ip config field
[Root Cause]
We always check the valid for the ip config field. If the text is empty
we will set the default for user even if user deleted the values.

[Solution]
Add TextWatcher for the ip config field (include gateway/network prefix
length/dns1). If the text change and the text is empty, we will set the
hint for user, not the default.

Bug: 179331339
Test: manual test
       make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2
Change-Id: I1976200c70ae768285a44aff5df54ced00a78171
2021-04-26 12:53:08 +08:00
YUKAI HUNG
afe3c8bc9d Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev am: 8ec6502699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299196

Change-Id: I963ad8d3959c1f443ebde1b4d040b37f552769f4
2021-04-26 04:04:50 +00:00
Hugh Chen
c2adcb2d3a RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249)
2021-04-26 03:45:59 +00:00
Hugh Chen
093ac45cd8 RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249)
2021-04-26 03:45:01 +00:00
Hugh Chen
43d093ebe8 RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249)
2021-04-26 03:43:57 +00:00
YUKAI HUNG
8ec6502699 Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev 2021-04-26 03:43:50 +00:00
Hugh Chen
208e32af9f RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249)
2021-04-26 03:42:48 +00:00
TreeHugger Robot
c5fa9c115a Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671

Change-Id: Ib6e760d2e6fd22a9a9bfc073da5f46c0e7cab5f4
2021-04-26 03:27:13 +00:00
Hugh Chen
e21d06f6ee RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249)
2021-04-26 03:12:21 +00:00