Casey Burkhardt
65523b9cb0
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
2017-04-18 00:06:53 +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
Julia Reynolds
bcaa8ecb24
Merge "Consolidate notification settings." into oc-dev
...
am: 6adf04c741
2017-04-17 23:24:54 +00:00
TreeHugger Robot
6adf04c741
Merge "Consolidate notification settings." into oc-dev
2017-04-17 23:16:38 +00:00
Sundeep Ghuman
8b8f65828b
Merge "Fix startup jank in the Wifi Picker." into oc-dev
...
am: ceedf2b9bf
2017-04-17 22:52:47 +00:00
Daniel Nishi
9db2a27a37
Merge "Update the old Storage view to look better." into oc-dev am: 427f976ff4
...
am: c99803bba4
2017-04-17 22:50:07 +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
TreeHugger Robot
ceedf2b9bf
Merge "Fix startup jank in the Wifi Picker." into oc-dev
2017-04-17 22:47:29 +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
Jeff Sharkey
4ecbc32b48
Merge "Follow storage API polishing." into oc-dev
...
am: e398a84199
2017-04-17 22:40:20 +00:00
Daniel Nishi
c99803bba4
Merge "Update the old Storage view to look better." into oc-dev
...
am: 427f976ff4
2017-04-17 22:39:52 +00:00
Daniel Nishi
e69e9d74c5
Merge "Fix a bug where options menu was not showing." into oc-dev
...
am: 4f2f6bcad9
2017-04-17 22:39:31 +00: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
Maurice Lam
e2fbd710e9
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev am: 3265c25861
...
am: cd22ea50ca
2017-04-17 22:32:35 +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
427f976ff4
Merge "Update the old Storage view to look better." into oc-dev
2017-04-17 22:26:11 +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
jackqdyulei
d5178f2bf0
Merge "Make battery status refresh in SettingsActivity" into oc-dev
...
am: 3a156f5509
2017-04-17 22:00:25 +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
Julia Reynolds
8cf8bf0ae8
Consolidate notification settings.
...
App notifications now appears under configure notifications.
Bug: 36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
2017-04-17 21:28:47 +00:00
Fan Zhang
d96ce57713
Merge "Use standard preference layout for wallpaper picker" into oc-dev
...
am: 8e1d588cdf
2017-04-17 21:18:14 +00:00
TreeHugger Robot
8e1d588cdf
Merge "Use standard preference layout for wallpaper picker" into oc-dev
2017-04-17 21:10:31 +00:00
Sundeep Ghuman
60c1d4ec64
Fix startup jank in the Wifi Picker.
...
Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.
Bug: b/36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.
Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e
2017-04-17 13:36:35 -07: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
9827007c5e
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
...
am: f7896f491a
2017-04-17 20:15:45 +00: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
ee4e9a7fe8
Merge "Finalize the string for eSIM factory reset."
2017-04-17 19:50:16 +00:00
Maurice Lam
cd22ea50ca
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
...
am: 3265c25861
2017-04-17 19:46:44 +00:00
TreeHugger Robot
3265c25861
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
2017-04-17 19:43:14 +00:00
Doris Ling
edbcea5a14
Merge "Add summary to special app access." into oc-dev
...
am: 43458f0249
2017-04-17 19:42:15 +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
Saige McVea
6a6b97905f
Conditionally reposition experimental preferences.
...
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.
Test: Manual
Bug: 36603386
Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
2017-04-17 11:59:07 -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
Christine Franks
f0320dd7aa
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
...
am: c2d56691fe
2017-04-17 18:40:45 +00:00
Fan Zhang
00a0978293
Update action bar style in app header UI.
...
am: be6fab0135
2017-04-17 18:38:01 +00: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
8b182839a5
Merge "Update subtext for Security settings." into oc-dev
...
am: a0e617f96d
2017-04-16 00:54:09 +00:00
Doris Ling
a0e617f96d
Merge "Update subtext for Security settings." into oc-dev
2017-04-16 00:50:59 +00:00
