Commit Graph

1451 Commits

Author SHA1 Message Date
Alex Kulesza
7ef10c410b Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
am: d69f7cddb6

Change-Id: Id226cd9d3c2ea5bbbbc1dcedfbd273938ac477ef
2017-07-06 14:10:06 +00:00
TreeHugger Robot
6e6d775c1b Merge "Follow framework change." 2017-07-06 02:02:16 +00:00
Alex Kulesza
f30915e860 Make utility methods static. am: 43d4fefb36
am: cc56b1aa04

Change-Id: Ia1ebdff4fcd82f829e90f76bf7d49b0adbc8febc
2017-07-06 01:36:33 +00:00
Alex Kulesza
82dbcd973d Render enhanced battery projection curves.
BatteryInfo now supplies standard linear or enhanced projection curves,
depending on the provider.

Note that the semantics of parsing have changed slightly in that the
value of endTime supplied to onParsingStarted is now the end time of the
historical data and does not include the projection. However, as far as
I can see there is no existing code that depends on the parsing
functionality besides BatteryInfo itself.

Also slightly optimizes the updating behavior of the UsageGraph, since
we are now reconfiguring it multiple times.

Bug: 38400320
Test: make RunSettingsRoboTests, manual on device
Change-Id: Ieff26d31356b34bb38e49f54f979fd80549864b2
2017-07-05 18:56:02 -04:00
Alex Kulesza
43d4fefb36 Make utility methods static.
BatteryUtils.convertUsToMs and .convertMsToUs should be static, and now
they are.

Bug: 63347148
Test: make RunSettingsRoboTests
Change-Id: If652e2d3e1260df9a933805d7da670fbb26b2c25
2017-07-05 18:53:22 -04:00
Matthew Fritze
bfe82cab89 Add util method to get battery stats
Bug:62271803
Test: make RunSettingsRoboTests
Change-Id: I91089c24c7cd5f7329be052c50859e049e70e9b1
2017-07-05 14:54:20 -07:00
jackqdyulei
e0fa4afc71 Merge "Update the method about foreground time." into oc-dr1-dev am: 96e774b7d7
am: b067dea683

Change-Id: I3ef03ee20157e41228ebe4656109abf055a20ec1
2017-07-05 20:43:58 +00:00
TreeHugger Robot
96e774b7d7 Merge "Update the method about foreground time." into oc-dr1-dev 2017-07-05 20:38:52 +00:00
jackqdyulei
43cbee6914 Update the method about foreground time.
For now it uses MIN(STATE_TOP_TIME, FOREGROUND_ACTIVITY_TIME) and this
method is used in both display and screen smearing.

Bug: 63080621
Test: RunSettingsRoboTests
Change-Id: I2ca3109697aa66fae67d8b2f4f10c4d08bb99d59
2017-06-30 16:18:29 -07:00
Salvador Martinez
11a5b9bd4d Merge "Add BatteryInfo logging to settings" into oc-dr1-dev am: 9a3b115cc8
am: 97642af54d

Change-Id: Id4f7032e735067ab9a81476e83003c942eb4f826
2017-06-30 22:16:47 +00:00
Salvador Martinez
cc7c9603db Add BatteryInfo logging to settings
This Cl adds a few log statements to BatteryInfo to try
and determine what the bottleneck in the Battery Settings
Advanced page could be.

Test: robotests still pass
Bug: 62959645
Change-Id: I1ff712d97bc8be78873c63e187edbffa8e10cd21
2017-06-29 16:53:27 -07:00
jackqdyulei
82b7f4ae04 Merge "Change the type of "hours" from long to double" into oc-dr1-dev am: 1498e86530
am: 595def292b

