Commit Graph

35371 Commits

Author SHA1 Message Date
Julia Reynolds
6393e1752f Merge "Notification settings, importance and pre-O apps" into oc-dev 2017-05-12 12:14:11 +00:00
TreeHugger Robot
b747be0769 Merge changes from topic 'onarevert' into oc-dev
* changes:
  Update "Open networks available" setting.
  Revert "Update "Open networks available" toggle to instead open notification channel preferences."
2017-05-12 04:40:27 +00:00
Sudheer Shanka
8f806c0992 Update FakeUid to include new methods.
Bug: 34133340
Test: builds
Change-Id: I8c17e80002685e8e5e214d6238084584ae15ea30
2017-05-11 20:56:58 -07: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
Matthew Fritze
76d9b53048 Remove Special App Access duplicate from Setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I7f6a466c0551828c319c2da541fbeb0e428c62f8
2017-05-11 18:37:47 -07: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
Matthew Fritze
4d9a1ae9a2 Remove default app duplicates in search
Default Work Browser and Phone app search results look
identical to the regular defaults. Supress the results
until we differentiate work results.

"Assist and voice input" duplicate is a parent-child
duplication and is removed, as well.

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I3bb75c199cd76e24de42548dd166c4bccd0c7f0a
2017-05-11 18:01:49 -07:00
Fan Zhang
6359a19c6f Add a no-op activity to handle development setting intent.
This no-op activity is only enabled when the real setting is
turned off.

Change-Id: I7ccf4645054a60569a77076c24cf42da80479fed
Fix: 37651414
Test: rerun CTS test android.systemintents.cts.TestSystemIntents#testSystemIntents
2017-05-11 23:41:29 +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
Matthew Fritze
03dfa50996 Replace dynamic summary text for SettingPref
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
2017-05-11 12:11:05 -07:00
Julia Reynolds
2f0547c783 Notification settings, importance and pre-O apps
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance

Fixes: 38177887
Bug: 38120923
Fixes: 38012300
Fixes: 37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
2017-05-11 14:48:17 -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
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
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
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
TreeHugger Robot
4a0abee70e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-09 18:25:53 +00:00
Phil Weaver
9a1b4eb21f Don't enable a11y service if scary dialog obscured
Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
2017-05-09 10:51:32 -07: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