Steven Timotius
781d2c4a5a
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev am: 99d524e52b
...
am: 83018be30d
Change-Id: I920b3a94ac65a94d165fad18dbdc3bec8b63a59c
2017-08-29 19:49:14 +00:00
Steven Timotius
83018be30d
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
...
am: 99d524e52b
Change-Id: I5f8c8ef2fa9f1fe8cb2329c7f8603441b26d36a7
2017-08-29 19:36:42 +00:00
TreeHugger Robot
99d524e52b
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
2017-08-29 19:28:31 +00:00
Matthew Fritze
98a86c01d6
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev am: 3042af11f0
...
am: 2980aecd96
Change-Id: I092b68b491669505dc2e46029d19c1fcc4061836
2017-08-29 19:03:11 +00:00
Matthew Fritze
2980aecd96
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
...
am: 3042af11f0
Change-Id: I95fc4f482d864f6bf8283b10236b74bd8cddf9e1
2017-08-29 18:51:41 +00:00
TreeHugger Robot
3042af11f0
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
2017-08-29 18:42:25 +00:00
TreeHugger Robot
69ad36d628
Merge "Modify notification string."
2017-08-29 17:59:32 +00:00
Steven Timotius
4ccfa7c163
Fix to show correct value for data limit setting
...
Bug: 64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
(cherry picked from commit 72ebf8fe35 )
2017-08-29 16:55:05 +00:00
Matthew Fritze
21aed344fc
Prevent race condition between SavedQuery and Query Loader
...
SearchFragment and SavedQueryLoader share a loader manager
and had been using the same loader id for different
loaders.
Occaisionally (in monkey tests) two loaders with the same
IDs would be started and crash when they finished.
The loaders now have different IDs.
Change-Id: I11e9b7365605fbcef44cf7d2323183415422f5c8
Fixes: 64756515
Test: robotests
2017-08-29 08:20:51 -07:00
yuemingw
6b6d9fd979
Modify notification string.
...
Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.
Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396
2017-08-29 14:06:31 +01:00
Sundeep Ghuman
3430553a2e
Separate multiple DNS addresses with newlines. am: 2716e841be
...
am: cf37a26795
Change-Id: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
2017-08-29 04:57:47 +00:00
Sundeep Ghuman
cf37a26795
Separate multiple DNS addresses with newlines.
...
am: 2716e841be
Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9
2017-08-29 04:49:28 +00:00
Sundeep Ghuman
2716e841be
Separate multiple DNS addresses with newlines.
...
Bug: b/65037256
Test: make -j40 RunSettingsRoboTests
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
2017-08-28 18:47:48 -07:00
Alex Vakulenko
1dec9aa3fd
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev am: 6f72b57428
...
am: f76056c576
Change-Id: Ibd4c1b1ddcd83e77a9c2a14d7aa6c92f5088e6c4
2017-08-29 00:19:21 +00:00
Alex Vakulenko
f76056c576
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
...
am: 6f72b57428
Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf
2017-08-28 23:45:19 +00:00
TreeHugger Robot
6f72b57428
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
2017-08-28 23:15:26 +00:00
jackqdyulei
0617d139e0
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev am: ccbb613fa9
...
am: f54f8e3d5a
Change-Id: I3f98fe4eb71d456b188d8bfa48c64f6bc3bb2f26
2017-08-28 20:48:57 +00:00
jackqdyulei
f54f8e3d5a
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
...
am: ccbb613fa9
Change-Id: I7307cbd56949ea995906cc47f67afa660f50d0a0
2017-08-28 20:16:04 +00:00
TreeHugger Robot
ccbb613fa9
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
2017-08-28 19:55:39 +00:00
Lei Yu
b53535dc66
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev am: 088393596e
...
am: 3f1dfc21ec
Change-Id: Ica312c451476d5e0180e94f8b7f04d5848b19db3
2017-08-28 17:50:33 +00:00
Lei Yu
3f1dfc21ec
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
...
am: 088393596e
Change-Id: I93f50785f54b1287167f1f87c91167365b295a64
2017-08-28 17:45:38 +00:00
Lei Yu
088393596e
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
...
* changes:
Add functional test for wakelock anomaly detector
Add functional test for bt anomaly detector
2017-08-28 17:35:59 +00:00
Jack He
7bef28df2d
Bluetooth: Only show devices when their names are resolved am: 19ba320263
...
am: 7a6aadce4b
Change-Id: I93ab225467dfbb51c77ea9dfde0e3082a845624c
2017-08-26 03:03:03 +00:00
Jack He
7a6aadce4b
Bluetooth: Only show devices when their names are resolved
...
am: 19ba320263
Change-Id: I23300ac9541f88b3aeb978be0771e93b85fe834f
2017-08-26 02:51:48 +00:00
Alex Vakulenko
070b31216a
Fix crash in developer settings when backup is not available
...
When backup feature is disabled, Developer Settings dialog does
not come up due to a crash.
Disable Backup Password option in the preference screen.
Bug: 64725174
Test: Developer settings dialog comes up and Backup password is
disabled on Polaris
Change-Id: I4f4546c4e97d2e5128ec65c0532691d9799b4c8f
2017-08-26 01:10:43 +00:00
Jack He
19ba320263
Bluetooth: Only show devices when their names are resolved
...
* Add a developer menu option to allow name-less devices to be shown
when a Bluetooth developer needs it, but hide it for non-developer
users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
does not have a name besides MAC address and the above developer option
is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
not affect BluetoothSettings. BluetoothSettings will show all paired
devices regardless whether an user friendly name exists.
Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5
2017-08-25 16:27:30 -07:00
jackqdyulei
f1ed210eaa
Remove subtitle for Recent location apps
...
Bug: 65011654
Test: Screenshot
Change-Id: I840e6ee8f755b4bbb5392a80224dc5b4b19a8054
2017-08-25 14:37:39 -07:00
jackqdyulei
d8bfc74256
Add functional test for wakelock anomaly detector
...
Bug: 63815938
Test: runtest -x WakelockAnomalyTest
Change-Id: I4d10d5be8b38264f29c67c2c945fdbbd1090430d
2017-08-25 14:02:39 -07:00
jackqdyulei
e4298941b4
Add functional test for bt anomaly detector
...
This cl:
Set up the environment for functional test
1. Update Android.mk by adding instrumentation and libs
2. Update AndroidManifest.xml by adding runner
Add functional test for bt anomaly, with the following workflow
1. reset battery stats
2. pretend unplug and screen off
3. Start AnomalyTester app, set values and click start button
4. Wait its running
5. Check anomaly preference in battery main page
6. reset all parameters
Bug: 63815938
Test: runtest -x BluetoothAnomalyTest
Change-Id: Ief02a314d21f6c32d70729047a1d4bdce9ad9920
2017-08-25 13:45:16 -07:00
jackqdyulei
9eeba865ec
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev am: 77bd8c3a73
...
am: c26876ade7 -s ours
Change-Id: I770e50ee18b8aa387fd3bcede93a10ba7922ae6b
2017-08-25 18:50:54 +00:00
jackqdyulei
c26876ade7
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
...
am: 77bd8c3a73
Change-Id: I36f5729dd042c88c9f8d6a2d4abf720a05748246
2017-08-25 18:37:53 +00:00
TreeHugger Robot
77bd8c3a73
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
2017-08-25 18:25:03 +00:00
Daniel Nishi
f298d1d07c
Merge "Re-init storage size on resume." into oc-mr1-dev am: 2b53a8467c
...
am: f2094821e8
Change-Id: I5204fbf3771778cb0597e8ad6d493b0a0645511c
2017-08-25 17:19:00 +00:00
Daniel Nishi
f2094821e8
Merge "Re-init storage size on resume." into oc-mr1-dev
...
am: 2b53a8467c
Change-Id: I698897d5c21decadfaf437880a81e754939df850
2017-08-25 17:09:52 +00:00
Daniel Nishi
2b53a8467c
Merge "Re-init storage size on resume." into oc-mr1-dev
2017-08-25 16:51:45 +00:00
jackqdyulei
8fabdba0de
Merge "Add wakelock action in testing app" into oc-mr1-dev am: 08fecc4143
...
am: 6896e1ef05
Change-Id: I55f427850f7d1accda9594ca2b20cf97d4937be0
2017-08-25 03:48:50 +00:00
Doris Ling
d76a310520
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev am: 51c83353fe
...
am: e80bb0d5ce
Change-Id: Id3de7150516804bc7a08c665943769c27173fc9a
2017-08-25 03:48:07 +00:00
jackqdyulei
6896e1ef05
Merge "Add wakelock action in testing app" into oc-mr1-dev
...
am: 08fecc4143
Change-Id: Id3125640f4d62da1161b9e894577c6285fe7c83a
2017-08-25 03:44:25 +00:00
Doris Ling
e80bb0d5ce
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
...
am: 51c83353fe
Change-Id: I869238f4c9198dbd167ab02d18e41e0e67001c38
2017-08-25 03:43:37 +00:00
TreeHugger Robot
08fecc4143
Merge "Add wakelock action in testing app" into oc-mr1-dev
2017-08-25 03:35:46 +00:00
TreeHugger Robot
51c83353fe
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
2017-08-25 03:34:34 +00:00
jackqdyulei
df4ca8af76
Merge "Add bt anomaly action in testing app" into oc-mr1-dev am: 4aaacaf7e3
...
am: d52c9708b5
Change-Id: I5122c905e3227b5fb26286a87bbf879a0fce9fb1
2017-08-25 01:53:28 +00:00
jackqdyulei
d52c9708b5
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
...
am: 4aaacaf7e3
Change-Id: Icc5588c0fde97908d371452c622980fddae054df
2017-08-25 01:49:28 +00:00
TreeHugger Robot
4aaacaf7e3
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
2017-08-25 01:38:53 +00:00
Sundeep Ghuman
8adf634a54
Merge "Scroll to top when user connects to a network." into oc-mr1-dev am: a253e1d416
...
am: 501975914c
Change-Id: Ic3489f58b427ee0be5b3ad39a801af02ec15835b
2017-08-25 00:57:11 +00:00
Sundeep Ghuman
501975914c
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
...
am: a253e1d416
Change-Id: I4309bdd864d7da5a0b33e744d28feafe9966012b
2017-08-25 00:38:58 +00:00
Maurice Lam
7d5919dd04
Merge "Fix typo in fingerprint string"
2017-08-25 00:31:02 +00:00
TreeHugger Robot
a253e1d416
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
2017-08-25 00:12:51 +00:00
jackqdyulei
7661137981
Add battery indicator to bluetooth icon
...
This cl change util method in bluetooth package to return
drawable instead of resId.
If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.
Bug: 63393322
Test: RunSettingsRoboTests
Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Merged-In: Ib21822eafda0e8570212ce5cb070478e4f4876a2
2017-08-24 16:53:01 -07:00
Lei Yu
af9138e8e3
Merge "Add battery indicator to bluetooth icon"
2017-08-24 23:39:35 +00:00