Commit Graph

34958 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
f1730bee90 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-11 00:30:32 +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
Roozbeh Pournader
319250b1eb Merge "Set textDirection of app name to locale direction" into oc-dev 2017-05-10 23:23:46 +00:00
Bill Yi
dfdad31e93 Import translations. DO NOT MERGE
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
2017-05-10 13:48:13 -07: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
Roozbeh Pournader
e1e45d02c1 Set textDirection of app name to locale direction
Test: Manual
Fixes: 37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
2017-05-10 12:56:20 -07: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
Alison Cichowlas
b9a2d6a6e3 Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev 2017-05-10 18:42:54 +00:00
Alison Cichowlas
28543f82f9 Notifications settings updates to match spec:
- change badge language & remove summary
- change caps on sound text

Bug: 37479730, 37480708
Test: string changes manually verified

Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
2017-05-10 14:31:01 -04: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
154824f124 Merge "Fix the top summary layout." into oc-dev 2017-05-10 17:59:38 +00:00
Daniel Nishi
9a5bac7d5a Merge "Add the badged icon for Movies & TV." into oc-dev 2017-05-10 17:59:09 +00:00
TreeHugger Robot
8fc602fed8 Merge "Remove accessibility duplicates in settings search" into oc-dev 2017-05-10 05:07:53 +00:00
TreeHugger Robot
8ff8b5e95b Merge "Update setting icon paddings to align with actionbar title" into oc-dev 2017-05-10 02:57:19 +00:00
TreeHugger Robot
ba2f3ee3ba Merge "Fix crash when silencing condition." into oc-dev 2017-05-10 01:40:35 +00:00
Fan Zhang
031c838162 Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix: 38011653
Test: visual
2017-05-10 00:48:24 +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
TreeHugger Robot
4a0abee70e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-09 18:25:53 +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
Bill Yi
d8f1255323 Import translations. DO NOT MERGE
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
2017-05-09 04:07:09 -07:00
TreeHugger Robot
ce7f36c799 Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev 2017-05-09 01:25:18 +00:00
Daniel Nishi
89effe9cbf Fix the top summary layout.
This changes the margin to the proper 32dp and updates the style on the
title text to be consistent with the rest of Settings.

Bug: 35245772
Test: Manual
Change-Id: Ib980e22d9fac258dd5a72385a2c80060561aa5ac
2017-05-08 17:01:11 -07:00
TreeHugger Robot
6c0f337d52 Merge "Added WifiSettings Espresso tests." into oc-dev 2017-05-08 23:39:22 +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
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
TreeHugger Robot
fc8e64eccb Merge "Prevent race conditions after dropping database" into oc-dev 2017-05-08 20:51:04 +00:00
TreeHugger Robot
f7980fc3cb Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev 2017-05-08 20:44:12 +00:00
TreeHugger Robot
a3c4339299 Merge "Add summary placeholder to data saver preference." into oc-dev 2017-05-08 20:43:56 +00:00
Fan Zhang
966be254ab Remove placeholder summary text in auto-rotate preference
- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
  master but we don't want to cherry-pick the master change because of its
  size and risk.

Bug: 36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
2017-05-08 13:37:07 -07:00
Fan Zhang
86d4d51b62 Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix: 38011653
Test: visual
2017-05-08 13:03:46 -07: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