Commit Graph

4709 Commits

Author SHA1 Message Date
Daniel Nishi
adb949da4c Merge "Add a new toggle for Bluetooth while driving." 2018-01-24 18:22:15 +00:00
TreeHugger Robot
f3b61d1206 Merge "Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents." 2018-01-24 18:02:18 +00:00
TreeHugger Robot
09a7a819a4 Merge "Add EID into SIM status dialog" 2018-01-24 17:06:57 +00:00
TreeHugger Robot
929f0b7789 Merge changes Ibd1291ff,I5224900b
* changes:
  Add ability to show/hide System Update.
  Clean up SystemUpdatePreferences tests.
2018-01-24 08:10:14 +00:00
TreeHugger Robot
b04556453a Merge "Migrate functionality to Me Card fragment." 2018-01-24 02:56:39 +00:00
Maggie Wang
28dc885c55 Merge "Remove location_modes_previous references" 2018-01-24 01:47:54 +00:00
Chad Brubaker
8e99c7dc1f Merge "Expose lockdown button in settings" 2018-01-24 01:46:21 +00:00
Matthew Fritze
64aa50c006 Add bluetooth as a supported Slice
To add bluetooth as a valid slice requires adding
support for Context-only preference controller
constructors, which was already planned work.

Fixes: 67997327
Test: robotests
Change-Id: I7efd20a05d5796c3327a26b1fc535d5436d1070f
2018-01-23 16:16:28 -08:00
Beverly Tai
fae128f38c Merge "Adding zen dialog in zen settings" 2018-01-23 22:20:24 +00:00
Julia Reynolds
65e33e7160 Merge "Remove unused intent." 2018-01-23 22:08:32 +00:00
TreeHugger Robot
fb11ee73f6 Merge "Add icon in RestrictedAppDetails" 2018-01-23 22:03:17 +00:00
Fan Zhang
54291e10ce 2nd attempt to fix crash when getting unavailable service
Change-Id: I6abb16e1c84b82021ce2dd54097fe68857e69129
Fixes: 68013053
Test: robotests
2018-01-23 13:53:06 -08:00
Ben Lin
6fb9c9f4b0 Add ability to show/hide System Update.
This adds one flag:
config_show_system_update_settings

Which when set to false will hide "System update" from System page. This
is useful for devices that controls its system update elsewhere.

Bug: 69813881
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.deviceinfo
Change-Id: Ibd1291ffd8948419e8aa06d0721842246a069378
2018-01-23 13:51:25 -08:00
Ben Lin
2a63861a52 Clean up SystemUpdatePreferences tests.
SystemUpdatePrefenceControllerTest had some logic that seemed irrelevant
to its testing class, which seems to have moved to
AdditionalSystemUpdatePreferenceController. Removed the irrelevant
test cases and added additional test coverage on
AdditionalSystemUpdatePreferenceController.

Bug: None
Test: RunSettingsRoboTests
Change-Id: I5224900bc3449a9f329a1d02ee3cb597b4748d91
2018-01-23 13:39:12 -08:00
Chad Brubaker
5f67c6491f Expose lockdown button in settings
Test: manually verified toggle controls lockdown button visibility
Test: make RunSettingsRoboTests
Bug: 37221346
Change-Id: Ie59f9c6a1df1d877b18986c6a58492a5aa789d34
2018-01-23 13:05:49 -08:00
TreeHugger Robot
e1bf0aae82 Merge "AF/FR Fix onActivityResult condition." 2018-01-23 20:29:36 +00:00
jackqdyulei
5ac5b85d2a Add icon in RestrictedAppDetails
use preference_app to make sure the app icon is 24dp.

Bug: 71502850
Test: Screenshot | RunSettingsRoboTests
Change-Id: I0d7704246299201e72b991f199f9ddd2f224a8a3
2018-01-23 12:12:44 -08:00
Daniel Nishi
87f35e26ba Migrate functionality to Me Card fragment.
This adds in the preferences from the Device Info page into the Me Card
page. By overriding the expanded children count, these preferences
appear in the the overflow (reflecting their more power user-y status).

Bug: 63819909
Test: Manual & Robotest

Change-Id: Ic342babfb34db6343b11300eadb30b09a69f56f1
2018-01-23 11:18:24 -08:00
Ningyuan Wang
0608d2dc9d Merge "Wifi Settings: Add auto option for softap" 2018-01-23 18:55:05 +00:00
Carlos Valdivia
5dd6ed470e AF/FR Fix onActivityResult condition.
Chase list bug. Accidentally bailed on true effectively.