Change-Id: I7a84119fc64b37c8d6ed32ee05e644f9f860a62e
2017-06-29 18:46:28 +00:00
TreeHugger Robot
1498e86530 Merge "Change the type of "hours" from long to double" into oc-dr1-dev 2017-06-29 18:38:39 +00:00
Dianne Hackborn
a8b6890b83 Follow framework change.
Test: manual
Change-Id: I5a45cf67179f330e56ef2e69ab49e82337430282
2017-06-28 23:27:05 -07:00
jackqdyulei
0e852e4113 Merge "Add metric action log for anomaly action" into oc-dr1-dev am: 43afb664e6
am: b58333f46e

Change-Id: If798eac93947126cbdee7c02ee69a792d3032d18
2017-06-29 01:19:16 +00:00
TreeHugger Robot
43afb664e6 Merge "Add metric action log for anomaly action" into oc-dr1-dev 2017-06-29 01:10:42 +00:00
jackqdyulei
985aa11e1a Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a111
am: 9d57855c96

Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
2017-06-29 00:53:14 +00:00
TreeHugger Robot
33c9b7a111 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-29 00:43:09 +00:00
jackqdyulei
8213f102dc Change the type of "hours" from long to double
So we won't have the rounding issue here.

Bug: 63112264
Test: RunSettingsRoboTests
Change-Id: I85b3525781074294964a956dbe76f3b55f65704d
2017-06-28 16:20:34 -07:00
jackqdyulei
ac29684b14 Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
2017-06-28 15:35:54 -07:00
jackqdyulei
f43f359242 Merge "Hide the IDLE in "app list"" into oc-dr1-dev am: 9a30ceab83
am: 881b581e0a

Change-Id: I1a63208cc637be0f9f5ab1e4171b59e498d381ee
2017-06-28 19:48:46 +00:00
TreeHugger Robot
9a30ceab83 Merge "Hide the IDLE in "app list"" into oc-dr1-dev 2017-06-28 19:38:20 +00:00
jackqdyulei
85e25e34fd Fix the getForegroundActivityTotalTimeMs
The parameter in timer should be microseconds, not milliseconds

Bug: 63073847
Test: RunSettingsRoboTests
Change-Id: I5e451aee9eb30815fbefe12c0bfdc85dff884b8e
2017-06-28 12:33:20 -07:00
Lei Yu
db62b52119 Merge "Add location check action for bt anomaly" into oc-dr1-dev am: a6b24388fc
am: 91dbfc6ee9

Change-Id: Ib7f5560b4ef44cb14bcf5e3633b09d179816b221
2017-06-28 18:13:20 +00:00
jackqdyulei
c67694686f Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00
am: cbdaa2b56a

Change-Id: I1c260f3d1d089ae46ddba08dfc83063085ecbe42
2017-06-28 18:01:17 +00:00
Lei Yu
95a0bd4ca2 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7
am: d3f035af0a

Change-Id: If1a3d3b931130efa18014538bc95c2d9ac41d410
2017-06-28 17:57:46 +00:00
Lei Yu
a6b24388fc Merge "Add location check action for bt anomaly" into oc-dr1-dev 2017-06-28 17:54:59 +00:00
TreeHugger Robot
d6df3b3d00 Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev 2017-06-28 17:53:30 +00:00
Lei Yu
451b7edfd7 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-28 17:49:36 +00:00
jackqdyulei
051fb19dd4 Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev am: 7ea8ecdae1
am: fc55a3cef1

Change-Id: I7d23a1bab37417064a1ffc358f9856d711426c19
2017-06-28 17:20:04 +00:00
TreeHugger Robot
7ea8ecdae1 Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev 2017-06-28 17:08:46 +00:00
jackqdyulei
10fa63e62c Hide the IDLE in "app list"
Also don't smear it.

Bug: 62423075
Test: RunSettingsRoboTests
Change-Id: I74072f9dde0dcf7b9a4abb05b86fe2102b618d6a
2017-06-27 17:31:09 -07:00
jackqdyulei
118e2baabe Fix the getForegroundActivityTotalTimeMs
It should return milliseconds, not microseconds time

