Commit Graph

83167 Commits

Author SHA1 Message Date
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
TreeHugger Robot
4cc4b47adf Merge "Fix unable to change language" into sc-dev 2021-04-26 03:11:34 +00:00
Peter_Liang
5c05e0f160 Fix the GAR issue of TalkBack said "double-tap to activate" on the
slider title of Accessibility button page.

Root cause:
Set "android:selectable" as true.

Solution:
Remove "android:selectable".

Bug: 183469419
Test: manual test
Change-Id: I337cfe0795205dec5e4654b90d6c7e2c7fd7ca77
2021-04-26 09:32:41 +08:00
Joshua Mccloskey
cb752f7772 Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131

Change-Id: Icb6b9c37d1e2a91718b5e961414319e417ffe891
2021-04-25 23:32:54 +00:00
Joshua Mccloskey
5487f2fa6c Merge "Updated settings for new get/set feature change" into sc-dev 2021-04-25 23:20:35 +00:00
ykhung
002a913e3b Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195

Change-Id: I32d52c90f7970eab010864d19421a435b5f87869
2021-04-25 11:23:43 +00:00
ykhung
6ee911e468 Refresh category title by different time slot condition am: 41fd8a7494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187

Change-Id: I48fbc14d08f23122a917d44a39ec22a0a43eaf4f
2021-04-25 11:23:41 +00:00
ykhung
75c5fc5906 Wrap and carry clicked slot information data for restriction page
Refresh category title by different time slot condition

Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I006f6825fdb471f863c0355c65bfc4ca9d980191
2021-04-25 11:05:03 +00:00
ykhung
5e578ddd13 Fix incorrect battery history merging logic to cause data losing
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic26799f4d95b9f990e873ee26a42d6cc0c404659
2021-04-25 08:35:55 +00:00
ykhung
41fd8a7494 Refresh category title by different time slot condition
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ib124e1cfb9549f838540ff547bc616049f65180d
2021-04-25 07:47:31 +00:00
Eugene Susla
7dc2624b51 Companion Device App showing in Settings
Added a feature that users are able to see/remove the apps' associations
in Settings/Connected devices.
It will display the icon of the associations app, app's name and a button
that users are able to remove the associations. Also it will pop up a
dialog alerting user before remove the associations.

Screenshot:
https://screenshot.googleplex.com/APSRhW2retYmAAK

Bug: 165951651
Test: Manually Test

Change-Id: Iccaeaf516e8a78d4ef33415c1c2d7379139ec88c
2021-04-24 21:31:25 +00:00
Santos Cordon
c0e6912355 Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526

Change-Id: I40235ddc3762e6a13bd79abf80cfc591c6d4b50e
2021-04-24 15:59:28 +00:00
Santos Cordon
219dabcabf Merge "Use new getBrighntessInfo() API for brightness" into sc-dev 2021-04-24 15:38:20 +00:00
YUKAI HUNG
dc2d185e54 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275

Change-Id: Ib142234e985e4030271bc150f762e172aeaaa33d
2021-04-24 13:15:31 +00:00
YUKAI HUNG
230c3f2de0 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev 2021-04-24 13:03:08 +00:00
Timi
06af9f9005 Device picker: add title to fix offset in progressbar
* Add a title to device picker fragment in order to
   move the progressbar to the correct place

Test: make Settings, share a file via Bluetooth,
verify progressbar is properly placed

Change-Id: I2fcf293ed2d70d123d65cf76051a6d7d745a773b
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
2021-04-24 08:43:41 +00:00
ykhung
ef6cea8c84 Add test cases for utcToLocalTime in the ConvertUtils
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I22bda2db821e69c40202db692ada52e96af25e16
2021-04-24 13:41:45 +08:00
Julia Reynolds
234be7401e Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890

Change-Id: Ic65c3a89dd1b6b5c4a1b14bd93386d441be730bb
2021-04-24 00:53:49 +00:00
Julia Reynolds
9d77efb7e7 Merge "Move preference loading to a background thread" into sc-dev 2021-04-24 00:34:26 +00:00
Dmitri Plotnikov
a485d8dfd5 Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants
Bug: 186006876
Test: make RunSettingsRoboTests
Change-Id: I873fa5a492dfcddbb65004c30764d1bf8911f78f
2021-04-23 14:27:37 -07:00
TreeHugger Robot
4717c47250 Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593

Change-Id: I1db90858e7000cc18ab40068a0b71395a6874c90
2021-04-23 20:29:36 +00:00
TreeHugger Robot
8eec01fc17 Merge "Do not auth in settings if UDFPS" into sc-dev 2021-04-23 20:12:46 +00:00
Julia Reynolds
aee53bc98d Move preference loading to a background thread
To improve the loading time of the Notifications screen. Also introduce
placeholder preferences to minimize jank when the data becomes available

Test: Robotests, adb shell am start -W -a android.settings.NOTIFICATION_SETTINGS
Fixes: 185877371
Change-Id: Id63469fdb42e1a66468f2c5f1da8c366686f06e4
2021-04-23 19:48:02 +00:00
Chloris Kuo
77fa05dc62 Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599

Change-Id: I1872255fcac53357986df39a1a98f7fa82fd3234
2021-04-23 19:36:21 +00:00
Chloris Kuo
b0ab98b92d Merge "NAS setting onboarding string change" into sc-dev 2021-04-23 19:17:36 +00:00
Adam Bookatz
f493bf0cdb UserDetailsSettings uses Guest string, not Guest name
The UserDetailsSettings panel, and its title, show the user's UserInfo.name.
This is correct for a regular user (and for the Owner). But for a Guest user,
this is incorrect, and the user_guest string should be used instead.

The difference occurs if the system language is changed after the guest is created;
the word 'guest' should update to the current language, not be frozen to the
language at the time of the guest's creation.

Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I545aa3e6cc5d00c0bcc49960f37dddd9334b153b
2021-04-23 10:39:27 -07:00
TreeHugger Robot
6e66c255e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84ee621d5609d107add87e3f739809ad21b7f5b3
2021-04-23 17:28:24 +00:00
Bill Yi
74a8df6cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75d04b3427d1b020245767653aa5c848d3b0a3ac
2021-04-23 17:28:21 +00:00
TreeHugger Robot
498cd06f02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f4eba63e91036e84edf5c75addea1aa34eb224b
2021-04-23 17:28:12 +00:00
Bill Yi
e625b34beb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc1091947385ac5a2a6ce02f298721641219ae63
2021-04-23 17:27:36 +00:00
TreeHugger Robot
9f5f9bc960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I626e49c4ddce9a2410b4e7f2f4a89df47e341819
2021-04-23 17:19:14 +00:00