Manual tested by going to Settings > System > Erase All Data
And then hitting then successfully wiping and reseting.

Test: make RunSettingsRoboTests -j40
Bug: 72324059
Change-Id: Ib2a155820811f0ec62a45c1312475c24646ede76
2018-01-23 10:20:52 -08:00
Qingxi Li
37f14c0ef6 Add EID into SIM status dialog
Bug: 68761649
Test: make RunSettingsRoboTests
Change-Id: Ifdcf2abe6fa56a002841610d2652cc7364b23417
2018-01-23 10:13:31 -08:00
Daniel Nishi
cf4a5c7459 Add a new toggle for Bluetooth while driving.
The toggle is controlled by a platform feature flag.

Bug: 66679618
Test: Robotest
Change-Id: Ibe8e8756a4ab54a83ee03c6cf008193ed107955d
2018-01-23 09:38:04 -08:00
Beverly
2607287e5a Adding zen dialog in zen settings
Test: make ROBOTEST_FILTER=EnableZenModeDialogTest RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: Ib3193788bb0a31e20683d3191eb1238d6a63f1e7
2018-01-23 10:59:18 -05:00
Adrian Roos
475fa50461 Merge "DisplayCutout: Add support for multiple cutout emulation options" 2018-01-23 15:23:55 +00:00
Julia Reynolds
1c542bbeb0 Remove unused intent.
Test: cts-verifier
Bug: 63927402
Change-Id: I0ae2f33f7e8f1cce9dbe8166b522eb9cbde4c8b5
2018-01-23 09:05:37 -05:00
TreeHugger Robot
190a211a03 Merge "Display recent apps in notification settings" 2018-01-23 13:56:24 +00:00
Peter Visontay
cec65e9423 Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents.
Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I187d68e6b214d975df0fe2a3d5dc88cadec35fa3
2018-01-23 13:32:34 +00:00
Julia Reynolds
02af3659e0 Display recent apps in notification settings
The last 5 non-system apps that have sent notifications
will be displayed at the top level of notification settings for
easy access.

Test: make -j20 RunSettingsRoboTests
Change-Id: Ifaae36f977beb0438a740f61ff0ac9c97f3acc80
Fixes: 63927402
2018-01-23 12:00:05 +00:00
TreeHugger Robot
06af7c8d4b Merge "Add a new About Phone page." 2018-01-23 07:04:29 +00:00
Jong Wook Kim
0784111c9c Merge "Wifi MAC Randomization: Developer Options" 2018-01-23 06:40:51 +00:00
Maggie
85e2f61b2d Remove location_modes_previous references
1. Remove reference to LOCATION_MODE_PREVIOUS.

2. Add setLocationEnabled method in LocationEnabler. When turning location
ON/OFF from Settings app or Quick Settings, use
LocationEnabler.setLocationEnabled() instead of setLocationMode().

3. Change unit tests accordingly.

Bug: 70990911
Test: Robolectric
Test: Manual
Change-Id: Ic02ef3cd02f9aa7d2ef18697b19b507575aaf5c2
2018-01-22 21:23:28 -08:00
TreeHugger Robot
01b2d78da1 Merge "Add checkbox to let user wipe eSIM data together with FDR" 2018-01-23 03:41:43 +00:00
TreeHugger Robot
e3f187a4a9 Merge "Revert "Migrate to use instrumentation classes from settingslib."" 2018-01-23 01:58:18 +00:00
Lei Yu
27b2aa35f8 Merge "Revamp the battery detail page for each app" 2018-01-23 01:21:27 +00:00
Daniel Nishi
1e620957b8 Add a new About Phone page.
This adds the "Me Card" page. The current functionality is to show
information based upon the first account added to the system. The page
shows the user's avatar, name, primary account, and phone number.

Bug: 63819909
Test: Robotest

Change-Id: I64bfae922e828994b2b87009d0647e67dab0da42
2018-01-22 17:21:10 -08:00
Qingxi Li
c8a2b040a1 Add checkbox to let user wipe eSIM data together with FDR
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.

