Commit Graph

79019 Commits

Author SHA1 Message Date
Hugh Chen
01a50db645 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:32:58 -08:00
Hugh Chen
48ec74592d RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:31:39 -08:00
Hugh Chen
9037e43fa8 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:31:22 -08:00
Peter Kalauskas
0fa7edbb02 Update icons and text for guest user
Test: As Guest, open Settings > System > Multiple users
Test: As Owner, open Settings > System > Multiple users
Bug: 169783558
Change-Id: I42c0b46fd895267b7556f3f308957b6dd17d92c4
2020-12-30 17:43:14 -08:00
jasonwshsu
f30eded170 Extract magnification capabilities from MagnificationSettingsFragment into a new class.
* To increase single responsibility of MagnificationSettingsFragment

Bug: 168567356
Test: atest MagnificationCapabilitiesTest
Change-Id: Ic5e8a556858ac2b6ab9929b1bbdc373ce320c270
2020-12-30 19:40:43 +08:00
Weng Su
b6a5141953 Merge "Add Hotspot WPA3 Settings" 2020-12-30 03:09:00 +00:00
TreeHugger Robot
65ced1482d Merge "Revert "Add adaptive charging to the top level settings menu"" 2020-12-29 20:08:25 +00:00
Amber Ogata
89d81de62e Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c am: 25ff810ef9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ab15b83fbd574e6db202a7cc2eab1be461597a3
2020-12-29 18:20:56 +00:00
Amber Ogata
25ff810ef9 Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib87255a28d45127a68eea13b217e169fcfbba0cd
2020-12-29 18:05:57 +00:00
Daniel Chapin
2f51836ca1 Revert "Add adaptive charging to the top level settings menu"
Revert submission 12989357-fix_ac_menu

Reason for revert: Bug: 176473169
Reverted Changes:
I6fc50a5ae:Add adaptive charging to the top level settings me...
I8f600287c:Add adaptive charging to the top level settings me...

Change-Id: I2928a96112bb8d2beeb071f231af6595edead4fa
2020-12-29 17:55:13 +00:00
Amber Ogata
ac0f1fc20c Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424f31e085814e4afd0b92d3295d25301febf5ca
2020-12-29 17:29:57 +00:00
Amber Ogata
4de1ae6a45 Merge "Add intent filter to open premium sms setting." 2020-12-29 17:01:04 +00:00
TreeHugger Robot
c0cbcb9f04 Merge "Add test cases for ToggleAutoclickPreferenceController." 2020-12-29 15:20:02 +00:00
Tom Hsu
36ecdd496c Merge "[Provider model] Internet picker Part II" 2020-12-29 14:23:14 +00:00
Peter_Liang
c7c1e7d442 Add test cases for ToggleAutoclickPreferenceController.
Bug: 168567356
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ToggleAutoclickPreferenceControllerTest

Change-Id: I4ea1089ddc9aad8748b950c38617533dc1d5cb02
2020-12-29 21:41:14 +08:00
Weng Su
8b1989cdcc Merge "[Provider Model] Implement the carrner network selection" 2020-12-29 13:13:16 +00:00
tom hsu
65f8aa2f7b [Provider model] Internet picker Part II
- Add mobile internet preference with default data subscription.
 - Make prefrence to show dynamically when data subscription changed.

Video exhibition
 - http://rcll/gcmsphfhJ1UzfPSvjWOuXK/c1B2CtaFz27rlIQ2LSTJmo

Code difference
 - SubscriptionsPreferenceControllerTest.java between robolectric and junit.
  - https://diff.googleplex.com/#key=1Zm7JGPhoZwY

Bug: 172229552
Test: atest SubscriptionsPreferenceControllerTest

