Commit Graph

2068 Commits

Author SHA1 Message Date
Matthew Fritze
4fa0a617ec Merge "Revert "Add summary to special app access."" into oc-dev 2017-04-18 17:39:13 +00:00
Matthew Fritze
13e5af06b8 Revert "Add summary to special app access."
This reverts commit 0e1b53fa6f.

Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5
2017-04-18 17:35:07 +00:00
Julia Reynolds
564c74b8b2 Merge "Channel settings updates" into oc-dev am: 526185c89b
am: 41b21fd2d5

Change-Id: I6199301c1de2fb0f4e2229a9dcc745b4efe3a576
2017-04-18 15:16:56 +00:00
TreeHugger Robot
526185c89b Merge "Channel settings updates" into oc-dev 2017-04-18 15:03:55 +00:00
jackqdyulei
4e0bdb37fb Merge "Hide User category if only one user in device" into oc-dev am: 55a3944dbf
am: b5dafb6c10

Change-Id: I9dd993c03395565cf5b3355e60a568eed08c7857
2017-04-18 03:37:20 +00:00
Lei Yu
445961d073 Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff
am: 4f016eeb6b

Change-Id: I6524ea22d71d4d7acd6186ebdb62de3cdd89a87d
2017-04-18 03:31:34 +00:00
TreeHugger Robot
55a3944dbf Merge "Hide User category if only one user in device" into oc-dev 2017-04-18 03:21:55 +00:00
jackqdyulei
47006d7794 Include type service as type system
Bug: 37293081
Test: RunSettingsRoboTests
Change-Id: Id9259a1a516fdf368d41f1b7205a1515d0989aab
2017-04-17 18:05:05 -07:00
jackqdyulei
cdba2e7266 Hide User category if only one user in device
Fix: 37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
2017-04-17 17:58:38 -07:00
Lei Yu
89bc5b2bff Merge "Don't show Screen as Apps in advanced battery page" into oc-dev 2017-04-18 00:56:11 +00:00
Jeff Sharkey
5d9ccedc59 Merge "Follow storage API polishing." into oc-dev am: e398a84199
am: 4ecbc32b48

Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc
2017-04-17 23:58:17 +00:00
Daniel Nishi
79eb7e4848 Merge "Fix a bug where options menu was not showing." into oc-dev am: 4f2f6bcad9
am: e69e9d74c5

Change-Id: Ica70e9cc82bdb8eb745583a3558f6fbb1f7c1b18
2017-04-17 22:49:45 +00:00
jackqdyulei
7e957fbe1f Merge "Make battery status refresh in SettingsActivity" into oc-dev am: 3a156f5509
am: d5178f2bf0

Change-Id: I5dcae2cec079ba86f2052cd95bc0fb08e39b12a7
2017-04-17 22:33:26 +00:00
Sarah Fortune
e6fbdee6e6 Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am: f7896f491a
am: 9827007c5e

Change-Id: Ib5db637dd6a7a79f622a11f737bbae08a3d557e1
2017-04-17 22:32:52 +00:00
Doris Ling
991a741918 Merge "Add summary to special app access." into oc-dev am: 43458f0249
am: edbcea5a14

Change-Id: I902bb0bf99198fe922268222c20dfa34d5e49433
2017-04-17 22:32:18 +00:00
Jeff Sharkey
e398a84199 Merge "Follow storage API polishing." into oc-dev 2017-04-17 22:26:44 +00:00
Daniel Nishi
4f2f6bcad9 Merge "Fix a bug where options menu was not showing." into oc-dev 2017-04-17 22:25:53 +00:00
TreeHugger Robot
3a156f5509 Merge "Make battery status refresh in SettingsActivity" into oc-dev 2017-04-17 21:53:56 +00:00
Fan Zhang
554ae02f68 Update action bar style in app header UI. am: be6fab0135
am: 00a0978293

