Fan Zhang
e8e23081fa
Merge "Show setting for work profile lock screen notification" into oc-dev
...
am: 5bb87f9f34
2017-05-25 23:16:54 +00:00
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
Lei Yu
9e56dd44cd
Merge "Add NPE check for refreshUi" into oc-dev
...
am: 1a8c2dd899
2017-05-25 20:07:20 +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
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
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
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
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
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
TreeHugger Robot
96a8dffafb
Merge "Remove duplicates in Security Settings" into oc-dev
2017-05-23 22:13:38 +00:00
Matthew Fritze
c1e9f8787f
Revert "Revert "Replace dynamic summary text for SettingPref""
...
This reverts commit 8061aaef62
2017-05-23 22:04:58 +00: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
Tony Mak
764e52c8cf
Show app battery usage in correct user
...
Test: m -j RunSettingsRoboTests
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925
Fix: 38447829
2017-05-23 12:24:04 +00:00
Lei Yu
996adfeb29
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
...
am: 37f6b7f751
2017-05-23 06:21:32 +00:00
Lei Yu
37f6b7f751
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
2017-05-23 06:16:44 +00:00
Lei Yu
603fba8afe
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
...
am: 161571617b
2017-05-23 01:56:48 +00:00
TreeHugger Robot
161571617b
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
2017-05-23 01:49:23 +00:00
jackqdyulei
013d3f6342
Use BatteryStatsLoader in InstalledAppDetails
...
InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.
Bug: 38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd
2017-05-22 17:39:19 -07:00
Lei Yu
78684dc049
Revert "Add animation for battery asyncLoader."
...
This reverts commit a3c528f64d
2017-05-22 16:49:55 -07:00
Matthew Fritze
5569e3a33f
Merge "Remove Language and Input duplicates" into oc-dev
...
am: 6f4a6a737d
2017-05-19 00:49:41 +00:00
TreeHugger Robot
6f4a6a737d
Merge "Remove Language and Input duplicates" into oc-dev
2017-05-19 00:41:04 +00:00
jackqdyulei
972763ee50
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
...
am: 21d2403c67
2017-05-18 19:26:20 +00:00
jackqdyulei
3ab2ca5cc9
Merge "Add screen usage string for battery settings" into oc-dev
...
am: 28cf04d994
2017-05-18 19:25:57 +00:00
TreeHugger Robot
21d2403c67
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
2017-05-18 19:13:35 +00:00
TreeHugger Robot
28cf04d994
Merge "Add screen usage string for battery settings" into oc-dev
2017-05-18 19:10:16 +00:00
Matthew Fritze
b97a1bffa8
Remove Language and Input duplicates
...
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.
Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 17:36:59 +00:00
Lei Yu
d85bdebe0e
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
am: 67e38774ce
2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
* changes:
Drop the misc and not smear it.
Smear screen power usage based on activity time.
2017-05-18 17:00:27 +00:00
jackqdyulei
7d7080ab64
Drop the misc and not smear it.
...
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
...
am: 2b030aeb65
2017-05-18 01:11:00 +00:00
