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
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
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
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
Felipe Leme
e78e851fff
Refactored ConfirmationDialogFragment to use default construcutor.
...
Test: manual verification
Test: make RunSettingsRoboTests -j90
Fixes: 38397850
Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
2017-05-23 09:36:34 -07:00
Geoffrey Pitsch
984dad4ac6
Merge "Developer setting to enable notification channel warnings" into oc-dev
...
am: 77bb0aaf96
2017-05-23 15:24:09 +00:00
TreeHugger Robot
77bb0aaf96
Merge "Developer setting to enable notification channel warnings" into oc-dev
2017-05-23 15:18:13 +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
Kevin Chyn
35fb3302d7
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
...
am: 32ad1c0db4
2017-05-22 22:52:33 +00:00
TreeHugger Robot
32ad1c0db4
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
2017-05-22 22:40:42 +00:00
Kevin Chyn
a1b3ec5963
Queue events if enrollment sidecar listener is null
...
Fixes: 38102355
Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762
2017-05-22 12:10:03 -07:00
Geoffrey Pitsch
e18fd90524
Developer setting to enable notification channel warnings
...
Defaults to enabled for debuggable builds
Fixes: 37945054
Fixes: 38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0
2017-05-22 11:29:18 -04:00
Hemant Gupta
7eb5647656
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
...
am: 860b608e41
2017-05-20 01:37:14 +00:00
