Matthew Fritze
1dd31158a8
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am: ae0886c9f7
...
am: 934a04509f
Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
2017-05-24 17:18:58 +00:00
Matthew Fritze
934a04509f
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
...
am: ae0886c9f7
Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
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
47a7d102c6
Merge "Show app battery usage in correct user" into oc-dev am: 7226c9f4c4
...
am: f7c007b2c1
-s ours
Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766
2017-05-24 10:56:22 +00:00
Tony Mak
f7c007b2c1
Merge "Show app battery usage in correct user" into oc-dev
...
am: 7226c9f4c4
Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
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
TreeHugger Robot
b11845096a
Merge "Update Settings search result unique ids"
2017-05-24 04:48:45 +00:00
jackqdyulei
acabf61592
Merge "Split loading process for battery header" into oc-dev am: 987ee5338a
...
am: c0351e0243
-s ours
Change-Id: Ia38ba8d7710511d740d4427674dd9f8f1a917abf
2017-05-24 01:40:32 +00:00
jackqdyulei
c0351e0243
Merge "Split loading process for battery header" into oc-dev
...
am: 987ee5338a
Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
2017-05-24 01:33:01 +00:00
TreeHugger Robot
2cd55c1255
Merge "Misc fixes to search and UI."
2017-05-24 01:25:16 +00:00
TreeHugger Robot
987ee5338a
Merge "Split loading process for battery header" into oc-dev
2017-05-24 01:22:25 +00:00
jackqdyulei
07894014d5
Merge "Update the strings for "show all apps"" into oc-dev am: 4e0f69c10c
...
am: 6870de6772
Change-Id: I184acec76978463b3d62a6eedadd456ee6fa7a89
2017-05-24 01:01:41 +00:00
jackqdyulei
6870de6772
Merge "Update the strings for "show all apps"" into oc-dev
...
am: 4e0f69c10c
Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
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
jackqdyulei
7932484fa9
Sort app list after smeared on screen
...
Then we could make sure the app list is sorted
Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-23 17:36:47 -07:00
Suprabh Shukla
21bb9b8c4a
Revert "Adding SecureTouchListener to DeviceAdminAdd"
...
This reverts commit c1f10cb9c6
.
Bug: 35056974,
38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
2017-05-24 00:26:05 +00:00
Bill Yi
e820b52789
Merge "Import translations. DO NOT MERGE" into oc-dev am: 20748da300
-s ours
...
am: d327ad395b
-s ours
Change-Id: I2b8b6ab846ae003a25695289b448dce7a2374bbe
2017-05-24 00:25:46 +00:00
Bill Yi
d327ad395b
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 20748da300
-s ours
Change-Id: Ife6fcaa53d906080248b0cb63e8a32ae3a373793
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
TreeHugger Robot
5a1af58fa0
Merge "Center icons in Settings homepage and search result page."
2017-05-23 23:29:27 +00:00
Lei Yu
bce1ef6a00
Merge "Make "Battery usage" accessible at any time"
2017-05-23 23:24:33 +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
Lei Yu
cceeac9ae8
Merge "Split loading process for battery header"
2017-05-23 23:20:56 +00: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
6efea1e624
Update Settings search result unique ids
...
- SearchResult stableIds are now DocIds from the database
- DocIds are data reference key's hash, when the key is not
empty or null
- Otherwise, DocIds are a hashcode from a set of fields.
Change-Id: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Fixes: 37327194
Test: make RunSettingsRoboTest
2017-05-23 15:38:29 -07:00
TreeHugger Robot
b96b6309b4
Merge "Update intent priority for AdvancedAppsActivity."
2017-05-23 22:38:22 +00:00
Matthew Fritze
7f2d779e15
Merge "Remove duplicates in Security Settings" into oc-dev am: 96a8dffafb
...
am: c9f9961d8d
-s ours
Change-Id: Ia3d2431248eb95bcea9f1b95602e3ba6a2ef0171
2017-05-23 22:27:01 +00:00
Lei Yu
c29df373bc
Merge "Add flag for wakeup alarm"
2017-05-23 22:22:23 +00:00
Matthew Fritze
c9f9961d8d
Merge "Remove duplicates in Security Settings" into oc-dev
...
am: 96a8dffafb
Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
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
.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
2017-05-23 22:04:58 +00:00
Bill Yi
c621a59c89
Import translations. DO NOT MERGE
...
Change-Id: I406d8bccbdbe16ecc32fbc0f1d8092167d6e957d
Auto-generated-cl: translation import
2017-05-23 14:58:55 -07:00
Fan Zhang
82be5f0c3f
Misc fixes to search and UI.
...
- Use prefContext to create preference.
- rename "Gestures" to "Gesture shortcuts"
- Add search keyword to individual gesture settings so when search
"gesture" they also show up.
- call super() for all getNonIndexableKeys() in search provider
Fix: 38327387
Fix: 36621897
Fix: 36685646
Test: make RunSettingsRoboTests
Change-Id: Ia5ddfeae08cb27c278dfb8d2376594e21d8f283c
2017-05-23 14:55:23 -07:00
Fan Zhang
1c4dcdc30b
Center icons in Settings homepage and search result page.
...
Change-Id: I1846439bfa6c22c36a1574c759b32b00a02f9c8a
Fix: 38137170
Test: visual
2017-05-23 14:45:21 -07:00
Felipe Leme
f51539110a
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev am: 3cf690e906
...
am: 150fa397fc
Change-Id: Ibbc7d59b6db0f1b991266f5e41f8daf79f71e6ca
2017-05-23 21:04:55 +00:00
Felipe Leme
150fa397fc
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
...
am: 3cf690e906
Change-Id: Ia76b7b27c3697645b58ee705733211b85a4dca40
2017-05-23 20:57:34 +00:00
Matthew Fritze
2078bc2358
Remove search2 package and put everything into search
...
Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes: 38502743
Test: make RunSettingsRoboTests
2017-05-23 13:57:28 -07:00
TreeHugger Robot
3cf690e906
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
2017-05-23 20:44:10 +00:00
jackqdyulei
fa4939bbc9
Add flag for wakeup alarm
...
Also hook up it to WakeupAlarmAnomalyDetector
Bug: 38233931
Test: RunSettingsRoboTests
Change-Id: Iceae37dcd2e6a6f1a044fa36efb416f11703c431
2017-05-23 13:34:17 -07:00
jackqdyulei
2a95a63466
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
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
2017-05-23 13:30:15 -07:00
jackqdyulei
605dbc66be
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
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
2017-05-23 13:22:42 -07:00
TreeHugger Robot
45727458f9
Merge "Remove duplicates in Security Settings"
2017-05-23 19:17:28 +00:00
TreeHugger Robot
b53938ff29
Merge "Add summary text to Apps & notifications -> Notifications"
2017-05-23 18:48:52 +00:00
Doris Ling
3f5a1d15b4
Update intent priority for AdvancedAppsActivity.
...
On Apps & notifications screen, Default apps and Apps permissions
have the same prefence order, and hence they are displayed by the
ordering of the preference title. Explicitly move Default app below
App permissions.
Change-Id: Ia3515f65bcb6ac1704dc15127adc3296e50369ef
Fix: 37975409
Test: manual
2017-05-23 11:26:59 -07:00
TreeHugger Robot
ef949e39dc
Merge "Hook up the anomaly policy to wakelockanomaly"
2017-05-23 18:12:20 +00:00
TreeHugger Robot
4d815d93ad
Merge "Add wakeup alarm anomaly detector"
2017-05-23 18:08:10 +00:00
Daniel Nishi
ec5e28ae9b
Merge "Fix storage summary background colors." into oc-dev am: 8b8f27cd06
...
am: 4525f9387a
Change-Id: I8a30afbf999318fd7dabaf7d15ce38f99168353b
2017-05-23 17:51:17 +00:00