Commit Graph

1451 Commits

Author SHA1 Message Date
timhypeng
c71f996da9 Battery icon is too large
-sync layout from SystemUI

Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
2019-11-14 10:55:54 +08:00
Raff Tsai
1ade809ff9 Filter invalid uid from Battery list
- Normally uid is start from 0. That was a bug in framework during
some time period, and was not reproduced later. We just remove this
kind of invalid item from UI.

Fixes: 141404334
Test: manual
Change-Id: I964a8b8af18ac6a5d8d2dea89722ea466e27e6ad
2019-11-08 08:30:38 +00:00
TreeHugger Robot
d4959ee116 Merge "Execute getting battery info on the parallel executor" 2019-09-27 11:18:39 +00:00
Jason Chiu
86e98bf448 Execute getting battery info on the parallel executor
Getting battery info is time consuming and may block other tasks in the
same background thread.

Executing it on the parallel executor can improve app launch performance.

Bug: 141694556
Test: robotest
Change-Id: I55517e03961929c2b288e230ed474d45915d63fd
2019-09-27 17:33:08 +08:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
Raff Tsai
8291671f97 Fix testcase error and UI refresh issue
Restricted App list can be update in RestrictedAppDetails page and
go back to SmartBatterySettings page without update the App list.
We need to update the list in updateState() again.

Fixes: 140585454
Test: manual, robolectric
Change-Id: I48a197351ffb9b07490f1de7ba1f7417102458a2
2019-09-09 12:00:21 +08:00
Raff Tsai
577240642d Fix Battery usage page refresh issue
restartBatteryStatsLoader made a loader existed in fragment. onStart
will resume the loader. onResume registers mBatteryBroadcastReceiver
will caused the loader activated the second time. We move
restartBatteryStatsLoader to onStart can reduce the loader runs only
once.

Fixes: 140488811
Test: manual
Change-Id: I4cac574ea8e9c07c1a9df48a57fb8140d5687b21
2019-09-05 14:37:21 +08:00
Raff Tsai
8641986401 Prevent UI jank
Move hide preference logic to getAvailabilityStatus, it can remove
the preference before onresume.

Fixes: 140366463
Test: manual, robolectric
Change-Id: Ie11b5357b1e9340b30b8f19eac60c479cdb7687e
2019-09-03 14:16:27 +08:00
TreeHugger Robot
34b1e00ca7 Merge "Fix Battery page animation" 2019-08-29 03:41:25 +00:00
TreeHugger Robot
2e010612ee Merge "Don't allow Settings to change its own standby bucket." 2019-08-26 23:57:35 +00:00
Varun Shah
778d38a551 Don't allow Settings to change its own standby bucket.
When on the "Standby apps" developer options screen, the Settings app
will be greyed out, indicating that its standby bucket cannot be
changed.

Manual Test 1: Go to the "Standby apps" screen in developer options and
observe that the Settings app is greyed out.
Manual Test 2: Turn off "Adaptive Battery" in Settings and then go to
the "Standby apps" screen in developer options - observe that the
Settings app is greyed out.

Bug: 132922935
Test: manual (listed above)
Change-Id: Idb29e6105024feacc270867e46156fc6a0396b01
2019-08-26 14:46:45 -07:00
TreeHugger Robot
8d59885bc2 Merge "Use FooterPreference in xml explicitly" 2019-08-19 14:00:45 +00:00
Raff Tsai
648ada031d Fix Battery page animation
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.

Fixes: 139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
2019-08-19 16:47:53 +08:00
Sunny Shao
d04c885ff9 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the RestrictedAppDetails page.

Fixes: 139641334
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I6a4e56725d88353bde361de1dfff4a2a449c842c
2019-08-19 11:50:06 +08:00
Sunny Shao
513cc9561c Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the SmartBatterySettings page.

Fixes: 139514284
Test: manual test
Change-Id: If9aee92916d02b731bdb71e9c95237e1c3ff7f1d
2019-08-16 17:14:57 +08:00
Sunny Shao
a3961cd6d7 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the PowerUsageSummary page.

