Commit Graph

84681 Commits

Author SHA1 Message Date
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
jasonwshsu
590dafc083 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: I18a704c56d0ec125435591e96b7a9b8342752d07
2021-04-26 05:20:06 +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
2b25e11bf6 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: I7793936888172a994195a11837acfd85cd435a9d
2021-04-26 05:18:14 +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
ca18b0883d 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: I4817d27989abbfca8f4c967596e92ddfa74e49e0
2021-04-26 04:06:29 +00:00
YUKAI HUNG
fd927adec3 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: I40aeb90b7b175e0e6bba671931b63b5b28234b29
2021-04-26 04:04:38 +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
5619486876 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: I05058a4bea3682405236959a7bb60cedfbd1856c
2021-04-26 03:28:49 +00:00
TreeHugger Robot
81850c1a7a 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: I2abb035fc3b86649772562072487d996e9cb09e0
2021-04-26 03:27:04 +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
a5ba299ab7 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: I59b0e7aac88f85382ef8513a53a356f265b17fd0
2021-04-25 23:34:39 +00:00
Joshua Mccloskey
ecdce82c6f 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: Ia1eb05aabe80e2617c6854a18852423ee3ecfaf2
2021-04-25 23:29:19 +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
3a6bdd5c11 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: Ia57002ef0ff4f085f89271eb7bf65b5e53199ff9
2021-04-25 11:25:20 +00:00
ykhung
3fa5df6ec7 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: Ic548683719cf72a5a9ad168f6f4b8b610bd83784
2021-04-25 11:25:19 +00:00
ykhung
f64775502a 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: I746e0ef1f7330d78f001c1b1ce92beac5464597b
2021-04-25 11:23:33 +00:00
ykhung
1d54252b9f 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: I394b045149277fff4bf4712849ef300a50c99b7d
2021-04-25 11:23:31 +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
f7b6e27c94 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: Ia12243c9edbe07502d3948a6f51c45e64a320446
2021-04-24 16:01:09 +00:00
Santos Cordon
b7d64ed7e7 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: I0541a077707c635124bd89211f154234cad81c84
2021-04-24 15:59:26 +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
34f4df5a48 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: Ie55a76e212c3dc33d8c82c5d2cb62496784cd418
2021-04-24 13:17:14 +00:00
YUKAI HUNG
ab4e189c58 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: Ice2a60064723c72f6203a9fb06edc0fcd58192e2
2021-04-24 13:15:33 +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
c74fcc9f52 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: I8d4d02f6769de4de84d7a46781f7b0dca91f804d
2021-04-24 00:55:22 +00:00
Julia Reynolds
6847795ce6 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: I95ff44498dd066c991dad2e152a5a764b5f3ef50
2021-04-24 00:53:28 +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
8dc93befa6 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: I670eeadb081514dc41bc8923ab60667cd28dab34
2021-04-23 20:31:22 +00:00
TreeHugger Robot
c5afdce49d 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: I1189e3aff61536dd014bce38dca21c4ba9b72959
2021-04-23 20:29:27 +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
4a1526263f 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: Ibaca3e55dd95b9b33e4bfcc9bef19814318f6a7c
2021-04-23 19:38:04 +00:00
Chloris Kuo
99ed186650 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: I72c3d19cb78e2e0507dc732ec5cd5c953a80b876
2021-04-23 19:33:28 +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