Commit Graph

1527 Commits

Author SHA1 Message Date
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

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
a5cf6fbf37 Update "Open networks available" setting.
- Remove gating ONA toggle on whether network recommendations are
enabled. It is always on and provided by the wifi framework.

Bug: 37794067
Test: m RunSettingsRoboTests && tested locally
Change-Id: I312858d50b348bbe829538d4fa337b2072cb2043
2017-05-09 14:04:45 -07: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
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

Change-Id: I91235f3fc1754539d055a4e24e395705c7b8f967
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

Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
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

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38 Merge "Report normalized package name as default key" into oc-dev
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
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

Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
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

Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
2017-05-08 16:50:17 +00:00
Daniel Nishi
816956d249 Merge "Fix Settings crash in Storage settings." into oc-dev 2017-05-08 16:45:07 +00:00
Fan Zhang
779548122b Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am: 4f5b13f97a

Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
2017-05-06 02:46:38 +00:00
TreeHugger Robot
4f5b13f97a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev 2017-05-06 02:42:38 +00:00
Fan Zhang
0335cd1e9b Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.

Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix: 37945069
Test: make RunSettingsRoboTests
2017-05-05 17:42:25 -07:00
Doris Ling
7c5ef68505 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am: f9d9524574

Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
2017-05-06 00:02:54 +00:00
TreeHugger Robot
f9d9524574 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev 2017-05-05 23:59:29 +00:00
Fan Zhang
12cc6aad3c Merge "Update tether summary text when airplane mode turns on" into oc-dev
am: fe5d64feb0

Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
2017-05-05 22:14:10 +00:00