Bug: 67500470
Test: make RunSettingsRoboTests
Change-Id: I5a81d43f23ae55f8549a5b807fdf41f36c9d3acd
2018-01-22 16:08:23 -08:00
TreeHugger Robot
f40d679dca Merge "Use SoftAp API to get number of connected device" 2018-01-22 23:49:34 +00:00
TreeHugger Robot
058427b02d Merge "AR/FR: Tests using stubbed values." 2018-01-22 23:30:34 +00:00
jackqdyulei
29002aacb0 Revamp the battery detail page for each app
1. Move preferences to new postion
2. Change background activity pref from SwitchPreference to
Preference and update the controller

Bug: 72227981
Test: RunSettingsRoboTests
Change-Id: Ib18ac7523c24d19754c37ab8ac527095d9ced49c
2018-01-22 15:13:55 -08:00
jackqdyulei
d506894f5d Use SoftAp API to get number of connected device
Create unit test because robolectric doesn't have the new API

Bug: 68058038
Test: SettingsUnitTest

Change-Id: I9fa27d51c4d270b2fb92db7dfc3955e33d4a3f4a
2018-01-22 13:46:30 -08:00
Carlos Valdivia
08c8820b29 AR/FR: Tests using stubbed values.
Also a simplifying change to MasterClear.

Test: Standard robotests
Bug: 63937032
Change-Id: I54fe60c2e38d938148f89d043bf8a7f7698edc42
2018-01-22 13:31:24 -08:00
Leif Wilden
cab0ee611d Revert "Migrate to use instrumentation classes from settingslib."
This reverts commit 1546cca529.

Reason for revert: Broke fingerprint setup flow. b/72267201

Change-Id: I8321265ae64732c526325882ddea51080decddf5
2018-01-22 20:57:36 +00:00
Lei Yu
86a6997710 Merge "Change high usage detector logic" 2018-01-22 20:21:51 +00:00
Jong Wook Kim
8c6d8daaf0 Wifi MAC Randomization: Developer Options
Add a toggle in developers options to turn on/off connected MAC
randomization for devices that support the feature. This toggle will be
only available on devices that support dynamic MAC address change and
indicated as so in config_wifi_support_connected_mac_randomization.

The toggle changes Settings Global value WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, which the Wifi Framework will listen for to start/stop randomizing MAC addresses.

Bug: 67908229
Bug: 71548421
Test: RunSettingsRoboTests, manual testing checking that the toggle comes up and changes global settings value.
Change-Id: Ia4749cd0a1e7466333bd8a93088d6340f6567e25
2018-01-22 02:16:31 -08:00
Qingxi Li
aaf307e71d Merge "Add checkbox for erase esim under network reset screen" 2018-01-20 06:20:02 +00:00
jackqdyulei
92dcd78ad3 Change high usage detector logic
Based on the requirement, change it to detect:
"whether battery draining is larger than x in the last y hours"

Bug: 70570352
Test: RunSettingsRoboTests
Change-Id: I9fb1a9f2fe38d5d64681dafe26311aeab7f3fe9c
2018-01-19 20:25:07 -08:00
Ningyuan Wang
a8df3064cd Wifi Settings: Add auto option for softap
For device with 5g support, settings will display auto, 2g, and 5g options.
For decice without 5g support, auto and 2g option are shown.

Bug: 68763822
Test: compile
Test: m RunSettingsRoboTests -j40
Test: manually test by checking UI and start hotspot with no issue
Test: manually test that wifi settings logs expected values

Change-Id: Iee9f8cff6aa48df80f5c228596cd9a14f884c274
2018-01-19 16:41:13 -08:00
Qingxi Li
0caad2f3ba Add checkbox for erase esim under network reset screen
This CL add a checkbox letting user decide when they reset the network
configurations under System > Reset options > Reset Wi-Fi, mobile &
Bluetooth, whether they want to reset eSIM together or not. If the user
choose to reset eSIM togather, EuiccManager#eraseSubscriptions will be
called and all the eSIM profiles will be removed.

Bug: 62961867
Test: E2E & make RunSettingsRoboTests
Change-Id: I533756b12c0474e8e58cc6fe60a38c119365cee2
2018-01-19 14:26:50 -08:00
TreeHugger Robot
a9f6d41635 Merge "Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set." 2018-01-19 22:25:23 +00:00
TreeHugger Robot
95c89da244 Merge "Unregister hotspot receiver in TetherService." 2018-01-19 22:01:18 +00:00