Bug: 63073847
Test: RunSettingsRoboTests
Change-Id: Ib7ddb947646062fc50a40d300829389e0ac401ee
2017-06-27 16:49:14 -07:00
jackqdyulei
c14daa2370 Add location check action for bt anomaly
This cl adds action to turn off location permission for both
ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION by using API
in RuntimePermissionPresenter

Bug: 36921532
Test: runtest -x LocationCheckActionTest

Change-Id: Ibe1e2908bd745a137d92a70a8432e9f866c1be61
2017-06-27 16:21:50 -07:00
jackqdyulei
13e3ab28ab Hide the summary for app in PowerUsageAdvanced
Bug: 62032053
Test: RunSettingsRoboTests
Change-Id: I83fdd20ef040d102b5d5210a10a810c119f5cf44
2017-06-27 13:49:17 -07:00
jackqdyulei
19648756cb Add quickUpdate method to BatteryHeaderPrefCtrl
This cl adds a method called quickUpdateHeaderPreference, which will
update the following items immediately without waiting for the
BatteryInfo:
1. Battery level
2. Battery charging status(whether to show lighting bolt)
3. Clear the charging summary

Note: this cl doesn't optimize the BatteryInfo loading time.

This cl also rename "TimeText" to "BatteryPercentText" because in
new UI that textview is used to display battery percentage.

Bug: 63029231
Test: RunSettingsRoboTests
Change-Id: I8cc886b35e937d73b46e47e303ff0994ccdcb61c
2017-06-27 13:35:41 -07:00
jackqdyulei
6b7ff12008 Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339
am: e9d1f6f1ae

Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a
2017-06-27 18:46:14 +00:00
jackqdyulei
8ce27bc37c resolve merge conflicts of 758b2d4ae6 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53
2017-06-26 18:30:40 -07:00
TreeHugger Robot
1eb2f15339 Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev 2017-06-26 20:22:27 +00:00
TreeHugger Robot
da45ba8c9e Merge "Hide misc in battery settings" into oc-dr1-dev 2017-06-26 19:52:55 +00:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
jackqdyulei
d856294bf1 Hide misc in battery settings
Hide it in any condition:
1. both in app usage list and device usage list
2. in all targets(i.e. user, userdebug..)

Bug: 62422405
Test: RunSettingsRoboTests
Change-Id: I36bd043942ce7e2353163868bf6d86f422f8e7ee
2017-06-26 10:36:05 -07:00
TreeHugger Robot
74a350f9c9 Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev 2017-06-23 23:44:49 +00:00
Andrew Sapperstein
466a3f6faa Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
Instead, this decision is being handled via AnomalyDetectionPolicy.

Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes: 62871629
Test: robotests
2017-06-23 14:32:22 -07:00
TreeHugger Robot
9463219048 Merge "Change the method to get foreground time." into oc-dr1-dev 2017-06-23 21:28:34 +00:00
jackqdyulei
543c1f2cf5 Update the chargeLabel when battery level is full
Before this cl, it will show "100% - charging", which doesn't make
sense. This cl removes "- charging", and only show "100%" in this
case

Bug: 62559153
Test: RunSettingsRoboTests
Change-Id: Id124fe4098e21b4a69c4a7d3d522fa227faab65d
2017-06-23 14:04:45 -07:00
jackqdyulei
3d93fc16f4 Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);

Bug: 62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
2017-06-23 11:02:54 -07:00
Salvador Martinez
cb9c53dd7c Fix BatteryInfo using enhanced estimate for charge time
Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.

Test: robotest
Bug: 62738028
Bug: 62873396
Bug: 62784575
Bug: 62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410
2017-06-22 09:42:36 -07:00
Lei Yu
2e34b94817 Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev 2017-06-21 17:44:44 +00:00
Salvador Martinez
94d0a9c554 Merge "Add info string to advanced battery usage page" into oc-dr1-dev 2017-06-21 17:02:32 +00:00