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
jackqdyulei
b59d49384f
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev am: b544d22b35
...
am: 5f878d8672
2017-04-14 20:28:16 +00:00
jackqdyulei
5f878d8672
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
...
am: b544d22b35
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
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
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
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
Adam Lesinski
da9c2d0dbf
Merge "Update FakeUid to match ag/2099507" into oc-dev am: 8da75be811
...
am: 18fe8176f6
2017-04-14 16:04:51 +00:00
Jesse Evans
5d0c0fab8c
Merge "Instant apps should not say App Installed by" into oc-dev am: 28371d9c9e
...
am: 774b759ef9
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
2017-04-14 15:52:41 +00:00
Matthew Fritze
cd9f5e2751
Merge "Search Icon persists through screen rotation" into oc-dev
...
am: 190b560c9a
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
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
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
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
Adam Lesinski
18fe8176f6
Merge "Update FakeUid to match ag/2099507" into oc-dev
...
am: 8da75be811
2017-04-13 20:21:17 +00:00
Adam Lesinski
8da75be811
Merge "Update FakeUid to match ag/2099507" into oc-dev
2017-04-13 20:09:52 +00:00
Jesse Evans
774b759ef9
Merge "Instant apps should not say App Installed by" into oc-dev
...
am: 28371d9c9e
2017-04-13 20:03:43 +00:00
Jack He
ee720c000a
Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev
2017-04-13 19:43:55 +00:00
TreeHugger Robot
28371d9c9e
Merge "Instant apps should not say App Installed by" into oc-dev
2017-04-13 19:36:53 +00:00
Saige McVea
8fb5b5fd0e
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
...
am: ba7a4751a0
2017-04-13 19:18:29 +00:00
Saige McVea
ba7a4751a0
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
2017-04-13 19:07:33 +00:00
Hyunyoung Song
73f47ff12b
Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev am: 8399697520
...
am: 4b9f884fd2
2017-04-13 18:50:45 +00:00
Daniel Nishi
f6e6991965
Merge "Add a movies & tv apps category to storage settings." into oc-dev
...
am: c365a8735c
2017-04-13 18:45:04 +00: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
Hyunyoung Song
4b9f884fd2
Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev
...
am: 8399697520
2017-04-13 18:38:38 +00:00
Hyunyoung Song
8399697520
Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev
2017-04-13 18:11:50 +00:00
Lei Yu
15ae65ac55
Merge "Update Summary for Battery Optimization" into oc-dev am: d29cb7e7ea
...
am: d03025897d
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
2017-04-13 18:04:21 +00:00
Lei Yu
d03025897d
Merge "Update Summary for Battery Optimization" into oc-dev
...
am: d29cb7e7ea
2017-04-13 17:46:34 +00:00
Sundeep Ghuman
c8ec4c0e3f
Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
...
am: 028642e0a9
2017-04-13 17:46:19 +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
Niels Egberts
0e950c0c1e
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev am: dc322cf18b
...
am: 5e0d74d80c
2017-04-13 16:36:28 +00:00
