OSDN Git Service
Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am:
05185952c8 -s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]
Change SwipeForNotification Payload default to Off
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
TreeHugger Robot [Wed, 26 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text
So the header won't grow/shrink when the text changes.
Bug:
64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
Doris Ling [Wed, 26 Jul 2017 18:07:19 +0000 (11:07 -0700)]
Fix gestures summary text when there is no sensor for assit.
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix:
64039312
Test: make RunSettingsRoboTests
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Antony Sargent [Wed, 26 Jul 2017 16:18:50 +0000 (16:18 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
Bill Yi [Wed, 26 Jul 2017 15:07:49 +0000 (08:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:03:07 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf
Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: If4a3775dac048d13e739174b79415cf025bd4454
Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]
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
Jack He [Wed, 26 Jul 2017 06:34:30 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am:
0c6f001c09
Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a
TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 06:23:03 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a -s ours
Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333
TreeHugger Robot [Wed, 26 Jul 2017 06:11:07 +0000 (06:11 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 06:07:37 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
Fan Zhang [Wed, 26 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 04:59:29 +0000 (04:59 +0000)]
Merge "Update misc strings" into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Wed, 26 Jul 2017 04:14:07 +0000 (04:14 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am:
a7e10e0316
Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
Christine Franks [Wed, 26 Jul 2017 02:38:08 +0000 (02:38 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 02:08:45 +0000 (02:08 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am:
0e9711ab92
Change-Id: I7fc59ace61bb89b40ab3eabe774a89128895515f
TreeHugger Robot [Wed, 26 Jul 2017 02:02:32 +0000 (02:02 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
Matthew Fritze [Wed, 26 Jul 2017 01:57:13 +0000 (01:57 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
am:
5aca5f3aec
Change-Id: I5e15e7d80ac30f07390be702662939acbbc30675
TreeHugger Robot [Wed, 26 Jul 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
Jack He [Tue, 25 Jul 2017 21:50:11 +0000 (14:50 -0700)]
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
Andrew Sapperstein [Tue, 25 Jul 2017 23:50:57 +0000 (23:50 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
b5696a9162 -s ours
Change-Id: Ibce6e5a08dffeab7779718d99d2cc7ad60c5586b
Fan Zhang [Mon, 24 Jul 2017 23:03:49 +0000 (16:03 -0700)]
Extract method to build preference count logging's name.
Bug:
35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
Doris Ling [Mon, 24 Jul 2017 20:13:00 +0000 (13:13 -0700)]
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
Andrew Sapperstein [Tue, 25 Jul 2017 23:37:37 +0000 (23:37 +0000)]
Merge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:34:03 +0000 (23:34 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am:
5b67e453bf
Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
Andrew Sapperstein [Tue, 25 Jul 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix robotests." into oc-mr1-dev
Fan Zhang [Tue, 25 Jul 2017 23:06:11 +0000 (23:06 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
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
Fan Zhang [Tue, 25 Jul 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
TreeHugger Robot [Tue, 25 Jul 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
Matthew Fritze [Tue, 25 Jul 2017 21:10:55 +0000 (21:10 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Roshan Pius [Tue, 25 Jul 2017 20:56:33 +0000 (20:56 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca -s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
Lei Yu [Tue, 25 Jul 2017 20:55:16 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
Roshan Pius [Tue, 25 Jul 2017 20:52:29 +0000 (20:52 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Fan Zhang [Tue, 25 Jul 2017 20:25:39 +0000 (13:25 -0700)]
Update misc strings
Change-Id: I566e2d08488e8468b9b943418d05fb2d6f669638
Fix:
62069132
Fix:
62265094
Test: visual
Christine Franks [Wed, 12 Jul 2017 00:32:57 +0000 (17:32 -0700)]
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
Fan Zhang [Tue, 25 Jul 2017 17:30:24 +0000 (10:30 -0700)]
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
Doris Ling [Tue, 25 Jul 2017 18:33:40 +0000 (11:33 -0700)]
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
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
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
jackqdyulei [Fri, 21 Jul 2017 19:18:33 +0000 (12:18 -0700)]
Add anomaly detection method to AnomalyUtils
So we could reuse it in different loaders.
Bug:
63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug:
64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9
Roshan Pius [Tue, 25 Jul 2017 17:09:52 +0000 (17:09 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug:
64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
(cherry-picked from
b0a09304e380645a84651c0de668a78a7beaac3b)
Bartosz Fabianowski [Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am:
262aacd353
Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
Bartosz Fabianowski [Tue, 25 Jul 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 05:36:26 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am:
5e707ccb3d -s ours
Change-Id: Ia0a0f8fff5bec512656229aaf2d81e0952760c4e
Kevin Chyn [Tue, 25 Jul 2017 05:31:53 +0000 (05:31 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
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
TreeHugger Robot [Tue, 25 Jul 2017 02:32:31 +0000 (02:32 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am:
8f5de15ba1
Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
TreeHugger Robot [Mon, 24 Jul 2017 21:29:22 +0000 (21:29 +0000)]
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
Kevin Chyn [Mon, 24 Jul 2017 21:00:18 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
Andrew Sapperstein [Mon, 24 Jul 2017 20:42:19 +0000 (13:42 -0700)]
Make AirplaneModePrefController.isAvailable static.
Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.
Bug:
62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
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
Fan Zhang [Sat, 22 Jul 2017 00:51:47 +0000 (17:51 -0700)]
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
Michael Wachenschwanz [Mon, 24 Jul 2017 19:02:12 +0000 (19:02 +0000)]
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
Ajay Nadathur [Fri, 21 Jul 2017 22:11:21 +0000 (15:11 -0700)]
Use fingerprint icons during setupwizard flow
Use fingerprint icon when lock screens are loaded on
fingerprint setup's behalf.
bug:
63809908
Test: Manually tested and verified. Also added robolectric tests
Change-Id: I773a1eec2466e7ab626cc3330f5ce987a21b048f
Fan Zhang [Mon, 24 Jul 2017 17:52:23 +0000 (10:52 -0700)]
Update string for bluetooth device visibility
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix:
62891178
Test: visual
Test: robotests
Lei Yu [Mon, 24 Jul 2017 18:07:12 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I4903e3617b2fab64831b6e0ad8b5214ea5dd5317
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:06 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b -s ours
Change-Id: I67522a734dff97d37f09751817f99e5f8a6bf602
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Fan Zhang [Sat, 22 Jul 2017 17:59:36 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c -s ours
Change-Id: I8ab95d4753c9369a4d47c83ade83380d26733b46
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michael Wachenschwanz [Tue, 11 Jul 2017 18:11:16 +0000 (11:11 -0700)]
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
Andrew Sapperstein [Sat, 22 Jul 2017 00:33:13 +0000 (00:33 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
Fan Zhang [Sat, 22 Jul 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
Lei Yu [Sat, 22 Jul 2017 00:32:21 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am:
0ec3e4e626
Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9
Antony Sargent [Sat, 22 Jul 2017 00:32:00 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am:
a6ac4890ed
Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
Christine Franks [Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am:
cb9a7075f8 -s ours
Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663