Commit Graph

1339 Commits

Author SHA1 Message Date
TreeHugger Robot
38e0dae439 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev 2021-03-12 23:52:00 +00:00
Dmitri Plotnikov
820bee81d6 Transition BatteryInfo and BatteryUtils to BatteryUsageStats API
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryHistoryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoLoaderTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.detectors

Change-Id: I469ff8b88aa3307422c02f51943df4ef1759db56
2021-03-12 14:08:42 -08:00
TreeHugger Robot
45a3450d6f Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev 2021-03-12 20:51:44 +00:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
Michael Wachenschwanz
8625648a88 Merge "Update FakeUid with energy to charge change" into sc-dev 2021-03-08 23:46:08 +00:00
Michael Wachenschwanz
3e0cf46140 Add getCpuMeasuredBatteryConsumptionUC to FakeUid
Bug: 180079165
Test: builds

Change-Id: I2bb97900e2651a1e3229140994f09d397e29e404
2021-03-05 15:04:47 -08:00
Michael Wachenschwanz
ad250a4e3c Update FakeUid with energy to charge change
Bug: 180079165
Test: builds
Change-Id: I14c1fc727f6a63b0292b0dce1a3b12d00aa61c0f
2021-03-05 15:04:33 -08:00
Wesley.CW Wang
280e3639cd Update Battery Settings main page (1/2)
- Rollback ag/13413813 to meet the design change
 - Regrouping the index
 Screenshots:
   https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
   https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
2021-03-05 06:03:42 +00:00
Treehugger Robot
e05e8065e7 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied3dab4b389ba8a83ccf8630eeb04c2fce962e48
2021-02-24 07:39:00 +00:00
Treehugger Robot
c7bd662dee Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d87849cf4c8c85f19858164faff1d17cf32d43
2021-02-24 06:59:58 +00:00
Treehugger Robot
59f43e5299 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d99ba0c146418dbca6fe190c02a7b52db2e85da
2021-02-24 06:07:30 +00:00
Adam Bookatz
042f06aadf Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d2c2520b03586c375601f8987c53d9e25d68c6b
2021-02-24 03:30:08 +00:00
Adam Bookatz
8d618ac1f7 Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida7f4763d4039cf8af53a37b7e5faf5d42dbae21
2021-02-24 02:40:25 +00:00
Adam Bookatz
96d1b53394 Grant BatteryStats OWNERS for FakeUid.java
FakeUid.java needs to be trivially updated whenever new abstract methods are added to BatterStats.Uid in frameworks since it extends it. (e.g. ag/13547202)

Change-Id: Ie24f14e17be49056ae07ac369a8cbd067aa7ae16
Test: N/A
2021-02-24 01:51:57 +00:00
Wesley.CW Wang
2fb3390ce6 Update battery saver switch string
Bug: 180749420
Test: Test: make RunSettingsRoboTests -j40
Change-Id: Ibd65573a50a9c4f4ab2a055e7bdff6800cf1d873
2021-02-22 14:23:00 +08:00
Xin Li
ad3fa60e26 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -08:00
Adam Bookatz
17e0708152 fuelgauge OWNERS eof newline merge conflict
The AOSP version and internal version differ by an end-of-file newline,
which is creating merge conflicts.

Change-Id: Ib90a3ffbae9b44c3e6cf2287149f35318cd320a5
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-20 00:23:45 +00:00
Adam Bookatz
227d74be02 Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7f02e3d702a6e0aa9425d8a1dd973d33ea3aa89
2021-02-19 18:57:56 +00:00
Wesley.CW Wang
f4bc35333b Update battery percentage column to UsageProgressBarPref (1/2)
- Change battery percentage column to new design
 - Remove debug info case
 Screenshots:
   https://screenshot.googleplex.com/9rvRfK3wBtpnarZ.png
   https://screenshot.googleplex.com/5iAjNXTptDechAm.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I5d046be29a036910036e72edb677b69bc2c0a03f
2021-02-19 10:23:53 +00:00
TreeHugger Robot
188061ba81 Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev 2021-02-19 01:31:18 +00:00
Adam Bookatz
0ea873ea3d Update new owners for battery pages.
Change-Id: Ic1c1eca0af6b76da7774428018ea405657c4bae1
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-18 23:57:35 +00:00
Dmitri Plotnikov
97b3325ece Begin transition from BatteryStatsHelper to BatteryUsageStats API.
For now, keep both BatteryStatsHelper and BatteryUsageStats in play.
The plan is to transition from the former to the latter, one usage
at a time.  When all is said and done, all references to
BatteryStatsHelper will be gone.