Change-Id: Ib50c2c51159f60f19631d1a02081eafde3436e94
2020-12-29 19:48:21 +08:00
Treehugger Robot
581573f0d7 Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6 am: defe0a6b9f am: 8dc014e909
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I077de332388b35b1177853d0f590ae0b4ea7d29f
2020-12-29 09:41:38 +00:00
Treehugger Robot
8dc014e909 Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6 am: defe0a6b9f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia74c0bea83aa76c4b8aa453a190bebe8041eafed
2020-12-29 09:27:29 +00:00
Treehugger Robot
defe0a6b9f Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e57028b2b4cabaa7bd9aaac6a134b54af5b3116
2020-12-29 08:57:36 +00:00
Treehugger Robot
a1716edbb6 Merge "hardwareinfo: Hide hardware revision if empty" 2020-12-29 08:21:35 +00:00
Weng Su
e0062af10c Add Hotspot WPA3 Settings
- Add WPA3 SAE security types
  - "WPA3-Personal"
  - "WPA2/WPA3-Personal"

- Verify valid WPA3 password

- Enable QR code scanner for Hotspot WPA3

- Screenshot
  https://screenshot.googleplex.com/B6u54wh8w35Xnyf
  https://screenshot.googleplex.com/8hWHHUTb6UaS9vB

Bug: 167968488
Test:
- Manual Test
- atest WifiTetherSecurityPreferenceControllerTest
- atest WifiUtilsTest

Change-Id: I155ed0bfd187d27ba864f9fb1b78d08c437740f3
2020-12-29 08:04:10 +00:00
Edgar Wang
02013aeeb6 Remove org.apache.http.legacy from Settings
It appears that all usages of org.apache.http were removed after aosp/118987.
Keeping this library in the phone settings manifest and build files adds an
unnecessary dependency for both phone settings

Bug: 176242377
Test: rebuild
Change-Id: I58eb077c2518c58b82e931596dfaefb151213c25
2020-12-29 14:45:14 +08:00
Treehugger Robot
ba98c52ce3 Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485 am: cc162a2cfa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4d0ae86737b85b4477db972700c6018e75adbb
2020-12-29 06:24:02 +00:00
Treehugger Robot
cc162a2cfa Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1bb6248061f8e566d6db457ee1ad81e4be116
2020-12-29 06:08:37 +00:00
Treehugger Robot
6873e19485 Merge "Settings observer fail to unregister." am: b92cb6678c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f67c00a5fbb23594a527d0a8d77b9617b635a18
2020-12-29 05:38:14 +00:00
Treehugger Robot
b92cb6678c Merge "Settings observer fail to unregister." 2020-12-29 05:26:12 +00:00
TreeHugger Robot
b0fe302a6d Merge "Sync the screen timeout preference to display_settings_v2.xml" 2020-12-29 04:20:53 +00:00
Chiachang Wang
283136fb24 Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198 am: 85b853725d am: e3b7c01f9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2430c5b1fb40bdf89461c535a0fef85eb911b7ea
2020-12-29 01:23:41 +00:00
Amber Ogata
9d5de29fcc Add intent filter to open premium sms setting.
Test: adb shell am start -a android.settings.PREMIUM_SMS_SETTINGS -d package: com.android.settings
Bug: b/175911991
Change-Id: I1b48494d8d388ad52c5966dbd1e89b1a6f9c6785
2020-12-29 01:19:58 +00:00
Chiachang Wang
e3b7c01f9a Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198 am: 85b853725d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I530eff9d77629af47e4f8da2ad660aab7f3431f3
2020-12-29 01:01:04 +00:00
Chiachang Wang
85b853725d Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26de8a5227ecaa4ede80a9154ffa5078b4fb293e
2020-12-29 00:47:18 +00:00
Chiachang Wang
6aef579198 Merge "Update getMobileProvisioningUrl to telephony surface" 2020-12-29 00:24:12 +00:00
Stephane Lee
1f2a8d50d8 Merge "Add adaptive charging to the top level settings menu" 2020-12-28 21:12:02 +00:00
TreeHugger Robot
febcf52a7d Merge "Rename and add test cases for video player in accessibility." 2020-12-28 16:04:21 +00:00
Peter_Liang
5bd435e6c4 Rename and add test cases for video player in accessibility.
Bug: 168567356
Test: make RunSettingsRoboTests ROBOTEST_FILTER=VideoPlayerTest

