Commit Graph

18517 Commits

Author SHA1 Message Date
Andrew Sapperstein
e8e65a367b Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19:19 +00:00
Antony Sargent
1e69f27a41 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
2017-07-26 16:18:50 +00:00
TreeHugger Robot
9fb7a3b8b4 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev 2017-07-26 10:53:30 +00:00
Antony Sargent
c00fedc639 Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-26 07:00:51 +00:00
Jack He
a65e3e6795 Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a
2017-07-26 06:34:30 +00:00
TreeHugger Robot
0c6f001c09 Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev 2017-07-26 06:28:44 +00:00
TreeHugger Robot
4906a2a38a Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev 2017-07-26 06:11:07 +00:00
Fan Zhang
43ef9743a2 Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37

Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
2017-07-26 06:07:37 +00:00
Fan Zhang
5fb56c5b37 Merge "Extract method to build preference count logging's name." into oc-dr1-dev 2017-07-26 05:59:57 +00:00
Doris Ling
0224a409a9 Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev 2017-07-26 04:14:07 +00:00
Christine Franks
a1f56b5faa Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
2017-07-26 02:52:52 +00:00
Christine Franks
a7e10e0316 Merge "Restrict changing wi-fi networks" into oc-dr1-dev 2017-07-26 02:38:08 +00:00
Doris Ling
a60d3ef00c Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I7fc59ace61bb89b40ab3eabe774a89128895515f
2017-07-26 02:08:45 +00:00
TreeHugger Robot
0e9711ab92 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev 2017-07-26 02:02:32 +00:00
TreeHugger Robot
5aca5f3aec Merge "Add default value to inline payloads" into oc-dr1-dev 2017-07-26 01:52:38 +00:00
Jack He
70f293ee50 Bluetooth: reset mConnectionState when adapter is OFF
* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
  order to display the correct summary message on ConnectedDevice
  preference
* Otherwise, "Connected to null" will be shown because no device is
  connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state

Bug: 62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
      unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409
2017-07-26 00:31:55 +00:00
Fan Zhang
ae70d2cd34 Extract method to build preference count logging's name.
Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
2017-07-25 16:49:43 -07:00
Doris Ling
3230d95f9c Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests
2017-07-25 16:40:30 -07:00
Andrew Sapperstein
fba88cc7c0 Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
2017-07-25 23:34:03 +00:00
Andrew Sapperstein
5b67e453bf Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev 2017-07-25 23:21:48 +00:00
Fan Zhang
7da06bd11b Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev 2017-07-25 23:06:11 +00:00
Matthew Fritze
73056522b3 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests
2017-07-25 14:37:05 -07:00
Fan Zhang
2f84a358d9 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
2017-07-25 21:30:57 +00:00
TreeHugger Robot
6ef56e43ee Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev 2017-07-25 21:23:19 +00:00
Matthew Fritze
151cc3166d Merge "Add default value to inline payloads" into oc-mr1-dev 2017-07-25 21:10:55 +00:00
Lei Yu
2e70aea742 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am: 5963ffd4e3

Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
2017-07-25 20:55:16 +00:00
Lei Yu
5963ffd4e3 Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev 2017-07-25 20:48:02 +00:00
Christine Franks
a0dd987d20 Restrict changing wi-fi networks
Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
2017-07-25 13:31:12 -07:00
Fan Zhang
84dd783c36 Fix a monkey crash in Developer settings.
- DevSetting shouldn't add switchbar listener if it's a Monkey test run
- DevSetting shouldn't remove switchbar listener if it's not registered
- Refactor some switchbar logic in order to create test

Change-Id: Ie65ff9b04778075789010169039393bd0551acfb
Fix: 64021498
Test: robotests
2017-07-25 13:06:32 -07:00
Doris Ling
5df37ec7b9 Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug: 63939450
Test: make RunSettingsRoboTests
2017-07-25 11:33:40 -07:00
Matthew Fritze
458bb887e1 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Manual merge for: ag/2588219/

Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
2017-07-25 10:44:15 -07:00
jackqdyulei
8dba5a03a1 Add anomaly detection method to AnomalyUtils
So we could reuse it in different loaders.

Bug: 63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
2017-07-25 10:20:10 -07:00
Bartosz Fabianowski
96a14ff07e Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am: 262aacd353

Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
262aacd353 Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev 2017-07-25 10:14:50 +00:00
Kevin Chyn
5e707ccb3d Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev 2017-07-25 05:31:53 +00:00
Kevin Chyn
2a2dcb52cb Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-25 02:33:30 +00:00
TreeHugger Robot
af63fc249e Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev 2017-07-25 02:32:31 +00:00
Kevin Chyn
0d378e04ca Default-off FP Swipe
am: 8f5de15ba1

Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
2017-07-25 01:07:31 +00:00
Kevin Chyn
8f5de15ba1 Default-off FP Swipe
Fixes: 63992836

Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests

Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
2017-07-24 14:00:18 -07:00
Andrew Sapperstein
c8c42838ca Make AirplaneModePrefController.isAvailable static.
Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.

Bug: 62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5
2017-07-24 13:42:19 -07:00
Kevin Chyn
82792cc5b3 Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-24 13:40:34 -07:00
Fan Zhang
a4a3833a08 Fix search indexing for encryption_and_credential page
- Rewrite search index provider to include all possible keys through
  getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
  device state

Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix: 37650170
Test: robotests
2017-07-24 12:34:34 -07:00
Michael Wachenschwanz
a47a3f58bf Merge "Add Foreground Service time to battery usage" into oc-mr1-dev 2017-07-24 19:02:12 +00:00
Lei Yu
5e48ea193b Merge "Add log for anomaly." into oc-dr1-dev
am: 6666bf5605

Change-Id: I4903e3617b2fab64831b6e0ad8b5214ea5dd5317
2017-07-24 18:07:12 +00:00
Lei Yu
6666bf5605 Merge "Add log for anomaly." into oc-dr1-dev 2017-07-24 17:56:35 +00:00
Andrew Sapperstein
36af00bb21 Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-23 06:11:22 +00:00
Andrew Sapperstein
eb1a45b95b Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-22 20:57:07 -07:00
TreeHugger Robot
6fcc38975c Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev 2017-07-22 17:54:31 +00:00
Michael Wachenschwanz
987711712c Add Foreground Service time to battery usage
Add foreground service time to foreground usage time of apps. This will
account for app usage that user is aware of but is not being displayed
on screen, such as playing music while screen is locked.

Change-Id: Ica9fe0819e46b50299eb2eab7f0483ea01441fb0
Fixes: 38313557
Test: RunSettingsRoboTests
2017-07-21 17:37:00 -07:00
Andrew Sapperstein
ebd8308698 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
2017-07-22 00:33:13 +00:00