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
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
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
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
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
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
Kevin Chyn
c27f924e0e
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
...
am: 339d117b46
2017-04-15 09:26:12 +00:00
TreeHugger Robot
339d117b46
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
2017-04-15 09:20:50 +00:00
Eugene Susla
ab2bb40659
Merge "API for notification listener for Companioon apps" into oc-dev
...
am: 01c0630e81
2017-04-15 04:27:14 +00:00
Eugene Susla
01c0630e81
Merge "API for notification listener for Companioon apps" into oc-dev
2017-04-15 04:17:22 +00:00
Eugene Susla
57544123cd
API for notification listener for Companioon apps
...
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I0b280e9bcef7f9d21ce7c9dfeaf2703945481efd
2017-04-14 18:55:53 -07:00
Daniel Nishi
e90e746046
Merge "Jostle the elements around in app storage settings." into oc-dev
...
am: bea96cfb65
2017-04-15 00:04:52 +00:00
Daniel Nishi
bea96cfb65
Merge "Jostle the elements around in app storage settings." into oc-dev
2017-04-14 23:52:08 +00:00
Doris Ling
6210546942
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
...
am: 0b7e3e056a
2017-04-14 23:00:11 +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
Daniel Nishi
188dfe238f
Merge "Fix storage settings crash." into oc-dev
...
am: 496fb93060
2017-04-14 22:41:30 +00:00
Daniel Nishi
496fb93060
Merge "Fix storage settings crash." into oc-dev
2017-04-14 22:34:54 +00:00
Fan Zhang
f3ce205b86
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
...
am: 08575e1149
2017-04-14 21:07:45 +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
Lei Yu
b783b2775d
Merge "Update some battery string comments" into oc-dev
...
am: 2721c8aa03
2017-04-14 20:33:48 +00:00
Kevin Chyn
ae16e55dd5
Fix setting crash when removing screenlock with fp
...
If a phone is operating slower than normal, when removing screen lock,
it's possible for the user to go back to settings page while removal
is still in progress. The removal callback will crash ChooseLockGeneric
Fixes: 37329856
Test: in fpc_tee_hal.c, make do_remove slow (5s). set up lockscreen, fingerprint,
then set lockscreen to none or swipe. do device rotations, go back to lock screen,
and then try to enroll fingerprint
Change-Id: I6da131a0001b22d06e359401f2ca1c6496c071ca
2017-04-14 13:33:21 -07:00
Lei Yu
2721c8aa03
Merge "Update some battery string comments" into oc-dev
2017-04-14 20:26:27 +00:00
jackqdyulei
5f878d8672
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
...
am: b544d22b35
2017-04-14 20:23:00 +00:00
Daniel Nishi
ae3305e7bd
Merge "Shrink the progress bar on storage items." into oc-dev
...
am: 53ea5701f4
2017-04-14 20:22:46 +00:00
TreeHugger Robot
b544d22b35
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
2017-04-14 20:19:47 +00:00
Daniel Nishi
53ea5701f4
Merge "Shrink the progress bar on storage items." into oc-dev
2017-04-14 20:18:18 +00:00
Daniel Nishi
b6afa7575a
Merge "Use the music note icon for the music files pref." into oc-dev
...
am: fbaa29a4b1
2017-04-14 19:56:45 +00:00
Daniel Nishi
fbaa29a4b1
Merge "Use the music note icon for the music files pref." into oc-dev
2017-04-14 19:50:31 +00:00
Fan Zhang
b7c880a709
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
...
am: c8c066dedf
2017-04-14 18:43:09 +00:00
TreeHugger Robot
c8c066dedf
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
2017-04-14 18:30:13 +00:00
Daniel Nishi
c274a28660
Use the music note icon for the music files pref.
...
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes: 36900603
Test: Manual
2017-04-14 10:29:14 -07:00
Matthew Fritze
cd9f5e2751
Merge "Search Icon persists through screen rotation" into oc-dev
...
am: 190b560c9a
2017-04-14 05:36:27 +00:00
TreeHugger Robot
190b560c9a
Merge "Search Icon persists through screen rotation" into oc-dev
2017-04-14 05:25:57 +00:00
jackqdyulei
3fd3a348d3
Merge "Update summary when toggle background activity" into oc-dev
...
am: 8d519f8281
2017-04-14 01:25:47 +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