Change-Id: I4d4029d732602dd515249d344e5edc597b858a54
2017-04-17 21:37:24 +00:00
Jeff Sharkey
b80f1ddaf0 Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
2017-04-17 14:29:15 -06:00
Sarah Fortune
f7896f491a Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev 2017-04-17 20:07:32 +00:00
TreeHugger Robot
43458f0249 Merge "Add summary to special app access." into oc-dev 2017-04-17 19:37:07 +00:00
jackqdyulei
8648873e91 Don't show Screen as Apps in advanced battery page
Bug: 37293020
Test: RunSettngsRoboTests
Change-Id: I9a6259e1eb3a2d3451b0479bfe20be735825cd64
2017-04-17 12:12:30 -07:00
Julia Reynolds
c68ae0b9fd Channel settings updates
- Update master switch preference to store enabled state in case
it's set before the view holder is bound
- Update master switch preference to prevent disabled switches
from being toggled
- Show an importance summary for max importance
- properly handle null notification sounds

Change-Id: I395b95b76d2a3c1c94b41d1c2720bb0cf1cae917
Fixes: 36920159
Fixes: 37421928
Fixes: 36939825
Test: RunSettingsRoboTests & manual
2017-04-17 14:42:09 -04:00
Sarah Fortune
15d1e2676c Disable the wifi wakeup preference when wifi scanning is disabled
Bug: 36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
2017-04-17 11:35:21 -07:00
Doris Ling
0e1b53fa6f Add summary to special app access.
Get the count of apps that has unrestricted data access and add that to
the summary for Apps & notifications -> Special app access.

Bug: 36376411
Test: make RunSettingsRoboTests
Change-Id: Ic72cd165da9a91e18e1982d2696830f3f5a0987c
2017-04-17 10:29:31 -07:00
Fan Zhang
be6fab0135 Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
  app header.
- Add a shadow below app header view. We can't set elevation on app
  header unfortunately because that will add shadow all round the view,
  but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.

Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix: 37207527
Fix: 37079248
Test: visual && make RunSettingsRoboTests
2017-04-17 09:30:40 -07:00
Doris Ling
7cfaa8ceb2 Merge "Update subtext for Security settings." into oc-dev am: a0e617f96d
am: 8b182839a5

Change-Id: Ia3d158eb681c12c7c6cf21eb475835d36664afee
2017-04-16 00:58:43 +00:00
Doris Ling
a0e617f96d Merge "Update subtext for Security settings." into oc-dev 2017-04-16 00:50:59 +00:00
Doris Ling
48ffe67611 Update subtext for Security settings.
Instead of using summary for verifer, change the security setting
summary to a static text.

Bug: 36889582
Test: make RunSettingsRoboTests
Change-Id: Ia3e2c7c595f403965751bacf2239c70070408e49
2017-04-15 10:41:57 -07:00
Doris Ling
474f6bc692 Merge "Fix crash when Assist app does not have settings activity." into oc-dev am: 0b7e3e056a
am: 6210546942

Change-Id: I19a813bbd56e9cb5ffefe680ad11efdd52c7503a
2017-04-14 23:05:47 +00:00
TreeHugger Robot
0b7e3e056a Merge "Fix crash when Assist app does not have settings activity." into oc-dev 2017-04-14 22:54:08 +00:00
jackqdyulei
6246fad7ff Make battery status refresh in SettingsActivity
Before this cl, the battery text in SettingsActivity is one time
update, won't refresh based on real battery status.

This cl elicits BatteryBroadcastReceiver from PowerUsageBase and
make it reusable in both SettingsActivity and battery page.

BatteryBroadcastReceiver will invoke callback if:
1. Battery level changed on integer level(100->99)
2. Battery status has changed(i.e. charging)

Bug: 29346753
Test: RunSettingsRoboTests

Change-Id: If522d15a700ccbc8bae24f5712e05ec27ea4cbfa
2017-04-14 15:08:57 -07:00
TreeHugger Robot
b0d85fb6b7 Merge "Build Intents at index time" 2017-04-14 22:01:52 +00:00
Daniel Nishi
e6740f740e Fix a bug where options menu was not showing.
There were two issues that stopped the options menu from
showing properly. First, the SettingsPreferenceFragment did
not call its super class, causing the Lifecycle methods to
never be called. Second, the options menu was not being
invalidated which also stopped the Lifecycle methods from
being called.

