Commit Graph

36992 Commits

Author SHA1 Message Date
Lei Yu
cceeac9ae8 Merge "Split loading process for battery header" 2017-05-23 23:20:56 +00:00
Daniel Nishi
9b868d95ea Use the config default days to retain.
This avoids using the static value to determine the default number of
days to retain.

Bug: 38499322
Test: SettingsLib robotests
Change-Id: Ia0f569407a5a2a85a173e90c22f6b413776564db
2017-05-23 16:05:15 -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
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
Bookatz
0311f24bb0 Add unoptimized ble scans to batterystats.
Bug: 38461344
Test: see main cl in topic
Change-Id: I426011e1954ef8ae7fae595cbcbe986280b7638f
2017-05-23 13:24:01 -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
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
Matthew Fritze
2e34a64a55 Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps

Merge for ag/2247508

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
2017-05-23 10:43:14 -07:00
Daniel Nishi
4525f9387a Merge "Fix storage summary background colors." into oc-dev
am: 8b8f27cd06

Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
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
Philip Quinn
6416ad2b40 Add metrics category for the assist gesture settings.
Bug: 38508651
Test: make RunSettingsRoboTests
Change-Id: Ic334f7608546651381cfb7c94ae1f6d77f4939b6
2017-05-23 10:33:09 -07:00
Doris Ling
929bc614de Add summary text to Apps & notifications -> Notifications
Share the summary provider for Apps & notifications -> Notifications ->
Notifications with Apps & notifications -> Notifications so that the
upper level also shows the corresponding notification summary.

Change-Id: Id6879d9a6b00237781320c18591703b3031c9627
Fix: 36376411
Test: make RunSettingsRoboTests
2017-05-23 10:15:26 -07:00
Charles He
641c9fc23a Make failed ConfirmCredential attempts count towards wipe
Previously, failed ConfirmDeviceCredential attempts only counted towards the
wipe limit if it is used as a separate work challenge.

In this CL, we additionally make these failed attempts count towards the total
failures in the following scenarios:
  1) when unified work challenge is enabled
  2) for the primary user (e.g. when a wipe limit is set by a DO)
  3) for secondary users

Bug: 27238008
Test: manual, by entering wrong credentials multiple times
Test: make SettingsRoboTests
Change-Id: Ie5a099bb3fd46245c13ccf4c8f91c4d935412a4e
2017-05-23 18:04:52 +01:00
jackqdyulei
495de548bd Add wakeup alarm anomaly detector
Wakeup alarm count frequent is calculated by a / b, where
1. a: the total wakeup alarm count since the last full charge
2. b: total time running since last full charge
(include sleeping time)

This cl also has the following changes:
1. Move bunch of methods to BatteryUtils
2. Create type WAKEUP_ALARM
3. Add and update tests

Upcoming cl will make sure we get the threshold from
AnomalyDetectionPolicy

Bug: 36921529
Test: RunSettingsRoboTests
Change-Id: I4f7b85606df68b6057f6c7d3f3be7f9a9a747f1d
2017-05-23 09:49:14 -07:00
jackqdyulei
f6dca8a68d Hook up the anomaly policy to wakelockanomaly
Bug: 38233034
Test: RunSettingsRoboTests
Change-Id: Id8c13480e08f609a1ba9927ba35558f82664904c
2017-05-23 09:43:01 -07: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
4ea6258200 Merge "Developer setting to enable notification channel warnings" into oc-dev am: 77bb0aaf96
am: 984dad4ac6

Change-Id: Ica82b112388bd3f3f0a1e2e0281b8c1036d64934
2017-05-23 15:26:39 +00:00
Geoffrey Pitsch
984dad4ac6 Merge "Developer setting to enable notification channel warnings" into oc-dev
am: 77bb0aaf96

Change-Id: I571de55e0b3d090ec2442e2019b2a460b0185283
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
Tony Mak
5ab93ad700 Show app battery usage in correct user
Test: m -j RunSettingsRoboTests

Fix: 38447829

Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
2017-05-23 10:37:38 +01:00
Lei Yu
6784e41977 Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev am: 37f6b7f751
am: 996adfeb29

Change-Id: I11d0c39a68428637ce12aaffaa2a4f1e49bb716e
2017-05-23 06:23:31 +00:00
Lei Yu
996adfeb29 Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
am: 37f6b7f751

Change-Id: I5b5edc8b88a16c83a77ca584d21279892ebb08bf
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
Salvador Martinez
6976ccecee Merge "Use enhanced estimate battery info when available" 2017-05-23 03:28:32 +00:00
TreeHugger Robot
2f98a110d5 Merge "Log different type of values into different constants" 2017-05-23 03:01:32 +00:00
Lei Yu
60b1d68b16 Merge "Revert "Add animation for battery asyncLoader."" into oc-dev am: 161571617b
am: 603fba8afe  -s ours

Change-Id: I371a760fe5e801bdbbc6c658c8611d922f41b32a
2017-05-23 02:07:17 +00:00