Commit Graph

1474 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
Lei Yu
15ae65ac55 Merge "Update Summary for Battery Optimization" into oc-dev am: d29cb7e7ea
am: d03025897d

Change-Id: I85ac8e1b40c37109d2d5df9e12fec4e3fa518a67
2017-04-13 18:04:37 +00:00
Sundeep Ghuman
3ff70832bb Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev am: 028642e0a9
am: c8ec4c0e3f

Change-Id: Ib924fdf698f3d98f6e66e2c800b15b0b86d97dc9
2017-04-13 18:04:21 +00:00
Lei Yu
d29cb7e7ea Merge "Update Summary for Battery Optimization" into oc-dev 2017-04-13 17:33:04 +00:00
TreeHugger Robot
028642e0a9 Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev 2017-04-13 17:08:40 +00:00
Tony Mak
5b67fa63fb Merge "Show RingtonePickerActivity in work user instead" into oc-dev am: 35f1e055d1
am: 8e413e2a88

Change-Id: I3d4874feb410c5ece7a44f04dca23f4ea7546fdd
2017-04-13 12:44:03 +00:00
TreeHugger Robot
35f1e055d1 Merge "Show RingtonePickerActivity in work user instead" into oc-dev 2017-04-13 12:13:04 +00:00
Lenka Trochtova
479d197196 Check for user restrictions disallowing BT in BluetoothEnabler.
Test: make RunSettingsRoboTests -j40
Test: manual

BUG: 35596982
BUG: 32895313

Change-Id: Ie8f53b665a4aad4e6b17b20602cbe5502998d7a2
2017-04-13 10:52:26 +02:00
Sundeep Ghuman
8474a9c877 Add a broadcast receiver to WifiDetailsPreferenceController.
This allows the WifiNetworkDetailsFragment to update dynamically based
on network and connection changes.

Bug: b/36278407
Test: make RunSettingsRoboTests
Change-Id: I388cf9842a144e45b68f2d173c7b29f347226b78
2017-04-12 17:56:58 -07:00
Stephen Chen
b8d2af244b Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev am: de50fff3c2
am: 6455544f6e

Change-Id: I62689c3716e34c1c9faa4c0b56235c2a699552c1
2017-04-12 22:35:52 +00:00
TreeHugger Robot
de50fff3c2 Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev 2017-04-12 20:24:22 +00:00
jackqdyulei
781c3000d1 Update Summary for Battery Optimization
Bug: 37221696
Test: RunSettingsRoboTests
Change-Id: I7dc24879521a1375e0ad4b4b73e9a40633b93c3f
2017-04-12 13:04:28 -07:00
Lei Yu
5564e51661 Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev am: 171cbf8900
am: 94cfdcc26c

Change-Id: I84c4fe7eb70a3e6461e8f7d97669721b6d1c2b03
2017-04-12 20:00:45 +00:00
jackqdyulei
f8e6f43425 Revamp battery Ui in low battery mode
This cl refine battery icon ui in low battery mode:
1. Should show indicator(fixed in ag/2035178)
2. Show bolt icon when charging
3. When battery is low, set battery background as red and indicator
as white.

This cl also includes the field updates for battery.

Bug: 36862496
Test: RunSettingsRoboTests
Change-Id: Ifb2ed339742119bbff78712df09288b895756b1f
2017-04-12 12:47:52 -07:00
Lei Yu
171cbf8900 Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev 2017-04-12 19:39:08 +00:00
Chris Tate
02883b0217 Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev am: 763bfea530
am: 3185371382

Change-Id: Ib784dbd11aea5a94ee8f60d87df8d84bc68c260c
2017-04-12 19:23:27 +00:00
Daniel Nishi
25b62b1126 Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
am: 129eb1773a

Change-Id: Iae6c55f2e6f26dc6b147d70c070109398c528636
2017-04-12 19:23:12 +00:00
Chris Tate
763bfea530 Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev 2017-04-12 18:58:26 +00:00
Daniel Nishi
aa3685fe14 Merge "Don't crash in SecondaryUserController." into oc-dev 2017-04-12 18:57:48 +00:00
jackqdyulei
7f4c5fc1f4 Move bunch of battery methods to BatteryUtils.java
This cl moves following methods to BatteryUtils:
1. shouldHideSipper
2. removeHiddenBatterySippers
3. calculateBatteryPercent

As a result, we could use these methods in battery page as well
as app info page.

This cl also move bunch of tests to new file and add test for
method calculateBatteryPercent

Bug: 36816681
Test: RunSettingsRoboTests
Change-Id: Ic32700fe9741fbb96363db4af2d4fccb3ee8e317
2017-04-12 10:10:51 -07:00
Daniel Nishi
06470b68e0 Don't crash in SecondaryUserController.
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.

Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes: 37248158
Test: Settings Robotest
2017-04-12 09:33:32 -07:00
Tony Mak
007dc1abe6 Show RingtonePickerActivity in work user instead
Test: make RunSettingsRoboTests
Test: Try to import custom ringtone in work profile, no crash observed
Test: Set the custom ringtone as default. Tested both work gmail and
      calendar can play that ringtone.
Test: Try to import the peresonal ringtone, it is still working.

Bug: 37197930
Change-Id: I2b662247d7e70b59bae08e082e9682d74d797484
2017-04-12 15:12:44 +01:00
Doris Ling
395c70370a Merge "Remove hotspot receiver from manifest." into oc-dev am: 44cfdcc9a7
am: 31b6dfdef8

Change-Id: I217c5658ed3197fac32fa9c9fa7458f5e9254fbc
2017-04-12 08:33:40 +00:00
TreeHugger Robot
44cfdcc9a7 Merge "Remove hotspot receiver from manifest." into oc-dev 2017-04-12 08:20:06 +00:00
Amin Shaikh
27ea581cbe Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
am: 35caf331df

Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
Suprabh Shukla
fdc69a5452 Merge "Renaming intent action for unknown sources" into oc-dev am: 3fa963b28e
am: eb2e6c7add

Change-Id: Ifeb4c9714c77f93cb95dffcf850867c68fe06d7a
2017-04-12 04:55:28 +00:00
TreeHugger Robot
52cf25d03d Merge "Wi-Fi network details page fixes." into oc-dev 2017-04-12 04:40:11 +00:00
Suprabh Shukla
3fa963b28e Merge "Renaming intent action for unknown sources" into oc-dev 2017-04-12 04:32:51 +00:00
TreeHugger Robot
375c22d031 Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev 2017-04-12 01:25:21 +00:00
Fan Zhang
09641675af Merge "Don't show vpn info box when we don't have anything useful" into oc-dev am: d70abb53ee
am: 007b9e3cdd

Change-Id: I0686ca0de807f7dab72d261536da02faa0703847
2017-04-11 23:48:51 +00:00
Fan Zhang
57c1ce4980 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev am: fd29aada6b
am: 668dae22e7

Change-Id: Ib618566f6078793be3460070e65bd78b9d0f0a59
2017-04-11 23:48:37 +00:00
TreeHugger Robot
d70abb53ee Merge "Don't show vpn info box when we don't have anything useful" into oc-dev 2017-04-11 23:35:39 +00:00
TreeHugger Robot
fd29aada6b Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev 2017-04-11 23:35:13 +00:00