Commit Graph

41 Commits

Author SHA1 Message Date
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Lei Yu
d2b295ba36 Update the battery broadcast receiver.
Add a type for battery receiver, then in callback client know for
which reason it been invoked:
1. battery level change
2. battery saver state change
3. battery plug state change

So in this CL, we won't update battery tip for battery level change,
then battery tip won't be dismissed by itself.

Also note in onResume() we will manually update battery tip. So if
user stay in battery settings page and close the screen, once he opens
it we will still force update everything.

Fixes: 79171742
Test: RunSettingsRoboTests

Change-Id: I997844216fd8267e545d74e0d434de9e338f76a1
2018-05-11 16:02:07 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
jackqdyulei
f51c220e98 Hook up the new page to PowerUsageSummary
Add a menu to point to the new page

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
2018-03-06 10:59:40 -08:00
jackqdyulei
319d534975 Create new PowerUsageAdvanced page
This page contains the graph at the top and app list at the bottom

In this cl, we reused some part of the code in PowerUsageAdvancedLegacy
to construct the graph, and also used controller to construct the app
list(So glad that we extracted it to controller before..)

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I30afbc0327a5186f8280f5e3678330b363e2dc0d
2018-03-06 10:45:44 -08:00
jackqdyulei
5dd5a0424f Change current PowerUsageAdvanced to legacy code
In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
2018-03-06 10:42:53 -08:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
jeffreyhuang
cbfb099a40 Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
2017-12-05 16:43:54 -08:00
jeffreyhuang
a79417487c Move fuelgauge test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I8122a41132821a42c4ec8c5995a1a11833b686cd
2017-11-29 10:57:54 -08:00
jackqdyulei
d65bb52dc8 Don't consider managedProfile in PowerUsageAdvanced
When calculating how many uses exists, we shouldn't count the
managedProfile since this is not the normal user.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ic24e98f8e8696530d534bc9e1d8f675ad6ad5063
2017-10-26 15:08:50 -07:00
jackqdyulei
b963125159 Merge "Hide summary for type system" into oc-mr1-dev am: aadee0997c
am: da9247d645

Change-Id: I440fcbfea0cf934e68737eb5314739e397d80d88
2017-09-28 02:18:59 +00:00
jackqdyulei
0b6a3bc9c4 Hide summary for type system
Bug: 66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6
2017-09-22 13:45:51 -07:00
Maurice Lam
e18902ec67 Update Robolectric to 3.4.2
Bug: 66693279
Test: m RunSettingsRoboTests
      m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
2017-09-22 18:34:00 +00:00
jackqdyulei
28284a52e6 Stop display "Cell network" item for tablet
If device doesn't support MOBILE_DATA, then stop show
"Mobile network standby" in battery advanced page.

Bug: 63252393
Test: RunSettingsRoboTests
Change-Id: Icaf5c0c781c96fa1d4df999c6769c27a84c27446
2017-08-10 13:33:25 -07:00
Salvador Martinez
8ccb5a4698 Fix enhanced estimate discharge text showing while charging
In the PowerUsageAdvanced screen the text showing whether your time
remaining information is enhanced or not should not show when the
device is plugged in. This CL fixes a bug in that logic that would
show the text when it wasn't supposed to.

Test: robotests still pass, manual verification
Bug: 63176050
Change-Id: I33fb31671cd9c29aed20483301e51ae1ded1f1b6
2017-07-14 10:30:29 -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
Salvador Martinez
cbefbc261f Add info string to advanced battery usage page
This CL adds an FYI string under the battery graph to let users
know that their current estimate is coming from the enhanced
estimate provider when it is enabled.

Test: Robotests
Bug: 38399654
Change-Id: If5cd622ef0251a5a483cef870fc2261369e14845
2017-06-20 18:37:49 -07:00
Andrew Sapperstein
9f1e911759 Refactor test runner to use static list of resource paths
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.

Bug: 62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
2017-06-09 09:21:26 -07:00
Antony Sargent
e28dfea13b Set advanced battery usage items as non-selectable
The items in the ListView for the Advanced battery usage screen should
not ripple when touched, since these items don't do anything.

Bug: 38019330
Test: make RunSettingsRoboTests
Change-Id: I987a770f0f146b02bbf947238be7490e8a170feb
2017-06-06 17:12:17 -07:00
TreeHugger Robot
3a1d6db0e7 Merge "Update "Phone idle" subtext" into oc-dev 2017-05-04 01:11:24 +00:00
jackqdyulei
995ca362c9 Update "Phone idle" subtext
Bug: 37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
2017-05-03 15:27:50 -07:00
TreeHugger Robot
4b50e58a1d Merge "Hide subtitle for wifi and bluetooth" into oc-dev 2017-05-03 02:18:53 +00:00
jackqdyulei
f68fbce16e Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.

Bug: 37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
2017-05-02 15:16:19 -07:00
jackqdyulei
a245188a65 Distribute the misc among all the apps
Distribute it in:
1. Battery main page(PowerUsageSummary)
2. Advanced battery page(PowerUsageAdvanced)

