Commit Graph

1033 Commits

Author SHA1 Message Date
TreeHugger Robot
c037add5dc Merge "Prevent search crashes from uninstalled apps" 2017-04-19 23:45:44 +00:00
TreeHugger Robot
8968e61b95 Merge "Remove duplicates between battery and display settings" 2017-04-19 23:05:03 +00:00
Matthew Fritze
359bce4f50 Prevent search crashes from uninstalled apps
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.

Bug: 34817357
Test: make RunSettingsRoboTests
Change-Id: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
2017-04-19 15:06:39 -07:00
Matthew Fritze
c6f2638009 Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-19 14:34:13 -07:00
Fan Zhang
8a7d60d1ff Merge "Fix action bar background not wide enough on tablets" into oc-dev am: 8cd4b4541d
am: 30dd978830

Change-Id: I2f63be40765bb8d2acd6c9c06809420f53eaa032
2017-04-19 19:45:50 +00:00
Fan Zhang
c109797d13 Merge "Use AfW user handle when setting auto_sync for work" into oc-dev am: 4967646661
am: 3acabbdee9

Change-Id: If82d3bcee39eb0c14f1ffb05cb20051d341e2cba
2017-04-19 19:45:30 +00:00
TreeHugger Robot
8cd4b4541d Merge "Fix action bar background not wide enough on tablets" into oc-dev 2017-04-19 19:36:25 +00:00
TreeHugger Robot
4967646661 Merge "Use AfW user handle when setting auto_sync for work" into oc-dev 2017-04-19 19:32:55 +00:00
Fan Zhang
fbb2331ee5 Use AfW user handle when setting auto_sync for work
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix: 36675513
Test: make RunSettingsRoboTests
2017-04-19 10:09:11 -07:00
Sunny Goyal
91f6cad742 Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2
2017-04-19 03:03:50 +00:00
TreeHugger Robot
d2561263a8 Merge "Using a common class for loading drawables and handling various badging" into oc-dev 2017-04-19 02:43:48 +00:00
Sundeep Ghuman
bd1b217da7 Merge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
am: 1e04aa912e

Change-Id: I18c6a34b45138e348cb67cc2500cdf662d712784
2017-04-19 01:11:46 +00:00
TreeHugger Robot
4ae52fc7f0 Merge "IPv6 addresses should not be selectable." into oc-dev 2017-04-19 00:54:33 +00:00
Sundeep Ghuman
6347e1b4b8 IPv6 addresses should not be selectable.
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.

Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
2017-04-18 15:05:17 -07:00
TreeHugger Robot
a88635f5a3 Merge "Listen to brigtness updates to update brightness summary." into oc-dev 2017-04-18 21:47:05 +00:00
Fan Zhang
a006c6de81 Fix action bar background not wide enough on tablets
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix: 37475599
Test: make RunSettingsRoboTests
2017-04-18 14:40:25 -07:00
Sunny Goyal
3b172d7b89 Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug: 36591157

Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Doris Ling
4b95879634 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-18 20:01:16 +00:00
TreeHugger Robot
eb9e5be803 Merge "Listen to brigtness updates to update brightness summary." 2017-04-18 19:47:36 +00:00
Doris Ling
83e2741bd7 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Bug: 37227609
Test: make RunSettingsRoboTests
Change-Id: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
2017-04-18 11:05:16 -07:00
Matthew Fritze
f0b8ffeb98 Merge "Revert "Add summary to special app access."" into oc-dev am: 4fa0a617ec
am: d9997261dd

Change-Id: Ie13c5b63e82edff9f0d442a29ebcc626c7e37f79
2017-04-18 17:51:26 +00:00
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
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