PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,577 Commits 1 Branch 0 Tags
8e65bf1fb2cb1538e46e63e6c8a177e2841658b0
Commit Graph

1451 Commits

Author SHA1 Message Date
Tiffany Nguyen
34fb874647 Add new battery settings feature provider. 
Test: No-op class
Bug: 181827863

Change-Id: Iafd4c6128ba63d3c794c076edaaa7638e3de3a42
 2021-03-22 05:22:38 +00:00
Dmitri Plotnikov
3bd707ab1a Remove unused code 
Bug: 173745486
Test: make RunSettingsRoboTests
Change-Id: I9e6e32e4ad594b7d6f5f984bf1b839caf654066b
 2021-03-18 12:59:15 -07:00
Dmitri Plotnikov
313dbc0355 Remove references to BatteryStatsHelper from PowerUsageBase 
Bug: 180630447
Bug: 173745486

Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ifed69c4fdd741f75b0b962f9d3200f0ed533358f
 2021-03-18 06:07:29 +00:00
Dmitri Plotnikov
8f6c946c82 Transition HighUsageDetector to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: Ie8f90a67e4dd16fa67cf4f44a3678a789b3da18a
 2021-03-18 03:32:43 +00:00
TreeHugger Robot
735281a739 Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev 2021-03-18 03:28:19 +00:00
Dmitri Plotnikov
036dc189b6 Transition BatteryAppListPreferences to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: I7af8cbcd27433b89cb2184750c6854aa74761d0d
 2021-03-17 13:23:25 -07:00
Varun Shah
90321d45fb Hide non-system overlay windows in RequestIgnoreBatteryOptimizations. 
Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to
SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS.

Bug: 182165099
Test: manual (test PoC)
Change-Id: Iddf697c1e8945f49c6222605c67f8f98e9c418a9
 2021-03-17 10:38:56 -07:00
Dmitri Plotnikov
f941a684e1 Remove smearing of hidden BatterySipper power 
Bug: 182598424
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo.AppBatteryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest

Change-Id: I78b8d7c4faafa83de198005617e99a7f54bcd174
 2021-03-17 17:01:39 +00:00
TreeHugger Robot
60cc9e507b Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev 2021-03-17 16:57:42 +00:00
TreeHugger Robot
99b3468b1c Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev 2021-03-17 16:32:53 +00:00
Dmitri Plotnikov
656c67c01d Encapsulate BatterySipper and BatteryConsumer in BatteryEntry 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryEntryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.AdvancedPowerUsageDetailTest

Change-Id: I67ab825c25b85012b5713736db62e0beb4d98a16
 2021-03-13 12:51:47 -08:00
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
Adam Bookatz
03efe79d07 FakeUid: measured energy for Wifi, Bluetooth 
Updates FakeUid for the new BatteryStats APIs:
getWifiMeasuredBatteryConsumptionUC()
getBluetoothMeasuredBatteryConsumptionUC

Test: atest BatteryStatsTests
Bug: 174818228
Change-Id: I60b4a7dbc24b5fe6d91502a942cab8a32daacf96
 2021-03-12 13:41:23 -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