Commit Graph

19251 Commits

Author SHA1 Message Date
Phil Weaver
f65e790ba0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Lei Yu
ec8007b426 Merge "Add device/profile app check in background check" into oc-mr1-dev
am: f5d7db2cfa

Change-Id: I7ffb1cd690b638f4266b5e37913510f545b780b9
2017-08-30 17:15:02 +00:00
Lei Yu
f5d7db2cfa Merge "Add device/profile app check in background check" into oc-mr1-dev 2017-08-30 17:02:21 +00:00
jackqdyulei
00015fbf50 Add device/profile app check in background check
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code

Bug: 64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac
2017-08-29 16:10:36 -07:00
Daniel Nishi
1568c56de9 Tint the work icon.
Bug: 64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a
2017-08-29 13:55:06 -07: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
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
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
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
Phil Weaver
94c5202965 Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.

Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3

Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6
2017-08-29 00:57:11 +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
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
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
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
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
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
51c83353fe Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev 2017-08-25 03:34:34 +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
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
Doris Ling
5b01294d84 Fix jank in showing conditions and suggestions in cold start.
When we first initialize the dashboard view, and register the condition
listener, it will trigger the condition changed callback immediately.
This results in unnecessary refresh of the dashboard header. Add check
to not do the refresh when we first initialize the view.

Change-Id: If7c69637463734c150b7f5eb7f3c042cf73837fa
Fixes: 64811475
Test: make RunSettingsRoboTests
2017-08-24 13:53:30 -07:00
Soroosh Mariooryad
4e4d3631fc Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am: f83b94aa0c

Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c
2017-08-24 04:20:30 +00:00
TreeHugger Robot
f83b94aa0c Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev 2017-08-24 04:11:48 +00:00
Chien-Yu Chen
14c4b41f78 Settings: Enable HAL HDR+ by default
Test: Settings app
Bug: 63045786
Change-Id: I39ed40a3a74bac13a40c556b9cb60b495955a065
2017-08-23 19:09:09 -07:00
Stephen Chen
31deb9a766 Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
am: a78eeb2d61

Change-Id: Ide908ed189c110c272cd5535f9fbc99705b8555a
2017-08-24 01:58:48 +00:00
TreeHugger Robot
a78eeb2d61 Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev 2017-08-24 01:43:58 +00:00
Doris Ling
c2eab36c7c Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
am: d94fbbc325

Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
2017-08-24 00:48:20 +00:00
TreeHugger Robot
d94fbbc325 Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev 2017-08-24 00:36:43 +00:00
jackqdyulei
fb13cac59f Merge "Set preference invisible when no anomaly" into oc-mr1-dev
am: 0e800978bf

Change-Id: Icf0931c60d62fd9e18bc3cfe2853e965403e7740
2017-08-23 20:11:28 +00:00
jackqdyulei
02e4c7d809 Merge "Update strings when shortString is true" into oc-mr1-dev
am: d0066e3875

Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
2017-08-23 20:01:51 +00:00
TreeHugger Robot
0e800978bf Merge "Set preference invisible when no anomaly" into oc-mr1-dev 2017-08-23 19:57:41 +00:00
TreeHugger Robot
d0066e3875 Merge "Update strings when shortString is true" into oc-mr1-dev 2017-08-23 19:38:40 +00:00
jackqdyulei
4242ee0dd4 Set preference invisible when no anomaly
In the previous code path, we will create an invisible anomaly preference
and update it to visible if it contains any anomaly. However, when
anomaly is dismissed we don't reset preference to invisible.

So, this cl adds code to set it to invisible explicitly when anomaly list
is empty.

Bug: 64617126
Test: RunSettingsRoboTests
Change-Id: Ie7a3498da91243f05f4c47fb1cc5f67b177d04b1
2017-08-23 10:09:19 -07:00
liming.wang
0db5a99608 Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

Fixes: 64322876 
Test: manual - go to Settings > Security & Location > Fingerprint
               and then tap "Learn more"

Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
2017-08-23 03:32:40 +00:00
jackqdyulei
92597b0e26 Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
am: a097d68c4b

Change-Id: Ib020db1315c7e16f86bc076859187f75d79c87ee
2017-08-23 02:06:12 +00:00
TreeHugger Robot
a097d68c4b Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev 2017-08-23 01:42:42 +00:00
Amit Mahajan
efe090ec60 Change to not cache user entered apn type as user may change it.
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-22 19:36:45 +00:00
Tony Mak
237e49a7c9 Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am: e040ef4a39

Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
2017-08-22 18:21:35 +00:00
TreeHugger Robot
937e2d5a8e Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417

Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
2017-08-22 18:20:32 +00:00