Fixes: 139515012
Test: manual test
Change-Id: I29af8ad4df303edeeb511057d53d38c847f0ff21
2019-08-16 16:49:59 +08:00
Raff Tsai
946441ca27 Learn mode link is not in footer text
Use wrong footerPreference key.

Change-Id: Ic88b4bf9cf336474231329aa2154242d3f95b91a
Fix: 139086150
Test: visual
2019-08-09 17:21:18 +08:00
TreeHugger Robot
87ecb5deed Merge "Import RadioButtonPreference from SettingsLib" 2019-08-03 02:52:36 +00:00
Raff Tsai
1ebf80446f Fix arabic language % character in wrong place
info.batteryPercentString is applied language format.
We don't need to format it again in BidiFormatter.

Fixes: 136699046
Test: visual
Change-Id: Ie89823c23fd23bd6a9a97821f3062cad4dfb3709
2019-08-01 18:31:13 +08:00
Raff Tsai
71a37d138b Import RadioButtonPreference from SettingsLib
Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
2019-08-01 07:16:55 +00:00
Raff Tsai
58cd356273 Remove deprecated code
Fixes: 137106225
Test: rebuild
Change-Id: I7c757fc39197d2b6166fc8cbd9ad585ba16a7e2e
2019-07-16 10:35:04 +08:00
Raff Tsai
5fe166075f Remove deprecated code
Fixes: 137106225
Test: rebuild
Change-Id: If978f765fd1f6ec0fded1eb0f7e93e386c5d3163
2019-07-11 11:15:39 +08:00
TreeHugger Robot
2ab371b13a Merge "TODO about BatteryStats.STATS_SINCE deprecation" 2019-07-09 19:41:54 +00:00
Lei Yu
09c60c349f Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
am: a22bf1cd8b

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
2019-05-31 11:10:26 -07:00
Lei Yu
2148c1a207 Merge "Fix issues in battery usage accounting" into qt-dev 2019-05-31 17:17:51 +00:00
Fan Zhang
ec81d6121e Override 2 getSliceUri() instance to return platform slice
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Lei Yu
c89ba29e92 Fix issues in battery usage accounting
1. In High usage dialog, show top apps based on battery usage, not app
time.
2. Refactor the check for hidden system modules into ShouldHideSipper,
however don't smear it, this is also the current logic before this CL.

Bug: 133445008
Test: RunSettingsRoboTests
Change-Id: I851a1c9ef9b79a934ba0501cd96001f2e450bda4
2019-05-29 13:57:04 -07:00
Salvador Martinez
12731cce3d Break infinite refresh loop in battery estimates
There was an infinite loop that could occur in BatterySaverUtils
what was caused by battery saver utils updating the battery estimate
which then told the page to check for an estimate and then it would
repeat from there. This cleans up the logic in that loop slightly
to prevent it from refreshing more than is necessary.

Test: atest BatteryUtilsTest
Bug: 132751712
Change-Id: I918484747ecd9735315570ad608489e0f61d7578
2019-05-17 15:36:55 -07:00
TreeHugger Robot
cbd925bf73 Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev 2019-05-08 21:12:52 +00:00
Salvador Martinez
fb940feebf Clear preferences when dialog acknowledged and increase order
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.

Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
2019-05-08 12:28:43 -07:00
Lei Yu
b47b99ed38 Add null check when restart batteryinfo loader
Even though we unregister contentObserver in onPause and register
in onResume, callback still be called while fragment is detached.

Anyhow add a null check in settings to stop crash

Fixes: 131905853
Test: RunSettingsRoboTests
Change-Id: I8c0c2c04c3b8d942e0c97cf71a7d3e735a24b467
2019-05-08 11:12:55 -07:00
TreeHugger Robot
d8accd6b6a Merge "Update Battery Saver schedule to add order to seekbar" into qt-dev 2019-05-03 23:56:22 +00:00
Salvador Martinez
bd6045bea9 Update Battery Saver schedule to add order to seekbar
If the first time battery saver warning was the one causing
a change in settings global the radio button picker doesn't update
the preferences correctly and would put the seekbar at the top. This
explicitly adds an order to the seekbar so that if it gets updated
for some reason it will show up at the end again.

