Maurice Lam
3ffdc4d15b
Merge "Check for sidecar null-ness before removing" into oc-dev am: 59f965d698
...
am: 7e60ce0109
2017-05-11 18:52:45 +00:00
Maurice Lam
7e60ce0109
Merge "Check for sidecar null-ness before removing" into oc-dev
...
am: 59f965d698
2017-05-11 18:20:19 +00:00
Maurice Lam
59f965d698
Merge "Check for sidecar null-ness before removing" into oc-dev
2017-05-11 17:35:17 +00:00
Stephen Chen
9eecfb3de7
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am: 25d1848e5f
...
am: ac1b935437
2017-05-11 06:18:36 +00:00
Doris Ling
1886fe1bae
Merge "Also update the account preferences in displayPreference()." into oc-dev am: cf162d5354
...
am: 2a23542e68
2017-05-11 01:04:40 +00:00
Jesse Evans
eabee5af2f
Merge "Properly set isInstantApp for power usage page" into oc-dev am: 3c19120945
...
am: 28839c0531
2017-05-11 01:03:32 +00:00
Matthew Fritze
a20e068d2c
Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139
...
am: ab13b378c9
2017-05-11 00:54:01 +00:00
Daniel Nishi
2c00b770eb
Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a
...
am: a3349519d5
2017-05-11 00:52:07 +00:00
Stephen Chen
ac1b935437
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
...
am: 25d1848e5f
2017-05-11 00:22:12 +00:00
Doris Ling
2a23542e68
Merge "Also update the account preferences in displayPreference()." into oc-dev
...
am: cf162d5354
2017-05-11 00:21:31 +00:00
Jesse Evans
28839c0531
Merge "Properly set isInstantApp for power usage page" into oc-dev
...
am: 3c19120945
2017-05-11 00:20:40 +00:00
Matthew Fritze
ab13b378c9
Merge "Only add icons to settings items with icons" into oc-dev
...
am: ec00573139
2017-05-11 00:20:13 +00:00
Daniel Nishi
a3349519d5
Merge "Add the badged icon for Movies & TV." into oc-dev
...
am: 9a5bac7d5a
2017-05-11 00:18:53 +00:00
Maurice Lam
e1976ac302
Check for sidecar null-ness before removing
...
Test: cd tests/robotests && mma
Bug: 36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
2017-05-10 17:17:44 -07:00
TreeHugger Robot
25d1848e5f
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
2017-05-11 00:05:53 +00:00
TreeHugger Robot
cf162d5354
Merge "Also update the account preferences in displayPreference()." into oc-dev
2017-05-10 23:39:53 +00:00
TreeHugger Robot
3c19120945
Merge "Properly set isInstantApp for power usage page" into oc-dev
2017-05-10 20:47:29 +00:00
Lei Yu
7932d5a66f
Merge "Expose mac address in bluetooth main page"
2017-05-10 20:42:03 +00:00
TreeHugger Robot
ec00573139
Merge "Only add icons to settings items with icons" into oc-dev
2017-05-10 20:16:14 +00:00
Lei Yu
c0d798ff06
Merge "Add feature provider for Bluetooth"
2017-05-10 19:55:17 +00:00
Doris Ling
633250bd78
Also update the account preferences in displayPreference().
...
- start creating the account preferences in displayPreference() to make
the data available earlier.
- when trying to update the UI when the page is resumed, instead of
clearing the whole list and add the latest accounts, compare the
differences between the currently shown accounts and the latest accounts
and only update the account preferences that has been changed.
Change-Id: I249eb2fe67f4adaab02bf77680c62d07756dc94a
Fix: 34035653
Test: make RunSettingsRoboTests
2017-05-10 11:59:47 -07:00
Salvador Martinez
37e51e2d3b
Merge "Fix null pointer error && add settings side guard"
2017-05-10 18:50:55 +00:00
jackqdyulei
d2ba0117fc
Expose mac address in bluetooth main page
...
This mac address means the owned device, not the device
to connect.
Bug: 35875420
Test: RunSettingsRoboTests
Change-Id: I142f49fdca72d8ffbb9b8b2e2666a61aefb80505
2017-05-10 11:18:10 -07:00
Matthew Fritze
5416a5992b
Only add icons to settings items with icons
...
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug: 37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
2017-05-10 11:11:28 -07:00
Stephen Chen
a99b86c56a
Update Wi-Fi Wakeup setting to check whether the feature is available.
...
Bug: 38037361
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I1c1b930546cc090d72f3047058a428acd1b2883a
2017-05-10 11:06:05 -07:00
Daniel Nishi
9a5bac7d5a
Merge "Add the badged icon for Movies & TV." into oc-dev
2017-05-10 17:59:09 +00:00
Alex Salo
2664ccae50
Merge "Location setting now updates summary timely."
2017-05-10 17:49:00 +00:00
Lei Yu
eb030fe391
Merge "Add framework for anomaly detection flags"
2017-05-10 17:39:58 +00:00
Matthew Fritze
bdba7ab697
Merge "Remove accessibility duplicates in settings search" into oc-dev
...
am: 8fc602fed8
2017-05-10 05:24:56 +00:00
TreeHugger Robot
8fc602fed8
Merge "Remove accessibility duplicates in settings search" into oc-dev
2017-05-10 05:07:53 +00:00
Doris Ling
f4cd59a5b1
Merge "Fix crash when silencing condition." into oc-dev am: ba2f3ee3ba
...
am: ce5e0c3dc6
2017-05-10 03:18:21 +00:00
TreeHugger Robot
95e60e9816
Merge "Add support to show first impression type suggestions"
2017-05-10 01:53:32 +00:00
Doris Ling
ce5e0c3dc6
Merge "Fix crash when silencing condition." into oc-dev
...
am: ba2f3ee3ba
2017-05-10 01:45:17 +00:00
TreeHugger Robot
ba2f3ee3ba
Merge "Fix crash when silencing condition." into oc-dev
2017-05-10 01:40:35 +00:00
Alex Salo
2e52b42e3b
Location setting now updates summary timely.
...
Subscribed the LocationPreferenceController to listen to the location
providers changed action. This allows timely summary update. Previous
approach, directly calling the updateSummary method onResume failed in
the scenario when user changed the location settings via the
QuickSettings.
Test: Added robolectric tests, and manually verified the intended
behavior on a device.
Bug: 37956060
Change-Id: I2f81713d59da3384f3c98b327d377d529d440a88
2017-05-09 16:43:53 -07:00
Matthew Fritze
ec6cfe32fd
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
...
am: 120ec5d1eb
2017-05-09 21:41:39 +00:00
Fan Zhang
7afbf0f3a2
Add support to show first impression type suggestions
...
- Add FIRST_IMPRESSION type in suggestion order list.
- Make rule changes for a few suggestions.
Bug: 37947647
Test: manual
Change-Id: I2101f5e0f6424723bacc9f5febf2ffaab9398896
2017-05-09 14:20:43 -07:00
TreeHugger Robot
120ec5d1eb
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
2017-05-09 19:59:58 +00:00
TreeHugger Robot
33b55ef1ba
Merge "Remove accessibility duplicates in settings search"
2017-05-09 18:07:42 +00:00
TreeHugger Robot
9a0c200848
Merge "Prevent non-blocking whitespaces from showing up in search"
2017-05-09 18:07:11 +00:00
Bookatz
64ac70d257
Merge "Add BLE results counter to batterystats" into oc-dev am: b296697e8e
...
am: 9b54572992
2017-05-09 17:39:50 +00:00
Bookatz
9b54572992
Merge "Add BLE results counter to batterystats" into oc-dev
...
am: b296697e8e
2017-05-09 17:08:16 +00:00
Matthew Fritze
9615f82abf
Prevent non-blocking whitespaces from showing up in search
...
When search results use the placeholder summary text,
it becomes non-breaking whitespace. If that is the
summary, set the visibility to gone.
Change-Id: Ic3987a0990c33b6cc5aabffa0782ece6c553784a
Merged-In: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Fixes: 38029215
Test: make RunSettingsRoboTests
2017-05-09 16:42:40 +00:00
Matthew Fritze
0e798baf45
Prevent non-blocking whitespaces from showing up in search
...
Merge from: ag/2217040
Bug: 38029215
Test: make RunSettingsRoboTests
Change-Id: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
2017-05-09 09:29:47 -07:00
Matthew Fritze
6ad5848775
Remove accessibility duplicates in settings search
...
Merge for: ag/2148817
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-09 09:17:13 -07:00
TreeHugger Robot
b296697e8e
Merge "Add BLE results counter to batterystats" into oc-dev
2017-05-09 16:03:28 +00:00
Fan Zhang
b3afa6e84f
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
...
am: ce7f36c799
2017-05-09 01:44:00 +00:00
TreeHugger Robot
ce7f36c799
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
2017-05-09 01:25:18 +00:00
Salvador Martinez
52aa68f704
Fix null pointer error && add settings side guard
...
The null check for the cursor happens in the try block
which causes a null pointer error in the finally block
even though we avoid executing the other code because
we still try to close the cursor. This change moves
that outside of the try block to avoid that. Also added
a test to verify that a no-op occurs in the method that
uses the enhanced prediction that would have caught this.
Additionally, the method for checking if the enhanced
prediction was available was not being called in Settings.
This CL adds that check and a relevant tests to ensure it
is respected.
Test: Robotests
Bug: 38031439
Change-Id: I6924acb5552baf09a9ff0cdef8e30881115aa1ca
2017-05-08 16:39:38 -07:00
Fan Zhang
0498d4e864
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
...
am: df2ecdf3f0
2017-05-08 23:15:04 +00:00
