Sunny Goyal
91f6cad742
Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
...
am: 77fca989a0
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
Fan Zhang
8adcd2f441
Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
...
am: 2bb10c9e57
2017-04-19 01:54:40 +00:00
TreeHugger Robot
4766183336
Merge "Add test to verify regulatory info launches properly" into oc-dev
2017-04-19 01:48:40 +00:00
Sundeep Ghuman
bd1b217da7
Merge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
...
am: 1e04aa912e
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
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
Fan Zhang
06ee0e932f
Add test to verify regulatory info launches properly
...
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866
2017-04-18 12:53:24 -07: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
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
2017-04-18 17:35:07 +00:00
Julia Reynolds
564c74b8b2
Merge "Channel settings updates" into oc-dev am: 526185c89b
...
am: 41b21fd2d5
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
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
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
TreeHugger Robot
b6a0360a92
Merge "Use buttons for EncryptionInterstitial" into oc-dev
2017-04-18 00:32:55 +00:00
Jeff Sharkey
5d9ccedc59
Merge "Follow storage API polishing." into oc-dev am: e398a84199
...
am: 4ecbc32b48
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
2017-04-17 22:49:45 +00:00
Maurice Lam
88df6f4407
Use buttons for EncryptionInterstitial
...
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb
2017-04-17 15:42:21 -07:00
jackqdyulei
7e957fbe1f
Merge "Make battery status refresh in SettingsActivity" into oc-dev am: 3a156f5509
...
am: d5178f2bf0
2017-04-17 22:33:26 +00:00
Fan Zhang
b0c2ca7c07
Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
...
am: d96ce57713
2017-04-17 22:33:08 +00:00
Sarah Fortune
e6fbdee6e6
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am: f7896f491a
...
am: 9827007c5e
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
2017-04-17 22:32:18 +00:00
Christine Franks
8e1202b54e
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am: c2d56691fe
...
am: f0320dd7aa
2017-04-17 22:32:01 +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
2017-04-17 21:37:24 +00:00
TreeHugger Robot
8e1d588cdf
Merge "Use standard preference layout for wallpaper picker" into oc-dev
2017-04-17 21:10:31 +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
Fan Zhang
1a4fea2b72
Use standard preference layout for wallpaper picker
...
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix: 37351626
Test: visual
2017-04-17 12:23:52 -07: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
Christine Franks
c2d56691fe
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
2017-04-17 18:30:27 +00: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
Christine Franks
66d59f8d38
Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS
...
Bug: 35356645
Test: Verify for both config_nightDisplayAvailable true and false,
adb shell am instrument -e class
com.android.settings.display.NightDisplayTest -w
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7de3eddf62428d75bef621d3387fa33a76205fe7
2017-04-17 09:47:26 -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
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