Test: atest BatterySaverScheduleSettingsTest
Bug: 131434758
Change-Id: Iebab5d176c8fbdaea078e13a71eff7e21408353b
2019-05-03 10:01:34 -07:00
Salvador Martinez
b056b7dec4 Update battery saver footer to have learn more link
This will allow tapping on the Learn More text to take a user to
the support page for battery saver.

Bug: 129010739
Test: atest BatterySaverSettingsTest
Change-Id: Ifb758ea8c608a4051c093b5d1d43f9a039ab1294
2019-05-02 13:08:52 -07:00
Lei Yu
aa625bd06e Fix a crash in battery settings page
Regression from ag/7161923, in this case we should use onResume/onPause
pair. Also sort the method to fit android lifecycle.

Bug: 131615524
Test: RunSettingsRoboTests
Change-Id: I299032bfeb119dac293039917c6673dd4c0ef4e0
2019-04-29 15:43:57 -07:00
Bookatz
6656609549 TODO about BatteryStats.STATS_SINCE deprecation
Test: None. Just a comment.
Change-Id: Ib60034998e1d4a374934842f6f86c04a13760d12
2019-04-29 14:23:31 -07:00
Lei Yu
30991963e4 Merge "Update color filter for battery saver mode" into qt-dev 2019-04-25 21:42:56 +00:00
Lei Yu
eba850e8d9 Update color filter for battery saver mode
Fixes: 129498556
Test: Manual
Change-Id: I57809c77e488b9828bea50d4c4f410d49912cd4b
2019-04-24 13:47:39 -07:00
Salvador Martinez
415f35b670 Update BatteryUtils to update system battery estimate cache
To try and ensure SysUI and Settings don't show different battery
estimates we have settings always push the estimate to the system
cache which will cause the status bar to update as well.

Test: manually trigger battery broadcasts and observe
Bug: 124030091
Change-Id: I07a17ecf2a42c3022673ad2aca438f8d6e81b41f
2019-04-24 10:35:41 -07:00
TreeHugger Robot
fc48118694 Merge "Fix battery robo test" into qt-dev 2019-04-19 23:13:51 +00:00
Lei Yu
2632f45010 Fix battery robo test
Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
2019-04-19 13:41:22 -07:00
Salvador Martinez
6a81e41c7c Update battery stuff to use SettingsLib Estimate class
This will make the upcoming consistency Cl easier to implement.

Test: Robotests still pass
Bug: 124030091
Change-Id: Ief4989e2b5f9b83b5c3b93d17f9f9fa12136f3ee
2019-04-19 17:35:23 +00:00
TreeHugger Robot
77c56714ed Merge "Tint battery fix icon" into qt-dev 2019-04-16 16:25:34 +00:00
Raff Tsai
006582b48e Tint battery fix icon
Fixes: 129492004
Test: manual
Change-Id: I161284619bc47e342d78f1507ae291f7c23ad3ff
2019-04-16 17:05:52 +08:00
Lei Yu
9515a685e3 Merge "Hide app usage time in high usage dialog" into qt-dev 2019-04-15 17:54:39 +00:00
Lei Yu
2f90dd784f Hide app usage time in high usage dialog
Also update strings a little bit

Bug: 112285389
Test: Manual
Change-Id: I5c4f3e2de635eb0b880d2d3d5a1550e1af41d931
2019-04-12 22:39:44 +00:00
TreeHugger Robot
4f988c8b29 Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev 2019-04-11 19:54:32 +00:00
Evan Laird
3e98ff34d0 Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView
ThemedBatteryDrawable will no longer need it due to drawing more
betterer

Test: battery should look the same
Bug: 129014647
Change-Id: I6706cec2b3c3bfbdc0e0456c58191bc7152783e7
2019-04-11 10:52:14 -04:00