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
a2f8f3a01a
Merge "Fix setting crash when removing screenlock with fp" into oc-dev am: 339d117b46
...
am: c27f924e0e
2017-04-15 09:29:44 +00: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
b34af667f6
Merge "API for notification listener for Companioon apps" into oc-dev am: 01c0630e81
...
am: ab2bb40659
2017-04-15 04:31:55 +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
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
ddd4fd0ec2
Merge "Jostle the elements around in app storage settings." into oc-dev am: bea96cfb65
...
am: e90e746046
2017-04-15 00:15:12 +00: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
qingxi
a7b8b66fc5
Finalize the string for eSIM factory reset.
...
Bug: 37255419
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
2017-04-14 17:04:20 -07: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
474f6bc692
Merge "Fix crash when Assist app does not have settings activity." into oc-dev am: 0b7e3e056a
...
am: 6210546942
2017-04-14 23:05:47 +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
5f46202d34
Merge "Fix storage settings crash." into oc-dev am: 496fb93060
...
am: 188dfe238f
2017-04-14 22:44:03 +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
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
TreeHugger Robot
b0d85fb6b7
Merge "Build Intents at index time"
2017-04-14 22:01:52 +00: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
616da3bdab
Merge "Apply admin restriction when network reset is disallowed" into oc-dev am: 08575e1149
...
am: f3ce205b86
2017-04-14 21:22:26 +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
ce62cb0118
Merge "Update some battery string comments" into oc-dev am: 2721c8aa03
...
am: b783b2775d
2017-04-14 20:41:17 +00: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
jackqdyulei
b59d49384f
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev am: b544d22b35
...
am: 5f878d8672
2017-04-14 20:28:16 +00:00
Daniel Nishi
99ebf72938
Merge "Shrink the progress bar on storage items." into oc-dev am: 53ea5701f4
...
am: ae3305e7bd
2017-04-14 20:28:02 +00: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
10cdecef13
Merge "Use the music note icon for the music files pref." into oc-dev am: fbaa29a4b1
...
am: b6afa7575a
2017-04-14 20:00:05 +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
0d6cd5a902
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev am: c8c066dedf
...
am: b7c880a709
2017-04-14 18:48:18 +00:00
Matthew Fritze
ad6c78325b
Merge "Search Icon persists through screen rotation" into oc-dev am: 190b560c9a
...
am: cd9f5e2751
2017-04-14 18:48:04 +00:00
jackqdyulei
c238596912
Merge "Update summary when toggle background activity" into oc-dev am: 8d519f8281
...
am: 3fd3a348d3
2017-04-14 18:47:47 +00:00
Jesse Evans
3d9fc82734
Merge "Instant apps show supported links not open default" into oc-dev am: 0f34680fe0
...
am: ec9090782c
2017-04-14 18:47:30 +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
Lei Yu
088d771aad
Merge "Revamp battery Ui in low battery mode" into oc-dev am: c4f08120b1
...
am: aa03fd4c42
2017-04-14 16:18:36 +00:00
Fan Zhang
0e9ff1bc07
Merge "Use android:resource instead of :value for static summary" into oc-dev am: 812819d48c
...
am: 1ed4d2fc6c
2017-04-14 16:18:11 +00:00