Bug: 37487061
Test: RunSettingsRoboTests
Change-Id: Id1810b81a6b380d908bcdc18421530e938578c37
2017-04-25 11:48:24 -07:00
jackqdyulei
f4c1cef322 Add TtsSpan for formatted time.
Talk back will read "Used for 3m" as "Used for 3 meters", but
it will read "Used for 3h 3m" correctly.

This cl add specific Ttsspan if the time only contains "minute"

Bug: 36379530
Test: Run SettingsRoboTests

Change-Id: I033575938cce24221980dddd9d66be4e18804541
2017-04-21 14:42:42 -07:00
TreeHugger Robot
72ca5b0bb2 Merge "Include type service as type system" into oc-dev 2017-04-21 01:45:28 +00:00
TreeHugger Robot
55a3944dbf Merge "Hide User category if only one user in device" into oc-dev 2017-04-18 03:21:55 +00:00
jackqdyulei
47006d7794 Include type service as type system
Bug: 37293081
Test: RunSettingsRoboTests
Change-Id: Id9259a1a516fdf368d41f1b7205a1515d0989aab
2017-04-17 18:05:05 -07:00
jackqdyulei
cdba2e7266 Hide User category if only one user in device
Fix: 37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
2017-04-17 17:58:38 -07:00
jackqdyulei
8648873e91 Don't show Screen as Apps in advanced battery page
Bug: 37293020
Test: RunSettngsRoboTests
Change-Id: I9a6259e1eb3a2d3451b0479bfe20be735825cd64
2017-04-17 12:12:30 -07:00
jackqdyulei
92fceaff22 Hide summary for Cell in PowerUsageAdvanced
1. Add method "shouldHideSummary" to check it
2. Also change method "shouldHide" to "shouldHideCategory",
to distinguish it from shouldHideSummary

Fix: 37293815
Test: RunSettingsRoboTests
Change-Id: I4364d0331f3aac143fad9ebdeab52207f5cb98bf
2017-04-13 16:00:04 -07:00
jackqdyulei
ab5ca9f5cd Remove misc data in battery main page.
The removed types are:
1. DrainType.UNACCOUNTED
2. DrainType.OVERCOUNTED

This cl removes the above types in PowerUsageSummary and
PowerUsageAdvanced

Bug: 36874846
Test: RunSettingsRoboTests
Change-Id: I1807c44a2c0a9c2fa124cdef962a6411ae6830ca
2017-04-06 15:09:57 -07:00
jackqdyulei
f094b87661 Add summary for categories in battery advanced page
If the category only contains one app, show usage time, otherwise
show app with maximum usage.

Also add usage time for apps in battery settings page.

Bug: 35396770
Test: RunSettingsRoboTests
Change-Id: I43fe9c2289535be2c1b95ffded6b52b0ff099589
(cherry picked from commit 3bbaca9c7c)
2017-03-29 20:23:22 +00:00
jackqdyulei
da8d9fc3d0 Make percentage add up to dischargeAmount.
Refine it in PowerUsageAdvanced.

Bug: 35960502
Test: RunSettingsRoboTests
Change-Id: I46b06409102334e5e9eed4e540a27315a503f8b0
2017-03-21 15:18:44 -07:00
jackqdyulei
64af489a6a Add type UNACCOUNTED("miscellaneous") in advanced battery page
This type is equal to DrainType.UNACCOUNTED.

Bug: 35926913
Test: RunSettingsRoboTests
Change-Id: I2be73a5220c6d674593508f2578e7c4f6e111ea9
2017-03-02 15:20:37 -08:00
jackqdyulei
238c1c000b Add batterysipper type check in PowerUsageFeatureProvider
This cl adds isTypeSystem to PowerUsageFeatureProvider and
changes isTypeService. After this cl, the following items will
be moved to advanced battery page:
1. Calendar Storage(Move to System)
2. MediaServer(Move to System)

Create this check in FeatureProvider to make sure this check
is flexible in different cases. Also refactor the PowerUsageSummary
to use same test fragment

Bug: 35629871
Bug: 35628690
Bug: 35317876
Test: RunSettingsRoboTest
Change-Id: I8c083cb2557a7e900aea01e682c13a000bacb7a9
2017-02-27 19:42:22 -08:00
jackqdyulei
acc195fdde Add type service in settings advanced page.
Currently it only includes the gms service

Bug: 35317876
Test: RunSettingsRoboTests
Change-Id: I20a2a9d320efe4aed036552d450f59c89e81584a
2017-02-17 15:17:31 -08:00
jackqdyulei
22dbc106e7 Make the list in advanced battery page sorted by usage.
1. Make the preference dynamically generated in code
2. Make PowerUsageData comparable and add title resource id.

Bug: 34385770
Test: RunSettingsRoboTests
Change-Id: I1b90b4c6cc7107bc146e3554db04cec7641e1cde
2017-02-16 16:22:16 -08:00
jackqdyulei
a224b010b9 Create Advanced battery page
The advanced page shows two major parts, one is the battery usage
graph and the other is battery usage list. In usage list, each item
shows basic info of battery usage of one type(e.g. Apps, System)

Bug: 34385770
Test: RunSettingsRoboTests

Change-Id: I22475a489285787afa775af8d5ae3340eff1eed9
2017-02-06 13:44:59 -08:00