Commit Graph

16246 Commits

Author SHA1 Message Date
Kevin Chyn
a2f8f3a01a Merge "Fix setting crash when removing screenlock with fp" into oc-dev am: 339d117b46
am: c27f924e0e

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

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
b34af667f6 Merge "API for notification listener for Companioon apps" into oc-dev am: 01c0630e81
am: ab2bb40659

Change-Id: Iee1cbda7eb4cee9b34e7d9cb4577f3cf8902aa69
2017-04-15 04:31:55 +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
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
474f6bc692 Merge "Fix crash when Assist app does not have settings activity." into oc-dev am: 0b7e3e056a
am: 6210546942

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

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
TreeHugger Robot
b0d85fb6b7 Merge "Build Intents at index time" 2017-04-14 22:01:52 +00:00
Fan Zhang
616da3bdab Merge "Apply admin restriction when network reset is disallowed" into oc-dev am: 08575e1149
am: f3ce205b86

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

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
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

Change-Id: I5b768cc6c11e28d3deaaed7a3b76fc0f1752359b
2017-04-14 20:28:16 +00:00
jackqdyulei
5f878d8672 Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
am: b544d22b35

Change-Id: I4fd6c87fa396f7d03930a965ed793abe85613645
2017-04-14 20:23:00 +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
10cdecef13 Merge "Use the music note icon for the music files pref." into oc-dev am: fbaa29a4b1
am: b6afa7575a

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

Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561
2017-04-14 19:56:45 +00:00
Matthew Fritze
ad6c78325b Merge "Search Icon persists through screen rotation" into oc-dev am: 190b560c9a
am: cd9f5e2751

Change-Id: Ief39e145400b1b3956f44667bdd01c18ecec2be7
2017-04-14 18:48:04 +00:00
jackqdyulei
c238596912 Merge "Update summary when toggle background activity" into oc-dev am: 8d519f8281
am: 3fd3a348d3

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

Change-Id: I0d92c8ccecec2e61c88d3f9617d9c70827d2ea90
2017-04-14 18:47:30 +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

Change-Id: I17c195a961585d7cbb873b6b962ad9205e89808c
2017-04-14 16:18:36 +00:00
Adam Lesinski
da9c2d0dbf Merge "Update FakeUid to match ag/2099507" into oc-dev am: 8da75be811
am: 18fe8176f6

Change-Id: Iee532d4d17c75e71fcaa3850f5dbea090b68f99d
2017-04-14 16:04:51 +00:00
Matthew Fritze
3746d9e25f 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
2017-04-14 09:04:28 -07:00
Jesse Evans
5d0c0fab8c Merge "Instant apps should not say App Installed by" into oc-dev am: 28371d9c9e
am: 774b759ef9

Change-Id: Id8e60764ee9e0dd20f73798b1cd8df706d1d70e9
2017-04-14 15:52:56 +00:00
Saige McVea
4d75b8812e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev am: ba7a4751a0
am: 8fb5b5fd0e

Change-Id: I1167930dd65752403876d462150a4c63dbb1dd84
2017-04-14 15:52:41 +00:00
Matthew Fritze
cd9f5e2751 Merge "Search Icon persists through screen rotation" into oc-dev
am: 190b560c9a

Change-Id: I0542aa05a20d637ced618e68a84e53e73b3f70a0
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
TreeHugger Robot
4b1206b4b2 Merge "Add erase eSIMs choice into factory reset" 2017-04-14 02:03:57 +00:00
jackqdyulei
3fd3a348d3 Merge "Update summary when toggle background activity" into oc-dev
am: 8d519f8281

Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33
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
Jesse Evans
ec9090782c Merge "Instant apps show supported links not open default" into oc-dev
am: 0f34680fe0

Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640
2017-04-14 00:48:56 +00:00
TreeHugger Robot
0f34680fe0 Merge "Instant apps show supported links not open default" into oc-dev 2017-04-14 00:41:01 +00:00
Ajay Nadathur
51ef801b32 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
2017-04-13 16:58:15 -07:00
jackqdyulei
60607da120 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
2017-04-13 16:23:45 -07:00
jackqdyulei
92fceaff22 Hide summary for Cell in PowerUsageAdvanced
1. Add method "shouldHideSummary" to check it
2. Also change method "shouldHide" to "shouldHideCategory",
to distinguish it from shouldHideSummary

Fix: 37293815
Test: RunSettingsRoboTests
Change-Id: I4364d0331f3aac143fad9ebdeab52207f5cb98bf
2017-04-13 16:00:04 -07:00
qingxi
072f28661d Add erase eSIMs choice into factory reset
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.

Bug: 37255419
Test: Included
Change-Id: Ic98974726a515b0a350b73a33093460a63c1fb8a
2017-04-13 15:28:45 -07:00
Jesse Evans
edc5099e89 Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug: 36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
2017-04-13 15:17:41 -07:00
Lei Yu
aa03fd4c42 Merge "Revamp battery Ui in low battery mode" into oc-dev
am: c4f08120b1

Change-Id: I98dd93c678a3c71e0c19cb8a2f3979606d7075af
2017-04-13 21:52:49 +00:00
Lei Yu
c4f08120b1 Merge "Revamp battery Ui in low battery mode" into oc-dev 2017-04-13 21:43:38 +00:00
Daniel Nishi
95261b9239 Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.

Change-Id: I1b96b0697f4041be356260d6c675593affc1cb69
Merged-In: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-13 13:21:26 -07:00