Commit Graph

35050 Commits

Author SHA1 Message Date
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

Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519
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
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

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
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

Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07
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

Change-Id: I0a9554576451b4f217fe8180ffe6812c9b4ac7c4
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

Change-Id: I7e02ef17fb3b0defb7e3d048e680c8fb7872912c
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

Change-Id: Ic794afd6f8a957b7ab0d708aab8e24cb50bc8400
2017-04-17 18:40:45 +00:00
Fan Zhang
00a0978293 Update action bar style in app header UI.
am: be6fab0135

Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
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

Change-Id: I4ca0f307c5fdedb46ffd98bc85d5774c3ef74238
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

Change-Id: I2fa18ac32053f3390d6cb821042ea0c63e6f4e86
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

Change-Id: I5aab5f6760b327fec244ea8ebe10fccc3e3bbbf1
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
Kevin Chyn
814079f27f FP name shouldn't be allowed to allow/display non-null names
Fixes: 37360324
Test: try to save an empty FP name
make sure it doesn't display the empty name

Change-Id: Ie81699abc0da9513e5173364e8ae969bbe195ac6
2017-04-14 17:48:28 -07:00
Daniel Nishi
e90e746046 Merge "Jostle the elements around in app storage settings." into oc-dev
am: bea96cfb65

Change-Id: Ib4a8bf827266d5fbb015fb5d4c71cd7a7f19b617
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

Change-Id: Ia0327dc5d11921debd3b4ced10467aebde5d486d
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

Change-Id: I76354ceb7c6e87bc3b0ee845a2c95e46c3569f21
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
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
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
f3ce205b86 Merge "Apply admin restriction when network reset is disallowed" into oc-dev
am: 08575e1149

Change-Id: I315fecfdeea65b8e4a6c13e2ceb205357379a86a
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

Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f
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