OSDN Git Service
Daniel Nishi [Mon, 17 Apr 2017 22:50:07 +0000 (22:50 +0000)]
Merge "Update the old Storage view to look better." into oc-dev am:
427f976ff4
am:
c99803bba4
Change-Id: Ibe8619a285effba38e89e2fada0887c57be54108
Daniel Nishi [Mon, 17 Apr 2017 22:49:45 +0000 (22:49 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev am:
4f2f6bcad9
am:
e69e9d74c5
Change-Id: Ica70e9cc82bdb8eb745583a3558f6fbb1f7c1b18
Daniel Nishi [Mon, 17 Apr 2017 22:39:52 +0000 (22:39 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
am:
427f976ff4
Change-Id: Ice0e3cb73a4d0b3ea81e83107f3f6084e83b5554
Daniel Nishi [Mon, 17 Apr 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
am:
4f2f6bcad9
Change-Id: I9bfa738b7d7010955ea26b162573bdb68dbbcef5
jackqdyulei [Mon, 17 Apr 2017 22:33:26 +0000 (22:33 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev am:
3a156f5509
am:
d5178f2bf0
Change-Id: I5dcae2cec079ba86f2052cd95bc0fb08e39b12a7
Fan Zhang [Mon, 17 Apr 2017 22:33:08 +0000 (22:33 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev am:
8e1d588cdf
am:
d96ce57713
Change-Id: I50bb90a53c74960465c73aafc8ae5ee0e8021b50
Sarah Fortune [Mon, 17 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am:
f7896f491a
am:
9827007c5e
Change-Id: Ib5db637dd6a7a79f622a11f737bbae08a3d557e1
Maurice Lam [Mon, 17 Apr 2017 22:32:35 +0000 (22:32 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev am:
3265c25861
am:
cd22ea50ca
Change-Id: I1423175ee2027939f67f9d33c22a9c4a8ea57da8
Doris Ling [Mon, 17 Apr 2017 22:32:18 +0000 (22:32 +0000)]
Merge "Add summary to special app access." into oc-dev am:
43458f0249
am:
edbcea5a14
Change-Id: I902bb0bf99198fe922268222c20dfa34d5e49433
Christine Franks [Mon, 17 Apr 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am:
c2d56691fe
am:
f0320dd7aa
Change-Id: I7f4624486a8299c7e36b3eb97167795a2f5da380
Daniel Nishi [Mon, 17 Apr 2017 22:26:10 +0000 (22:26 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:25:52 +0000 (22:25 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
jackqdyulei [Mon, 17 Apr 2017 22:00:25 +0000 (22:00 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
am:
3a156f5509
Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519
TreeHugger Robot [Mon, 17 Apr 2017 21:53:56 +0000 (21:53 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
Fan Zhang [Mon, 17 Apr 2017 21:37:24 +0000 (21:37 +0000)]
Update action bar style in app header UI. am:
be6fab0135
am:
00a0978293
Change-Id: I4d4029d732602dd515249d344e5edc597b858a54
Fan Zhang [Mon, 17 Apr 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
am:
8e1d588cdf
Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
TreeHugger Robot [Mon, 17 Apr 2017 21:10:30 +0000 (21:10 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
Sarah Fortune [Mon, 17 Apr 2017 20:15:45 +0000 (20:15 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
am:
f7896f491a
Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07
Sarah Fortune [Mon, 17 Apr 2017 20:07:31 +0000 (20:07 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:50:14 +0000 (19:50 +0000)]
Merge "Finalize the string for eSIM factory reset."
Maurice Lam [Mon, 17 Apr 2017 19:46:44 +0000 (19:46 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
am:
3265c25861
Change-Id: I0a9554576451b4f217fe8180ffe6812c9b4ac7c4
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
Doris Ling [Mon, 17 Apr 2017 19:42:15 +0000 (19:42 +0000)]
Merge "Add summary to special app access." into oc-dev
am:
43458f0249
Change-Id: I7e02ef17fb3b0defb7e3d048e680c8fb7872912c
TreeHugger Robot [Mon, 17 Apr 2017 19:37:06 +0000 (19:37 +0000)]
Merge "Add summary to special app access." into oc-dev
Fan Zhang [Mon, 17 Apr 2017 18:19:27 +0000 (11:19 -0700)]
Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix:
37351626
Test: visual
Christine Franks [Mon, 17 Apr 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
am:
c2d56691fe
Change-Id: Ic794afd6f8a957b7ab0d708aab8e24cb50bc8400
Fan Zhang [Mon, 17 Apr 2017 18:38:01 +0000 (18:38 +0000)]
Update action bar style in app header UI.
am:
be6fab0135
Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
Sarah Fortune [Wed, 12 Apr 2017 23:36:34 +0000 (16:36 -0700)]
Disable the wifi wakeup preference when wifi scanning is disabled
Bug:
36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
Christine Franks [Mon, 17 Apr 2017 18:30:26 +0000 (18:30 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
Doris Ling [Tue, 11 Apr 2017 22:35:49 +0000 (15:35 -0700)]
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
Christine Franks [Thu, 13 Apr 2017 23:34:55 +0000 (16:34 -0700)]
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
Fan Zhang [Fri, 14 Apr 2017 19:31:02 +0000 (12:31 -0700)]
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
Doris Ling [Sun, 16 Apr 2017 00:58:43 +0000 (00:58 +0000)]
Merge "Update subtext for Security settings." into oc-dev am:
a0e617f96d
am:
8b182839a5
Change-Id: Ia3d158eb681c12c7c6cf21eb475835d36664afee
Doris Ling [Sun, 16 Apr 2017 00:54:09 +0000 (00:54 +0000)]
Merge "Update subtext for Security settings." into oc-dev
am:
a0e617f96d
Change-Id: I4ca0f307c5fdedb46ffd98bc85d5774c3ef74238
Doris Ling [Sun, 16 Apr 2017 00:50:58 +0000 (00:50 +0000)]
Merge "Update subtext for Security settings." into oc-dev
Doris Ling [Mon, 10 Apr 2017 22:14:22 +0000 (15:14 -0700)]
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
Kevin Chyn [Sat, 15 Apr 2017 09:29:44 +0000 (09:29 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev am:
339d117b46
am:
c27f924e0e
Change-Id: Ia661bdeafcb3f8beffb5214b4adbb3602e30fca8
Kevin Chyn [Sat, 15 Apr 2017 09:26:12 +0000 (09:26 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
am:
339d117b46
Change-Id: I2fa18ac32053f3390d6cb821042ea0c63e6f4e86
TreeHugger Robot [Sat, 15 Apr 2017 09:20:49 +0000 (09:20 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
Eugene Susla [Sat, 15 Apr 2017 04:31:55 +0000 (04:31 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev am:
01c0630e81
am:
ab2bb40659
Change-Id: Iee1cbda7eb4cee9b34e7d9cb4577f3cf8902aa69
Eugene Susla [Sat, 15 Apr 2017 04:27:14 +0000 (04:27 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
am:
01c0630e81
Change-Id: I5aab5f6760b327fec244ea8ebe10fccc3e3bbbf1
Eugene Susla [Sat, 15 Apr 2017 04:17:21 +0000 (04:17 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
Eugene Susla [Fri, 14 Apr 2017 17:42:59 +0000 (10:42 -0700)]
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
Daniel Nishi [Sat, 15 Apr 2017 00:15:12 +0000 (00:15 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev am:
bea96cfb65
am:
e90e746046 -s ours
Change-Id: I944cb72c3c1f0b639d277bb034f10fbb604c2fcb
Daniel Nishi [Sat, 15 Apr 2017 00:04:52 +0000 (00:04 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
am:
bea96cfb65
Change-Id: Ib4a8bf827266d5fbb015fb5d4c71cd7a7f19b617
qingxi [Sat, 15 Apr 2017 00:03:12 +0000 (17:03 -0700)]
Finalize the string for eSIM factory reset.
Bug:
37255419
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
Daniel Nishi [Fri, 14 Apr 2017 23:52:07 +0000 (23:52 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
Doris Ling [Fri, 14 Apr 2017 23:05:47 +0000 (23:05 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev am:
0b7e3e056a
am:
6210546942
Change-Id: I19a813bbd56e9cb5ffefe680ad11efdd52c7503a
Doris Ling [Fri, 14 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
am:
0b7e3e056a
Change-Id: Ia0327dc5d11921debd3b4ced10467aebde5d486d
TreeHugger Robot [Fri, 14 Apr 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 22:44:03 +0000 (22:44 +0000)]
Merge "Fix storage settings crash." into oc-dev am:
496fb93060
am:
188dfe238f -s ours
Change-Id: Ied3bae27f505f3206756359a1a769c7e1e419bf0
Daniel Nishi [Fri, 14 Apr 2017 22:41:30 +0000 (22:41 +0000)]
Merge "Fix storage settings crash." into oc-dev
am:
496fb93060
Change-Id: I76354ceb7c6e87bc3b0ee845a2c95e46c3569f21
Daniel Nishi [Fri, 14 Apr 2017 22:34:53 +0000 (22:34 +0000)]
Merge "Fix storage settings crash." into oc-dev
jackqdyulei [Fri, 14 Apr 2017 18:42:04 +0000 (11:42 -0700)]
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
TreeHugger Robot [Fri, 14 Apr 2017 22:01:50 +0000 (22:01 +0000)]
Merge "Build Intents at index time"
Daniel Nishi [Fri, 14 Apr 2017 21:12:35 +0000 (14:12 -0700)]
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
Fan Zhang [Fri, 14 Apr 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev am:
08575e1149
am:
f3ce205b86
Change-Id: Id0da20ed2242becd2a5fad8d9bfd85a688ddee38
Fan Zhang [Fri, 14 Apr 2017 21:07:45 +0000 (21:07 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
am:
08575e1149
Change-Id: I315fecfdeea65b8e4a6c13e2ceb205357379a86a
TreeHugger Robot [Fri, 14 Apr 2017 20:57:29 +0000 (20:57 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
Doris Ling [Fri, 14 Apr 2017 19:43:07 +0000 (12:43 -0700)]
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
Lei Yu [Fri, 14 Apr 2017 20:41:17 +0000 (20:41 +0000)]
Merge "Update some battery string comments" into oc-dev am:
2721c8aa03
am:
b783b2775d
Change-Id: I76d0efaae5ad72bd0bb38a2e3a5c710f18fb8de8
Lei Yu [Fri, 14 Apr 2017 20:33:48 +0000 (20:33 +0000)]
Merge "Update some battery string comments" into oc-dev
am:
2721c8aa03
Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f
Kevin Chyn [Fri, 14 Apr 2017 20:33:21 +0000 (13:33 -0700)]
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
jackqdyulei [Fri, 14 Apr 2017 20:28:16 +0000 (20:28 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev am:
b544d22b35
am:
5f878d8672
Change-Id: I5b768cc6c11e28d3deaaed7a3b76fc0f1752359b
Daniel Nishi [Fri, 14 Apr 2017 20:28:02 +0000 (20:28 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev am:
53ea5701f4
am:
ae3305e7bd
Change-Id: I1afdb37c921d9e4ea53d56e605794ba0401f807a
Lei Yu [Fri, 14 Apr 2017 20:26:26 +0000 (20:26 +0000)]
Merge "Update some battery string comments" into oc-dev
jackqdyulei [Fri, 14 Apr 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
am:
b544d22b35
Change-Id: I4fd6c87fa396f7d03930a965ed793abe85613645
Daniel Nishi [Fri, 14 Apr 2017 20:22:46 +0000 (20:22 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev
am:
53ea5701f4
Change-Id: Ibd0a426630929dc3c5de7eb98fce692bd30d7729
TreeHugger Robot [Fri, 14 Apr 2017 20:19:46 +0000 (20:19 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 20:18:17 +0000 (20:18 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 20:00:05 +0000 (20:00 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev am:
fbaa29a4b1
am:
b6afa7575a
Change-Id: Ia644597897ad020468bc1bf8c12ba84c76e8893c
Daniel Nishi [Fri, 14 Apr 2017 19:56:45 +0000 (19:56 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev
am:
fbaa29a4b1
Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561
Daniel Nishi [Fri, 14 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev
Fan Zhang [Fri, 14 Apr 2017 18:48:18 +0000 (18:48 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev am:
c8c066dedf
am:
b7c880a709
Change-Id: I5c999a35fe83be87598b9c7374a0b13ae327130e
Matthew Fritze [Fri, 14 Apr 2017 18:48:04 +0000 (18:48 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev am:
190b560c9a
am:
cd9f5e2751
Change-Id: Ief39e145400b1b3956f44667bdd01c18ecec2be7
jackqdyulei [Fri, 14 Apr 2017 18:47:47 +0000 (18:47 +0000)]
Merge "Update summary when toggle background activity" into oc-dev am:
8d519f8281
am:
3fd3a348d3
Change-Id: I9983091fb9db2fc67ef699fd19dc7497119c7d34
Jesse Evans [Fri, 14 Apr 2017 18:47:30 +0000 (18:47 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev am:
0f34680fe0
am:
ec9090782c
Change-Id: I0d92c8ccecec2e61c88d3f9617d9c70827d2ea90
Fan Zhang [Fri, 14 Apr 2017 18:43:09 +0000 (18:43 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am:
c8c066dedf
Change-Id: Icf250ff46ddfd48d3d213c86f0c5001547a1a4ec
TreeHugger Robot [Fri, 14 Apr 2017 18:30:12 +0000 (18:30 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 21:29:03 +0000 (14:29 -0700)]
Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes:
36900603
Test: Manual
Lei Yu [Fri, 14 Apr 2017 16:18:36 +0000 (16:18 +0000)]
Merge "Revamp battery Ui in low battery mode" into oc-dev am:
c4f08120b1
am:
aa03fd4c42
Change-Id: I17c195a961585d7cbb873b6b962ad9205e89808c
Fan Zhang [Fri, 14 Apr 2017 16:18:11 +0000 (16:18 +0000)]
Merge "Use android:resource instead of :value for static summary" into oc-dev am:
812819d48c
am:
1ed4d2fc6c
Change-Id: I051808d0fe5aac33c46d0fdf883194de80bc6c19
Adam Lesinski [Fri, 14 Apr 2017 16:04:51 +0000 (16:04 +0000)]
Merge "Update FakeUid to match ag/
2099507" into oc-dev am:
8da75be811
am:
18fe8176f6
Change-Id: Iee532d4d17c75e71fcaa3850f5dbea090b68f99d
Matthew Fritze [Thu, 16 Mar 2017 23:34:34 +0000 (16:34 -0700)]
Build Intents at index time
In order to index Intents into Icing, they need to be
built at Index time rather than at Search time.
Test: make RunSettingsRoboTests
Bug:
36443380
Change-Id: Ia731b5038380bb658232e2e175f52a81d86d7e02
Jack He [Fri, 14 Apr 2017 15:56:29 +0000 (15:56 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev am:
ee720c000a
am:
0e91dba0cf
Change-Id: I84f5a9fc1c8705e52cc06dacfda81dd8a7050d5d
Jesse Evans [Fri, 14 Apr 2017 15:52:56 +0000 (15:52 +0000)]
Merge "Instant apps should not say App Installed by" into oc-dev am:
28371d9c9e
am:
774b759ef9
Change-Id: Id8e60764ee9e0dd20f73798b1cd8df706d1d70e9
Saige McVea [Fri, 14 Apr 2017 15:52:41 +0000 (15:52 +0000)]
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev am:
ba7a4751a0
am:
8fb5b5fd0e
Change-Id: I1167930dd65752403876d462150a4c63dbb1dd84
Daniel Nishi [Fri, 14 Apr 2017 15:52:19 +0000 (15:52 +0000)]
Merge "Add a movies & tv apps category to storage settings." into oc-dev am:
c365a8735c
am:
f6e6991965 -s ours
Change-Id: Ia45def2b1b04d7ac581b974763cc9ab3586335c0
Matthew Fritze [Fri, 14 Apr 2017 05:36:27 +0000 (05:36 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev
am:
190b560c9a
Change-Id: I0542aa05a20d637ced618e68a84e53e73b3f70a0
TreeHugger Robot [Fri, 14 Apr 2017 05:25:56 +0000 (05:25 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:03:56 +0000 (02:03 +0000)]
Merge "Add erase eSIMs choice into factory reset"
jackqdyulei [Fri, 14 Apr 2017 01:25:47 +0000 (01:25 +0000)]
Merge "Update summary when toggle background activity" into oc-dev
am:
8d519f8281
Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33
TreeHugger Robot [Fri, 14 Apr 2017 01:13:56 +0000 (01:13 +0000)]
Merge "Update summary when toggle background activity" into oc-dev
Fan Zhang [Fri, 14 Apr 2017 01:03:45 +0000 (18:03 -0700)]
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
jackqdyulei [Fri, 14 Apr 2017 00:53:02 +0000 (17:53 -0700)]
Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background
Fix:
36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
Jesse Evans [Fri, 14 Apr 2017 00:48:56 +0000 (00:48 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev
am:
0f34680fe0
Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640
TreeHugger Robot [Fri, 14 Apr 2017 00:41:00 +0000 (00:41 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev
Ajay Nadathur [Thu, 13 Apr 2017 23:06:28 +0000 (16:06 -0700)]
Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.
bug:
36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
Daniel Nishi [Thu, 13 Apr 2017 23:49:15 +0000 (16:49 -0700)]
Update the old Storage view to look better.
This removes the Manage Storage button and moves the titles of
the preferences to match the new progress bar location.
Bug:
2108251
Test: Manual
Change-Id: I1dce610050e44abd4665537e42a752bf34e94384
jackqdyulei [Mon, 10 Apr 2017 21:23:04 +0000 (14:23 -0700)]
Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.
Bug:
37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350