Bug: 173745486
Test: atest --host SettingsRoboTests

Change-Id: I37e1dfff0043b1845992f18d72067bb547bb69ff
2021-02-18 11:56:00 -08:00
Tsung-Mao Fang
9a90dc1e8e Update new owners for battery pages.
Change-Id: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-18 01:27:27 +00:00
Adam Bookatz
738376dbaa [FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()
Fake Uid.getCustomMeasuredEnergiesMicroJoules() for new BatteryStats API.

Bug: 179107328
Bug: 174818228

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: Id55d52cad6622289aa0f39cfdb24799cac393878
2021-02-10 13:18:43 -08:00
Stanley Wang
10b7a7d483 Use MainSwitchPreference to replace the button style switches.
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Wesley.CW Wang
8d9fe815b0 Update battery saver column to PrimarySwitchPreference (1/2)
- Change battery saver entry column to new design
 Screenshot: https://screenshot.googleplex.com/9a9Gxm3McJVmLkD.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I513bc4371518645f4e725df27f2cb978cec284e8
2021-02-02 06:13:08 +00:00
Wesley.CW Wang
0457af5347 Reorder Settings Battery main page index (1/2)
- Reorder battery page index
 - Remove option menu
 - Add battery usage preference
 - Remove last full charge and screen usage preference
 Screenshots:
 https://screenshot.googleplex.com/7VMeSVKHGViZyRv.png
 https://screenshot.googleplex.com/7v6wNL4qamfMAgM.png

Bug: 177407113
Test: make SettingsGoogleRoboTests -j40
Change-Id: I8a1fb30cdd3774840bf28d9c84017d946a4244df
2021-01-26 14:01:29 +00:00
Arc Wang
c6ee2244a7 Merge "Fix battery optimization display problems" 2021-01-25 03:12:11 +00:00
Stanley Wang
6a824b3535 Merge "Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings." 2021-01-15 02:14:52 +00:00
TreeHugger Robot
78c6656981 Merge "Refactor AppPreference and AppSwitchPreference" 2021-01-14 15:28:17 +00:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings.
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
2021-01-14 22:48:31 +08:00
Wesley.CW Wang
f3db5cb678 Adjust Battery Saver percentage slide size
- Increase seekbar size to 48dp to fit the GAR requirement
 Screenshots:
     https://screenshot.googleplex.com/72qRevtZXA4PTcg.png
     https://screenshot.googleplex.com/3rJjDRehdsPL8AQ.png

Bug: 157532287
Test: make SettingsGoogleRoboTests
Change-Id: Ibeaec5e09b45bf1145cff1b2515a3f79548a25a5
2021-01-13 18:52:48 +00:00
Stephane Lee
b9b67ee815 Add adaptive charging to the top level settings menu
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
Merged-In: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
(cherry picked from commit b60870cb7d)
2021-01-06 21:59:42 +00:00
TreeHugger Robot
a533dc0464 Merge "Add getScreenOnEnergy to FakeUid" 2021-01-06 09:07:05 +00:00
Edgar Wang
fc02ce1c20 Refactor AppPreference and AppSwitchPreference
- Move AppSwitchPreference
- Remove FeatureflagPreference summary

Bug: 176815722
Test: robotest
Change-Id: Id337097f237ac9ca6dfa01665df61b1258dc24f2
2021-01-05 18:27:08 +00:00
Michael Wachenschwanz
d127eb017c Add getScreenOnEnergy to FakeUid
Bug: 172361024
Test: builds
Change-Id: I968bae76d2cc8bfc718057466320095cb4eeac2f
2021-01-05 10:06:49 -08:00
Stephane Lee
b60870cb7d Add adaptive charging to the top level settings menu
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
2021-01-04 15:37:21 -08:00
Daniel Chapin
2f51836ca1 Revert "Add adaptive charging to the top level settings menu"
Revert submission 12989357-fix_ac_menu

Reason for revert: Bug: 176473169
Reverted Changes:
I6fc50a5ae:Add adaptive charging to the top level settings me...
I8f600287c:Add adaptive charging to the top level settings me...

Change-Id: I2928a96112bb8d2beeb071f231af6595edead4fa
2020-12-29 17:55:13 +00:00
Stephane Lee
8fee0917f8 Add adaptive charging to the top level settings menu
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: I8f600287c38e3992bb884faeb4df3d91570851a0
2020-12-22 11:19:57 -08:00
Wesley.CW Wang
7ccb54feb6 Add Battery Defender feature to Settings
- Adding new tips of Battery Defender, will be presented once battery is overheated
 - Launch Help Center article of battery overheat when clicking Battery Defender tip
 Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
 	      https://screenshot.googleplex.com/tUj2LLi87SfndBN.png

Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
2020-12-07 08:06:22 +00:00
Wesley.CW Wang
9a6aae5006 Add Battery Defender feature to Settings
- Reupload CL from ag/13108999 to fix the merge conflict
 - Adding new tips of Battery Defender, will be presented once battery is overheated
 - Launch Help Center article of battery overheat when clicking Battery Defender tip
 Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
 	      https://screenshot.googleplex.com/tUj2LLi87SfndBN.png

Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
2020-12-01 16:00:49 +08:00
Arc Wang
f81d22ef28 Fix battery optimization display problems
Root cause:
RequestIgnoreBatteryOptimizations adds package in
PowerWhitelistManager#addToWhitelist for intent
Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS.

Settings UI uses PowerAllowlistBackend to check if
an APP is in power allow list. Each UI component should
PowerAllowlistBackend#refreshList() or UI will get
a stale result.

Solution:
This change fixes below display problems by refreshing
allow list from DeviceIdleController service.

1. Battery optimization summary in Battery usage details.
2. Battery optimization list.

BYPASS_INCLUSIVE_LANGUAGE_REASON=I need the object name
to describe the root cause.

Bug: 171064162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BatteryOptimizationPreferenceControllerTest
      manual
      Switch battery optimazion of a APP and observer the UI display.
Change-Id: I75b269eec5d1b904dcaa71948798f169d4e4ddfa
2020-11-24 16:28:04 +08:00
Mill Chen
467ae5ffc2 Revert "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent""
This reverts commit 13ebec46a5.

Reason for revert: To fix the NPE issue

Specify explicitly FLAG_MUTABLE for PendingIntent

This change is to specify explicitly FLAG_MUTABLE to the pendingIntent
since this intent is working with inline reply.

Bug: 172894032
Test: manual test
Change-Id: I5fdcf175307cec5e0e96b33d711221be839e1357
2020-11-21 00:16:58 +08:00
Mill Chen
1ad41f5b39 Merge "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent"" 2020-11-20 07:39:41 +00:00
Mill Chen
13ebec46a5 Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent"
This reverts commit 9cbb4fa4e7.

Reason for revert: this change might cause NPE on Settings app.

Change-Id: I4fd5ec36941c7516a25eaff6d64bcf62e0de7b39
2020-11-20 03:27:35 +00:00
John Li
d9fa3cec61 Merge changes from topic "haptic"
* changes:
  Add haptic feedback for the seekbar in Settings.
  Perform haptic feedback when the seekbar snaps.
2020-11-19 04:54:51 +00:00
Stanley Wang
ee23508b1a Fix NPE in AnomalyDetectionReceiver.
Fixes: 172894032
Test: Settings robotests
Change-Id: I13c1419a43dabc106bc3de9fb5d774ff88b19db5
2020-11-18 16:20:21 +08:00
John Li
db2d3347d7 Add haptic feedback for the seekbar in Settings.
- set HAPTIC_FEEDBACK_MODE_ON_TICKS for Gesture Navigation.
- set HAPTIC_FEEDBACK_MODE_ON_TICKS for Battery Saver.
- set HAPTIC_FEEDBACK_MODE_ON_ENDS for Reduce Bright Colors.
- set HAPTIC_FEEDBACK_MODE_ON_ENDS for Night Light.

Bug: 172900709
Test: manual
Change-Id: I070a0f2e4cf690bf611f62c7a4a2bcef17e08571
2020-11-18 08:08:20 +00:00
Mill Chen
5a347494d2 Update related UI if battery is not present
This change is to update the related UI in the battery page if the
battery is not present. This includes the following updates:
1. Update the summary of battery tile in the Settings homepage
2. Replace the battery level with "Unknown"
3. Replace the summary with help message in the battery page
4. Remove the battery meter icon

Bug: 171368508
Test: verify on an issue device
Change-Id: I892e0d137143160a0bce0c11ce9265120ebb8fd4
Merged-In: I892e0d137143160a0bce0c11ce9265120ebb8fd4
2020-11-06 17:36:27 +08:00
Mill Chen
9cbb4fa4e7 Specify explicitly FLAG_IMMUTABLE for PendingIntent
The existing pending intent in the BatteryTipUtils has been specified
FLAG_UPDATE_CURRENT. This change is to add explicitly FLAG_IMMUTABLE
to the pending intent.

Fixes: 171506726
Test: build pass, robotest
Change-Id: Ib82ddb45e05b492eef300f2ec064803d768419d0
2020-11-03 13:40:21 +08:00