Commit Graph

35568 Commits

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

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
Lei Yu
ce62cb0118 Merge "Update some battery string comments" into oc-dev am: 2721c8aa03
am: b783b2775d

Change-Id: I76d0efaae5ad72bd0bb38a2e3a5c710f18fb8de8
2017-04-14 20:41:17 +00: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
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
Daniel Nishi
99ebf72938 Merge "Shrink the progress bar on storage items." into oc-dev am: 53ea5701f4
am: ae3305e7bd

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

Change-Id: I4fd6c87fa396f7d03930a965ed793abe85613645
2017-04-14 20:23:00 +00:00
Daniel Nishi
ae3305e7bd Merge "Shrink the progress bar on storage items." into oc-dev
am: 53ea5701f4

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

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

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

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
Fan Zhang
b7c880a709 Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am: c8c066dedf

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

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

Change-Id: I051808d0fe5aac33c46d0fdf883194de80bc6c19
2017-04-14 16:18:11 +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
Jack He
11f360bc49 Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev am: ee720c000a
am: 0e91dba0cf

Change-Id: I84f5a9fc1c8705e52cc06dacfda81dd8a7050d5d
2017-04-14 15:56:29 +00: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
Daniel Nishi
a13cd0f119 Merge "Add a movies & tv apps category to storage settings." into oc-dev am: c365a8735c
am: f6e6991965  -s ours

Change-Id: Ia45def2b1b04d7ac581b974763cc9ab3586335c0
2017-04-14 15:52:19 +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
jackqdyulei
7c7654b401 Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background

Fix: 36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
2017-04-13 17:54:48 -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
Daniel Nishi
5b627f9ae5 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
2017-04-13 16:49: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
Casey Burkhardt
875d3b2471 Hide "Magnify with button" if no navbar is shown
Devices without a software-rendered navigation bar will be unable to
use "Magnify with button" as no accessibility button trigger for
magnification can be shown.

In this case, we hide the setting by preventing
MagnificationPreferenceFragment from showing the list of mag
modes, instead launching directly into the PreferenceFragment for
"Magnify with triple-tap"

Bug: 36862906
Test: Manual - Configured marlin to disable the navigation bar and
      verified behavior in SUW and Settings

Change-Id: Ie614ec292d7779044274b7c79eaed1df080c0fd1
2017-04-13 15:50:28 -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