Amin Shaikh
c3666f1c35
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
am: dfa9bb8914
Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
...
am: b38c1e5353
Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f
Merge "add a global control for badging" into oc-dev
...
am: 1425b91bac
Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
2017-05-12 05:57:49 +00:00
jackqdyulei
4b749c2b0a
Merge "Add animation for battery asyncLoader." into oc-dev
...
am: 6c680a36c5
Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
2017-05-12 04:58:12 +00:00
Doris Ling
93ff2d69f1
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
...
am: d3e33ebcef
Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
2017-05-12 04:57:40 +00:00
Chris Wren
715f096678
Merge "allow secondary users to use notification settings" into oc-dev
...
am: 72cc7b7915
Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
2017-05-12 04:57:08 +00:00
TreeHugger Robot
b38c1e5353
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
2017-05-12 02:04:38 +00:00
Chris Wren
1425b91bac
Merge "add a global control for badging" into oc-dev
2017-05-12 01:49:07 +00:00
TreeHugger Robot
6c680a36c5
Merge "Add animation for battery asyncLoader." into oc-dev
2017-05-12 01:35:23 +00:00
TreeHugger Robot
d3e33ebcef
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
2017-05-12 01:31:21 +00:00
jackqdyulei
a3c528f64d
Add animation for battery asyncLoader.
...
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 15:27:23 -07:00
Chris Wren
72cc7b7915
Merge "allow secondary users to use notification settings" into oc-dev
2017-05-11 21:31:46 +00:00
Chris Wren
485e75e063
add a global control for badging
...
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Maurice Lam
7e60ce0109
Merge "Check for sidecar null-ness before removing" into oc-dev
...
am: 59f965d698
Change-Id: Ia9a520419b67304342b528220a592c7629e4c1bc
2017-05-11 18:20:19 +00:00
Chris Wren
9749835904
allow secondary users to use notification settings
...
Bug: 38197667
Test: manual
Change-Id: Ib3b5f865eccc4e47ea00b190e402c3668559f427
2017-05-11 17:51:43 +00:00
Maurice Lam
59f965d698
Merge "Check for sidecar null-ness before removing" into oc-dev
2017-05-11 17:35:17 +00:00
Matthew Fritze
e2cb72fa7f
Remove dynamic summaries for "On the lockscreen"
...
Bug:36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
2017-05-11 08:54:31 -07:00
Stephen Chen
ac1b935437
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
...
am: 25d1848e5f
Change-Id: Ic83a42d3fa508b2de14ee377eed6de92970fd31c
2017-05-11 00:22:12 +00:00
Doris Ling
2a23542e68
Merge "Also update the account preferences in displayPreference()." into oc-dev
...
am: cf162d5354
Change-Id: I73133604ea118457e49def80edbdcddb553e9bcd
2017-05-11 00:21:31 +00:00
Jesse Evans
28839c0531
Merge "Properly set isInstantApp for power usage page" into oc-dev
...
am: 3c19120945
Change-Id: I1cfc5a19c5a133607e5ebc0731632aca25a8f044
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
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
2017-05-11 00:20:13 +00:00
Daniel Nishi
a3349519d5
Merge "Add the badged icon for Movies & TV." into oc-dev
...
am: 9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
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
TreeHugger Robot
ec00573139
Merge "Only add icons to settings items with icons" into oc-dev
2017-05-10 20:16:14 +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
Doris Ling
c55f9f5625
Fix crash when activity not attached after search index finishes.
...
When search indexing completes, check for valid activity before
proceeding with further operations.
Change-Id: I7c72aa358574f79e2184d60bc9d0241595ea5d3b
Fix: 38198223
Test: make RunSettingsRoboTests
2017-05-10 11:52:29 -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
Matthew Fritze
bdba7ab697
Merge "Remove accessibility duplicates in settings search" into oc-dev
...
am: 8fc602fed8
Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
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
ce5e0c3dc6
Merge "Fix crash when silencing condition." into oc-dev
...
am: ba2f3ee3ba
Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
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
Matthew Fritze
ec6cfe32fd
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
...
am: 120ec5d1eb
Change-Id: Ic9bf5fc2aaa99592c362a3159aea0b11cb7ec950
2017-05-09 21:41:39 +00:00
Amin Shaikh
dfa9bb8914
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
This reverts commit 2c4b42c0b7 .
Reason for revert: Need to use Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON to toggle the feature because system NotificationChannels cannot be disabled.
Bug: 37794067
Test: m RunSettingsRoboTests
Change-Id: I6aaad78686f4fe929fd6bcd94897341fdaf6bd23
2017-05-09 13:56:51 -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
Bookatz
9b54572992
Merge "Add BLE results counter to batterystats" into oc-dev
...
am: b296697e8e
Change-Id: Ic5fca069ab56fd2b9bebb12f27c13a27b7f94b35
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
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
Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
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
Fan Zhang
df2ecdf3f0
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
...
am: 2dbc30dc58
Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
2017-05-08 23:08:31 +00:00
TreeHugger Robot
2dbc30dc58
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
2017-05-08 22:59:06 +00:00
Jesse Evans
78e3a051d8
Properly set isInstantApp for power usage page
...
Previously the app header was not properly configured to be aware
it was rendering an instant app. This change properly sets the value
and adds tests to ensure it is correclty set in the future.
Test: make RunSettingsRoboTests -j30
Bug: 37919863
Change-Id: I0cbe2cb03bcd44208408f68188387e53ae98d8fb
2017-05-08 15:53:47 -07:00
Doris Ling
b72163b9d0
Fix crash when silencing condition.
...
- check if the broadcast receiver is being registered before trying to
un-regist it.
Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix: 38131851
Test: make RunSettingsRoboTests
2017-05-08 15:28:33 -07:00
Daniel Nishi
24077d899f
Add the badged icon for Movies & TV.
...
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes: 38132211
Test: Settings robotest
2017-05-08 14:13:13 -07:00
Matthew Fritze
43171ef58a
Merge "Prevent race conditions after dropping database" into oc-dev
...
am: fc8e64eccb
Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
2017-05-08 21:05:20 +00:00