Commit Graph

83206 Commits

Author SHA1 Message Date
Evan Chen
404dbe7c55 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: I272037634069cb76cea518abafbb09b62f7127a9
2021-04-26 18:59:25 +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
aa3b120acb 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: Ie06ec7328e2ae059b3f9d43e29e4b9c2ca7109a4
2021-04-26 16:36:18 +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
03664458f5 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: I80c938defad591a9c46698b91fad3fb81ea4bc4a
2021-04-26 14:23:16 +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
a88dcb1a8e 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: I9afea9281b763fba993d7f4ce2d708a6ae75289a
2021-04-26 12:08:40 +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
51f4fff5e8 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: I39d928ac6e5f63138247f84b9f5b6a67807e82a8
2021-04-26 08:20:28 +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
e68a91fdc0 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: Ie1d96e81e00c4c9f4538163dadc023e73284ed34
2021-04-26 07:35:04 +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
4a1d52b1d6 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: I344c03d0ba485cc6295cb5bc835fb77e352b05bb
2021-04-26 06:39:58 +00:00
Betty Chang
ecb3845e5c 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: Id751806a7e6da912e837a1fb8b08805594726a3e
2021-04-26 06:39:44 +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
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
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
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
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
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
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
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
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