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
jackqdyulei
2b923ce44f
Smear screen power usage based on activity time.
...
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
2017-05-17 18:06:47 -07:00
Fan Zhang
2b030aeb65
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
2017-05-18 01:05:39 +00:00
Fan Zhang
3970916cf1
Merge "Fix robolectric test failure" into oc-dev
...
am: 2545bcaa74
2017-05-18 01:01:12 +00:00
Fan Zhang
2545bcaa74
Merge "Fix robolectric test failure" into oc-dev
2017-05-18 00:41:18 +00:00
Fan Zhang
c754f59fb0
Fix bug where accounts are duplicated in user&account list.
...
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.
- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.
Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix: 34035653
Test: make RunSettingsRoboTests
2017-05-17 23:50:30 +00:00
Youhan Wang
c6b1845d0f
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
...
am: 350ba4a4c3
2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
2017-05-17 23:38:08 +00:00
Fan Zhang
28dcdb7c3b
Fix robolectric test failure
...
Default UserManager caches instance across entire test suite, so
test becomes flakey depending on the order they are run. Using a
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.
Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix: 38393235
Test: make RunSettingsRoboTests
2017-05-17 22:46:27 +00:00
jackqdyulei
7548f1fa77
Add screen usage string for battery settings
...
In advanced battery page we still use "Used for"
Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5
2017-05-17 13:14:45 -07:00
Antony Sargent
3afb6616c6
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
...
am: c439202da9
2017-05-17 19:12:43 +00:00
TreeHugger Robot
c439202da9
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838
Merge "Remove duplicates from sound settings" into oc-dev
...
am: 3abeba07d3
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
...
am: 4bd0f411ce
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3
Merge "Remove duplicates from sound settings" into oc-dev
2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
2017-05-17 18:28:35 +00:00
Matthew Fritze
d53409356d
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
...
am: 09dbc8043f
2017-05-17 17:37:51 +00:00
jackqdyulei
6c9dc0b1ca
Show wifi and bluetooth item in battery settings
...
Change-Id: Icc1824758908b14ad895dcc28a63a5d9c685b490
Fix: 38328856
Fix: 38328641
Test: RunSettingsRoboTests
2017-05-17 10:29:55 -07:00
TreeHugger Robot
09dbc8043f
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
2017-05-17 17:27:57 +00:00
Matthew Fritze
70db53a8d5
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
...
am: 915f0cea5b
2017-05-17 17:26:07 +00:00
TreeHugger Robot
915f0cea5b
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
2017-05-17 17:17:14 +00:00
Matthew Fritze
79cfaa7b91
Merge "Remove default app duplicates in search" into oc-dev
...
am: 0c55014b88
2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
...
am: 564b965ccc
2017-05-17 17:13:46 +00:00
TreeHugger Robot
0c55014b88
Merge "Remove default app duplicates in search" into oc-dev
2017-05-17 17:08:12 +00:00
TreeHugger Robot
564b965ccc
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
2017-05-17 17:06:18 +00:00
Matthew Fritze
f8b8ecebea
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
...
am: bcb2565e05
2017-05-17 04:46:15 +00:00
