Chris Wren
aebf049b4f
Merge "add a global control for badging" into oc-dev
...
am: 1425b91bac
2017-05-12 05:57:49 +00:00
jackqdyulei
4b749c2b0a
Merge "Add animation for battery asyncLoader." into oc-dev
...
am: 6c680a36c5
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
2017-05-12 04:57:40 +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
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
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
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
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
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
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
2017-05-09 21:41:39 +00: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
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
Stephen Chen
95a98f0686
Merge "Added WifiSettings Espresso tests." into oc-dev
...
am: 6c0f337d52
2017-05-08 23:42:59 +00:00
TreeHugger Robot
6c0f337d52
Merge "Added WifiSettings Espresso tests." into oc-dev
2017-05-08 23:39:22 +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
Stephen Chen
db332d4aa7
Added WifiSettings Espresso tests.
...
Added test cases for toggling Wi-Fi state, connected access points, and
saved network preferences.
Bug: 35322629
Bug: 35322690
Bug: 35322875
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Iaba7fb2fa90cf0f37538c4b1ef141cf6b15d7f52
2017-05-08 14:48:01 -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
2017-05-08 21:05:20 +00:00
TreeHugger Robot
fc8e64eccb
Merge "Prevent race conditions after dropping database" into oc-dev
2017-05-08 20:51:04 +00:00
Fan Zhang
f7ba1e7209
Merge "Remove summary template in sleep timeout setting." into oc-dev
...
am: 014ff46fa6
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38
Merge "Report normalized package name as default key" into oc-dev
...
am: 0560127e9d
2017-05-08 19:07:55 +00:00
TreeHugger Robot
014ff46fa6
Merge "Remove summary template in sleep timeout setting." into oc-dev
2017-05-08 18:57:57 +00:00
Svetoslav Ganov
0560127e9d
Merge "Report normalized package name as default key" into oc-dev
2017-05-08 18:57:23 +00:00
Svet Ganov
7d3fb0481d
Report normalized package name as default key
...
Test: make RunSettingsRoboTests -j90
bug:36978445
Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
2017-05-08 18:56:47 +00:00
Matthew Fritze
ab0b3f6790
Prevent race conditions after dropping database
...
Block all loaders from accessing the database
before indexing is complete.
Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-08 18:48:04 +00:00
Matthew Fritze
7ae3c078b6
Remove accessibility duplicates in settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +00:00
Amin Shaikh
293a0f003a
Merge "Show "Forget" button for ephemeral networks." into oc-dev
...
am: 3f303d5fd8
2017-05-08 17:11:48 +00:00
TreeHugger Robot
3f303d5fd8
Merge "Show "Forget" button for ephemeral networks." into oc-dev
2017-05-08 17:07:33 +00:00
Daniel Nishi
bc628dfdd9
Merge "Fix Settings crash in Storage settings." into oc-dev
...
am: 816956d249
2017-05-08 16:50:17 +00:00
