Commit Graph

1163 Commits

Author SHA1 Message Date
TreeHugger Robot
0a6d61883c Merge "Turn on power accounting in AOSP" into oc-dev 2017-05-25 03:57:29 +00:00
TreeHugger Robot
7731b4244e Merge "Recursively remove preference from screen." into oc-dev 2017-05-25 03:22:51 +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
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
TreeHugger Robot
a935b3c030 Merge "Make "Battery usage" accessible at any time" into oc-dev 2017-05-24 19:19:55 +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
TreeHugger Robot
7226c9f4c4 Merge "Show app battery usage in correct user" into oc-dev 2017-05-24 10:49:12 +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
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.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
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
37f6b7f751 Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev 2017-05-23 06:16:44 +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.

Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
2017-05-22 16:49:55 -07:00
TreeHugger Robot
6f4a6a737d Merge "Remove Language and Input duplicates" into oc-dev 2017-05-19 00:41:04 +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
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
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
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
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
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
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
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
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +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
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Youhan Wang
c426fe6c68 TelephonyMonitor: Replace boolean decision with multiple status.
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
2017-05-17 01:11:53 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
6fe35bb031 Remove Backup and Reset duplicates from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
d6aa9f3454 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 2017-05-16 22:37:22 +00:00
Matthew Fritze
8b0ed39c11 Remove Network Restrictions duplicate from setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
2017-05-16 14:35:19 -07:00
Antony Sargent
f1d544f945 Add a "Use high quality audio" option to Bluetooth A2DP device settings
This change adds a checkbox reading "Use high quality audio: <codec
name>" to the details dialog for A2DP audio bluetooth devices that
support codecs other than the mandatory SBC (eg AAC, LDAC, aptX, etc.).

Bug: 37441685
Test: make RunSettingsRoboTests

Change-Id: I6e5423db11a0cd7fe0b1141dd998e7c936c240f0
2017-05-16 11:02:52 -07:00