Change-Id: I2ea415b06d2870f55650290f48dd9b2998ef608d
2020-12-28 22:39:03 +08:00
Weng Su
74b18587fb [Provider Model] Implement the carrner network selection
- Add primaryAction for connecting carrier network

- User toggles carrier network On/Off
  - Calls MergedCarrierEntry#setEnabled(true/false)

- User taps on carrier network
  - Calls MergedCarrierEntry#connect()

Bug: 175761096
Test:
- Manual Test
- atest ProviderModelSliceTest
- atest ProviderModelSliceHelperTest
- make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: I07cb6c142a2f4e9cbdbab1f77afdc367728b4e3f
2020-12-28 13:23:24 +00:00
Yanting Yang
7ec1f24d0c Sync the screen timeout preference to display_settings_v2.xml
Sync the screen timeout preference of display_settings.xml to
display_settings_v2.xml since it has been changed to
RestrictedPreference in ag/13210343.

Bug: 174964139
Test: robotests
Change-Id: Ic648198f5d665483a1b13e13d921b2810325eff4
2020-12-28 20:49:21 +08:00
Edgar Wang
a763ba93c1 Move Settings preferenceCategory style into SettingsTheme
Bug: 176407895
Test: manual
Change-Id: I98245dfdf27a3848c24e81f4d5d8f5f19e1e817c
2020-12-28 10:10:26 +00:00
Pasty Chang
2e78fd7115 Merge "Change the color accent in setup AlertDialog for dark mode" 2020-12-28 03:43:49 +00:00
Jason Chiu
2133856853 Merge "Support contextual suggestion" 2020-12-28 02:44:22 +00:00
TreeHugger Robot
e40069772c Merge "[Provider Model] Remove “Advanced” section" 2020-12-28 02:13:51 +00:00
Jason Chiu
bd854ccd10 Support contextual suggestion
- add a suggestion layout
- add an interface to get fragment in suggestion feature provider
- remove the first preference category of homepage IA to align its top
  with the bottom of the search box

Bug: 173768418
Test: robotest
Change-Id: I784e3eef29ca474c4c89f07b916c6500fabbf7d4
2020-12-27 01:37:30 +08:00
TreeHugger Robot
45a8b37d3e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-26 15:57:13 +00:00
Bill Yi
c57979a018 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I870bf29286f74794a5a7c73e5d7d2f905e0d6f64
2020-12-25 20:26:27 -08:00
Yanting Yang
3932b07365 Move Styles & wallpapers to the homepage group
- Add Styles & wallpapers to the homepage group.
- Create a new display settings xml for the silky home.
- Remove Styles & wallpapers from new display settings xml.
- Apply the RestrictedTopLevelPreference to remove the restricted icon.

Bug: 168166015
Bug: 174964139
Test: robotest & visual with turning on/off silky home
Change-Id: Ib495b39bc62413242247f7e767c0e44bacc6e937
2020-12-25 09:04:12 +00:00
Weng Su
eaa85b0b6c [Provider Model] Remove “Advanced” section
- Screenshot:
  https://screenshot.googleplex.com/bHB4RwhN9PBfWAF

Bug: 172788645
Test:
- manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest

Change-Id: Id4c73911905830779004e407be9b01f4faac5268
2020-12-25 08:13:36 +00:00
pastychang
37e832873b Change the color accent in setup AlertDialog for dark mode
It should set a dark color when enabling dark mode.

Bug: 176275212
Test: atest & manual
Change-Id: I2d860c52171299140ebcb77b08f7196d4a513d6b
2020-12-24 19:37:43 +08:00
TreeHugger Robot
d3c7666770 Merge "Remove the flaky Conditionals test." 2020-12-24 10:52:03 +00:00
TreeHugger Robot
9e42672a7a Merge "Fix broken test" 2020-12-24 10:41:18 +00:00