jackqdyulei
9a091aaac0
Merge "Sort app list after smeared on screen" into oc-dev
...
am: f68bb7e75c
2017-05-25 23:16:24 +00:00
TreeHugger Robot
5bb87f9f34
Merge "Show setting for work profile lock screen notification" into oc-dev
2017-05-25 22:41:07 +00:00
TreeHugger Robot
f68bb7e75c
Merge "Sort app list after smeared on screen" into oc-dev
2017-05-25 22:41:00 +00:00
Daniel Nishi
5d0888be75
Fix an override filter bug.
...
The override filter for storage to ensure that we filter by UUID and
user id was designed as an override filter. This worked as long as there
never was any other filters which could be used out of Storage Settings.
It turns out the instant apps filter applies here.
As a result, I've moved these filters into being "composite filters"
which are composed with the primary filter instead of overriding the
primary filter.
Fixes: 35245772
Test: Settings Robotests... but as for the composing part it is
b/34768986
Change-Id: I6f5acb909568ab02e81187c09fdda9533d635781
2017-05-25 14:23:29 -07:00
Alison Cichowlas
a974b8c595
Merge "Update notification settings to match Notification Dot branding." into oc-dev
...
am: ed8b39fe60
2017-05-25 20:09:22 +00:00
Lei Yu
9e56dd44cd
Merge "Add NPE check for refreshUi" into oc-dev
...
am: 1a8c2dd899
2017-05-25 20:07:20 +00:00
TreeHugger Robot
ed8b39fe60
Merge "Update notification settings to match Notification Dot branding." into oc-dev
2017-05-25 20:06:28 +00:00
Lei Yu
1a8c2dd899
Merge "Add NPE check for refreshUi" into oc-dev
2017-05-25 19:51:14 +00:00
Fan Zhang
879f079e04
Show setting for work profile lock screen notification
...
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Julia Reynolds
3a77e1d4a0
Allow some system channels to be blocked
...
Test: manual
Bug: 38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0
2017-05-25 14:26:58 -04:00
jackqdyulei
f984b1e1ae
Sort app list after smeared on screen
...
Then we could make sure the app list is sorted
Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-25 10:09:05 -07:00
Alison Cichowlas
5fe7b7985c
Update notification settings to match Notification Dot branding.
...
Bug: 38387970
Test: string changes only, manually verified
Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
2017-05-25 09:38:14 -04:00
jackqdyulei
db42779cf1
Merge "Turn on power accounting in AOSP" into oc-dev
...
am: 0a6d61883c
2017-05-25 04:01:46 +00:00
TreeHugger Robot
0a6d61883c
Merge "Turn on power accounting in AOSP" into oc-dev
2017-05-25 03:57:29 +00:00
Fan Zhang
4472d8af83
Merge "Recursively remove preference from screen." into oc-dev
...
am: 7731b4244e
2017-05-25 03:25:43 +00:00
TreeHugger Robot
7731b4244e
Merge "Recursively remove preference from screen." into oc-dev
2017-05-25 03:22:51 +00:00
Doris Ling
be520a5f34
Merge "Listener to tether state change on Network & internet page." into oc-dev
...
am: 1dead24890
2017-05-25 02:34:26 +00:00
TreeHugger Robot
1dead24890
Merge "Listener to tether state change on Network & internet page." into oc-dev
2017-05-25 02:25:56 +00:00
jackqdyulei
0b83954f1c
Add NPE check for refreshUi
...
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.
Bug: 37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
2017-05-24 17:06:20 -07:00
Doris Ling
5bf5c8ac04
Listener to tether state change on Network & internet page.
...
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.
Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix: 38452559
Test: make RunSettingsRoboTests
2017-05-24 16:51:14 -07:00
Fan Zhang
a6f821c015
Tether screen cleanup
...
am: 20ae31e87c
2017-05-24 22:48:55 +00:00
Fan Zhang
e84407f5c3
Recursively remove preference from screen.
...
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.
Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix: 38507066
Test: make RunSettingsRoboTests
2017-05-24 21:21:00 +00:00
Fan Zhang
20ae31e87c
Tether screen cleanup
...
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference
Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea
2017-05-24 19:59:15 +00:00
jackqdyulei
4516644b46
Merge "Make "Battery usage" accessible at any time" into oc-dev
...
am: a935b3c030
2017-05-24 19:26:16 +00:00
TreeHugger Robot
a935b3c030
Merge "Make "Battery usage" accessible at any time" into oc-dev
2017-05-24 19:19:55 +00:00
Matthew Fritze
934a04509f
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
...
am: ae0886c9f7
2017-05-24 17:16:01 +00:00
TreeHugger Robot
ae0886c9f7
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
2017-05-24 17:12:35 +00:00
jackqdyulei
58406203e2
Make "Battery usage" accessible at any time
...
Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.
Bug: 38497822
Test: RunSettingsRoboTests
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
2017-05-24 10:12:13 -07:00
Tony Mak
f7c007b2c1
Merge "Show app battery usage in correct user" into oc-dev
...
am: 7226c9f4c4
2017-05-24 10:53:25 +00:00
TreeHugger Robot
7226c9f4c4
Merge "Show app battery usage in correct user" into oc-dev
2017-05-24 10:49:12 +00:00
jackqdyulei
c0351e0243
Merge "Split loading process for battery header" into oc-dev
...
am: 987ee5338a
2017-05-24 01:33:01 +00:00
TreeHugger Robot
987ee5338a
Merge "Split loading process for battery header" into oc-dev
2017-05-24 01:22:25 +00:00
jackqdyulei
6870de6772
Merge "Update the strings for "show all apps"" into oc-dev
...
am: 4e0f69c10c
2017-05-24 00:54:40 +00:00
TreeHugger Robot
4e0f69c10c
Merge "Update the strings for "show all apps"" into oc-dev
2017-05-24 00:49:50 +00:00
Suprabh Shukla
21bb9b8c4a
Revert "Adding SecureTouchListener to DeviceAdminAdd"
...
This reverts commit c1f10cb9c6
2017-05-24 00:26:05 +00:00
Bill Yi
d327ad395b
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 20748da300
2017-05-24 00:19:39 +00:00
TreeHugger Robot
20748da300
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-24 00:10:59 +00:00
jackqdyulei
4a7c8d7125
Split loading process for battery header
...
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug: 38349587
Test: RunSettingsRoboTests
Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
2017-05-23 16:21:33 -07:00
jackqdyulei
1d51b3cc15
Turn on power accounting in AOSP
...
Bug: 38328724
Test: RunSettingsRoboTests
Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742
2017-05-23 16:05:12 -07:00
Matthew Fritze
c9f9961d8d
Merge "Remove duplicates in Security Settings" into oc-dev
...
am: 96a8dffafb
2017-05-23 22:21:18 +00:00
jackqdyulei
3b1a964629
Update the strings for "show all apps"
...
Bug: 38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
2017-05-23 15:17:41 -07:00
TreeHugger Robot
96a8dffafb
Merge "Remove duplicates in Security Settings" into oc-dev
2017-05-23 22:13:38 +00:00
Bill Yi
e9b047e305
Import translations. DO NOT MERGE
...
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
2017-05-23 15:05:15 -07:00
Matthew Fritze
c1e9f8787f
Revert "Revert "Replace dynamic summary text for SettingPref""
...
This reverts commit 8061aaef62
2017-05-23 22:04:58 +00:00
Felipe Leme
150fa397fc
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
...
am: 3cf690e906
2017-05-23 20:57:34 +00:00
TreeHugger Robot
3cf690e906
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
2017-05-23 20:44:10 +00:00
Bookatz
0311f24bb0
Add unoptimized ble scans to batterystats.
...
Bug: 38461344
Test: see main cl in topic
Change-Id: I426011e1954ef8ae7fae595cbcbe986280b7638f
2017-05-23 13:24:01 -07:00
Matthew Fritze
3a50f5c290
Remove duplicates in Security Settings
...
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
2017-05-23 17:44:35 +00:00
Daniel Nishi
4525f9387a
Merge "Fix storage summary background colors." into oc-dev
...
am: 8b8f27cd06
2017-05-23 17:41:21 +00:00
Daniel Nishi
8b8f27cd06
Merge "Fix storage summary background colors." into oc-dev
2017-05-23 17:35:19 +00:00