Change-Id: I29f2fc105c7ecae7adaccb2e4643e48646398d8d
Fixes: 37255835
Test: Robotest
2017-04-14 14:25:37 -07:00
Fan Zhang
616da3bdab Merge "Apply admin restriction when network reset is disallowed" into oc-dev am: 08575e1149
am: f3ce205b86

Change-Id: Id0da20ed2242becd2a5fad8d9bfd85a688ddee38
2017-04-14 21:22:26 +00:00
TreeHugger Robot
08575e1149 Merge "Apply admin restriction when network reset is disallowed" into oc-dev 2017-04-14 20:57:30 +00:00
Doris Ling
386e21808c Fix crash when Assist app does not have settings activity.
Check for null settings activity before trying to create settings
intent. If there is no settings activity, we will not show settings gear
for the preference.

Change-Id: I16f9d695cf9ef09ff65f4511d53d5778760125b5
Fix: 37161567
Test: make RunSettingsRoboTests
2017-04-14 13:43:56 -07:00
jackqdyulei
b59d49384f Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev am: b544d22b35
am: 5f878d8672

Change-Id: I5b768cc6c11e28d3deaaed7a3b76fc0f1752359b
2017-04-14 20:28:16 +00:00
TreeHugger Robot
b544d22b35 Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev 2017-04-14 20:19:47 +00:00
Matthew Fritze
ad6c78325b Merge "Search Icon persists through screen rotation" into oc-dev am: 190b560c9a
am: cd9f5e2751

Change-Id: Ief39e145400b1b3956f44667bdd01c18ecec2be7
2017-04-14 18:48:04 +00:00
jackqdyulei
c238596912 Merge "Update summary when toggle background activity" into oc-dev am: 8d519f8281
am: 3fd3a348d3

Change-Id: I9983091fb9db2fc67ef699fd19dc7497119c7d34
2017-04-14 18:47:47 +00:00
Jesse Evans
3d9fc82734 Merge "Instant apps show supported links not open default" into oc-dev am: 0f34680fe0
am: ec9090782c

Change-Id: I0d92c8ccecec2e61c88d3f9617d9c70827d2ea90
2017-04-14 18:47:30 +00:00
Lei Yu
088d771aad Merge "Revamp battery Ui in low battery mode" into oc-dev am: c4f08120b1
am: aa03fd4c42

Change-Id: I17c195a961585d7cbb873b6b962ad9205e89808c
2017-04-14 16:18:36 +00:00
Matthew Fritze
3746d9e25f Build Intents at index time
In order to index Intents into Icing, they need to be
built at Index time rather than at Search time.

Test: make RunSettingsRoboTests
Bug: 36443380
Change-Id: Ia731b5038380bb658232e2e175f52a81d86d7e02
2017-04-14 09:04:28 -07:00
TreeHugger Robot
190b560c9a Merge "Search Icon persists through screen rotation" into oc-dev 2017-04-14 05:25:57 +00:00
TreeHugger Robot
4b1206b4b2 Merge "Add erase eSIMs choice into factory reset" 2017-04-14 02:03:57 +00:00
TreeHugger Robot
8d519f8281 Merge "Update summary when toggle background activity" into oc-dev 2017-04-14 01:13:57 +00:00
Fan Zhang
5ca9063bc2 Apply admin restriction when network reset is disallowed
- Refactored network restriction checking logic into a checker class to
share across different places
- Added test

Test: make RunSettingsRoboTests
Change-Id: I6b7ea78f28fd1b61aacb070c377821150e441a74
Fix: 37134598
2017-04-13 18:05:16 -07:00
TreeHugger Robot
0f34680fe0 Merge "Instant apps show supported links not open default" into oc-dev 2017-04-14 00:41:01 +00:00