Commit Graph

70 Commits

Author SHA1 Message Date
Yiling Chuang
ab6b7758c1 Add one more param to isChargingOptimizationMode() for flexibility
Adds a new param about the charging policy to see if it's currently under CHARGING_POLICY_ADAPTIVE_LONGLIFE for more flexibility to check whether the charging optimization mode is enabled.

Bug: 391270019
Flag: EXEMPT bugfix
Test: atest SettingsRoboTests
Change-Id: Ie773d9a2a13d1a37ac9fd5940f10a100eccf77ca
2025-02-04 03:53:51 +00:00
pajacechen
a9eb7c90dd [Bugfix] Fix the failed test case
Fix the failed test case that missed from ag/28495857

Test: Unit Test
Fix: 348563863
Fix: 356152111
Flag: EXEMPT bug fix
Change-Id: I852da018c6967c6ca13e3aea72290a2d6be8bfdd
2024-07-30 10:10:35 +08:00
Yiling Chuang
318636d51b Update the conditions of power plugged determination.
Under charging optimization mode, use ADAPTIVE_LONGLIFE as the additional condition to check whether a device is plugged.

Bug: 349949603
Flag: EXEMPT bugfix
Test: atest SettingsRoboTests
Change-Id: Idbdfaaa1d5c54be325b6182bcda81d4282c21ba0
2024-07-02 10:54:36 +00:00
pajacechen
daeb06c3b0 [Bug Fix] "Dock defend string and tips in settings are incorrectly" issue
Symptom: After the dock defend was triggered, the battery tips still
show "Future-Bypass" dock defend mode. It should be the "Active" dock
defend mode.

Root Cause: The original `BatteryInfo.isBatteryDefender` was implemented
by using `longlife`, due to the charging limit also reuse `longlife`
issue, we replace the implementation of `BatteryInfo.isBatteryDefender`
with HAL API call `isTempDefend` and `isDwellDefend`. However, the
dock defend also needs `longlife`, the original
`BatteryInfo.isBatteryDefender`. So the dock defend checking failed
after replacing the implementation of `BatteryInfo.isBatteryDefender`

Solution:
- Add new property isLonglife in BatteryInfo
- Replace all isBatteryDefender reference that needs isLonglife

Bug: 348563863
Test: Manual Test and robotest
Test: http://ab/I08300010291126076 (unit test)
Test: http://ab/I67800010291096764 (robo test)
Flag: EXEMPT bugfix
Change-Id: I58424927522acc29dc49261a2c24829a5b34ef85
2024-06-27 23:19:08 +08:00
Chaitanya Cheemala
4cfc0d8156 Revert "Fix "Dock defend string and tips in settings are incorrectly" issue"
This reverts commit d1114107df.

Reason for revert: Likely culprit for b/349578829  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I905a439c73e120efa094f097d59f68d0bedb0648
2024-06-26 15:47:11 +00:00
pajacechen
d1114107df Fix "Dock defend string and tips in settings are incorrectly" issue
Symptom: After the dock defend was triggered, the battery tips still
show "Future-Bypass" dock defend mode. It should be the "Active" dock
defend mode.

Root Cause: The original `BatteryInfo.isBatteryDefender` was implemented
by using `longlife`, due to the charging limit also reuse `longlife`
issue, we replace the implementation of `BatteryInfo.isBatteryDefender`
with HAL API call `isTempDefend` and `isDwellDefend`. However, the
dock defend also needs `longlife`, the original
`BatteryInfo.isBatteryDefender`. So the dock defend checking failed
after replacing the implementation of `BatteryInfo.isBatteryDefender`

Solution: Add new property isLonglife in BatteryInfo

Bug: 348563863
Test: Manual Test and robotest
Test: http://ab/I55100010289930405
Flag: EXEMPT bugfix
Change-Id: I180cde7a193d75243893471634bab5f354c1623b
2024-06-26 16:38:14 +08:00
Yiling Chuang
8bcaab7cc8 Update the flow of charging optimization strings.
Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: I73738602036d79568fe4739a63534af1c64bd9d1
2024-05-15 07:47:10 +00:00
Yiling Chuang
7b77729db6 Update strings for charging optimization mode.
Update the battery settings summary and the charging string on the Battery settings page if charging optimization mode is applied.

Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: Ie906a010d70bcef7fafe235f0287b289ea934705
2024-05-07 06:34:24 +00:00
Pajace Chen
c7f595814b Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27200838

Change-Id: I988aa8852b922f9a05a2352850d803ea3feb7e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 02:37:33 +00:00
pajacechen
1d03a55ea8 Fix test case failed issue
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.

Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
2024-05-03 01:59:40 +00:00
Yiling Chuang
1aa4bcf17d Clean up on the charging remaining time label for WLC.
Bug: 336204618
Test: robotests
Change-Id: Ic2c9d653f8bd9ec25383319766256162d81424c2
2024-04-23 03:36:06 +00:00
Yiling Chuang
901a46c93e Customize the remaining time label during wireless charging.
Bug: 336204618
Test: robotests
Change-Id: Ic7025f219ee09fba0922ac183daa891e7b63b673
2024-04-22 10:14:13 +00:00
Pajace Chen
d9b44a8b9c Add charging string V2 for settings
Apply charging string V2 for settings

Bug: 328546483
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f3c97f60a966a8ec357ba4d15b19d9d7a04b34d)
Merged-In: Ic68bf4231da81d865faa285bca97a929abe26a42
Change-Id: Ic68bf4231da81d865faa285bca97a929abe26a42
2024-04-12 06:23:55 +00:00
Pajace Chen
afdf231921 Fix failed test case in BatteryInfoTest
Test:  http://ab/I66000010265031461
Bug: 333857349
Change-Id: I213b4cab305a1484684f2f85294d71531bb8a048
2024-04-12 05:19:18 +00:00
pajacechen
93599816d0 Fix filed test case in BatteryInfoTest
Root cause: the test case has timezone dependency, it need to set
timezone before run the test case or it will be failed on different
timezone.
Solution: Replace AlarmManager.setTimeZone with TimeZone.setDefault,
AlarmManager.setTimeZone() seems failed to change timezone for test case.

Fix: 333857349
Test: http://ab/I51500010265016400
Change-Id: Id36dd10866720cba19cce471d294e09272c8091f
2024-04-11 21:57:20 +08:00
Pajace Chen
6f3c97f60a Add charging string V2 for settings
Apply charging string V2 for settings

Bug: 328546483
Test: Manual test

Change-Id: Ic68bf4231da81d865faa285bca97a929abe26a42
2024-04-10 18:58:37 +08:00
pajacechen
a20232d7a1 [Shadow] Fix failed test case for battery defender
- Fix failed test case in BatteryInfoTest and BatteryDefenderTipTest

Test: http://ab/I73800010248910938
Bug: 315748218
Change-Id: Iaa01a1d777236b7772fa762c94ab094246c38f21
2024-02-22 11:28:44 +08:00
Jun Lan
358a85ecfe Format battery java test code
context:go/pixel-energizer-java-format

Test: manual
Bug: 304439460
Fix: 304439460
Change-Id: I5be0ee41afb3a7018bc7e25cceccc25669924d6c
2023-11-07 12:27:43 +08:00
Trina
c17809f03b Sync the charge time with battery info on settings
Test: atest SettingsTests

Bug: 296793655
Change-Id: I407de30589e77ba09916f54f06f4f9c345adf330
2023-09-04 14:32:49 +00:00
YK Hung
83de631175 Merge "Update battery health state intent (2/3)" into udc-dev 2023-05-15 03:27:44 +00:00
Wesley Wang
77deb463a0 Update battery settings remaining time format
- Update the remaining time format to align with status bar
 - Remove unused test case since no more less than 7 or 15 remaining time
   case for battery settings
 screenshots:
   https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
   https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
   https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
   https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png

Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
Wesley Wang
cf1190c7cb Update battery health state intent (2/3)
- Update the extra from overheated to longlife

Bug: 278192441
Test: make SettingsRoboTests

Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
2023-05-11 11:27:16 +08:00
YK Hung
a8e2ded389 Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809 am: cf8ab7eef3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066

Change-Id: I3ef80837be675684e595f47cfe886a198992d167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 06:04:43 +00:00
Zhenwei Chen
1eea27ae82 Update string for all defenders
Test: Unit test passed
Bug: 262508668
Change-Id: Ia0126f9761caa43d0746962a9bb77173e9f45ad1
2022-12-15 05:31:18 +00:00
TreeHugger Robot
a464ca0e47 Merge "Make BatteryStatsHistoryIterator API compatible with Iterator" 2022-12-14 01:49:18 +00:00
Dmitri Plotnikov
732ecf7d43 Make BatteryStatsHistoryIterator API compatible with Iterator
Bug: 261622968
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.google.android.settings.fuelgauge.BatteryInfoTest  RELAX_USES_LIBRARY_CHECK=true

Change-Id: I4b3cf18e4714017b412485120557eb22d7039118
2022-12-09 16:29:48 -08:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
2022-12-06 06:22:38 +00:00
Zhenwei Chen
54615b3bec Fix batteryInfo unit test
Bug:261139453
Test: Unit test passed
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-12-05 09:10:39 +00:00
Zhenwei Chen
1d72ff642c Add dock defender battery tips
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
   corresponding list item string

Bug: 260687359
Test: Unit test passed and manual test on device
Merged-In: Ib6c09df056744142f42f5e2a13252b58e54c7534
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 8d11d9ceea)
2022-11-29 10:31:37 +00:00
Zhenwei Chen
8d11d9ceea Add dock defender battery tips
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
   corresponding list item string

Bug:256523472
Test: Unit test passed and manual test on device
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-11-28 17:45:51 +08:00
Pajace Chen
720602b900 Fix failed test case for BatteryInfoTest
Test: atest SettingsRoboTests:BatteryInfoTest
Change-Id: Ia83af3a7075ee80b27345ca74d02a2d94b88a51d
2022-10-14 22:01:54 +08:00
Wesley Wang
4dd92bf5a1 Update Settings charging string
- Update charging protected string

Bug: 236798712
Test: make and verify strings
Change-Id: I86e063191b42e98d8836a6dbe3b32ff3ce3bb8d0
2022-08-19 18:18:02 +08:00
Bonian Chen
88f2801d08 [Settings] Ignore failed test case
Ignore failed test case.

Bug: 201021173
Test: build pass
Change-Id: I5576c1c1aa729119285cd01285ce99b6d47c251c
2021-09-24 12:45:54 +08:00
Wesley.CW Wang
9cc091cbd7 Update battery defender tip string
Bug: 175662315
Test: m RunSettingsRoboTests
Change-Id: I064a538631d359b22982f9df6e550b489529b057
2021-05-26 15:37:02 +08:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3)
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
2021-04-07 10:19:10 +00:00
Wesley.CW Wang
7366d71702 Fix BatteryInfo test fail
- rollback part of ag/14063746

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I11129713dac2584c54890f65af53ce76b0672b8d
2021-04-01 14:31:14 +00:00
Wesley.CW Wang
d7e0fa959b Fix testing fail for BatteryInfoTest and HighUsageTipTest
- Fix the test fail from ag/14048547

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: Ia7a0d0fa567b1826a42b304a04e627e3b0e5f896
2021-04-01 18:28:14 +08: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
ykhung
351ffbeac9 Fix failure BatteryInfoTest after string is update
Bug: 175277366
Test: make RunSettingsRoboTests -j40
Change-Id: I142ba70548c6dac9bfc33e0833c99da188817023
2020-12-11 09:16:19 +08:00
Tsung-Mao Fang
5e4dac2e0a Ignore broken tests
Ignore it now, and we will fix it as soon as possible.

Test: Run all robo tests
Bug: 175277366
Bug: 175276658
Bug: 175290003
Bug: 175277372
Change-Id: If6843fdf6212217342490f0787dd5f70f9df7adf
2020-12-10 20:25:36 +08: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
Edgar Wang
c2e4513fb6 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I36829e0055437dab79d9e5339ac002a87a4b874f
2020-08-04 18:12:48 +08:00
Yi-Ling Chuang
7166ab38c2 Update summary of low battery tip in tests.
Bug: 144865404
Test: robotests
Change-Id: I4ec1966f765e7b44dc7affbcb46ba35c3fe6caea
2020-03-20 20:19:23 +08:00
Mill Chen
0ac194de10 Fix BatteryInfo test case failures
Fixes: 141901539
Test: robotests
Change-Id: I63140c36996e463862bb2dc77d26acdaa96530b2
2019-10-01 08:53:38 +00: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
Raff Tsai
deda67b7bf Revert "Revert "Change battery tip text""
This reverts commit 39beb2533f.

Reason for revert: <start to implement>

Fixes: 121042353
Test: adb shell settings put global battery_tip_constants test_low_battery_tip=true
      Then go to Settings -> battery to see the text

Change-Id: I83cc187d5bfda5312410e91ee636373f305ef449
2019-03-09 00:14:29 +08:00
Raff Tsai
39beb2533f Revert "Change battery tip text"
This reverts commit 2441b94c6d.

Reason for revert: <wrong commit>

Change-Id: I373fc065eafc81c26a8eba133255f9377d1d5d7f
2019-03-08 08:51:05 +00:00
Raff Tsai
2441b94c6d Change battery tip text
Fixes: 121042353
Test: adb shell settings put global battery_tip_constants test_low_battery_tip=true
      Then go to Settings -> battery to see the text
Change-Id: Ie3c4a89ccb7c2724840dc886a502ef919e13a856
2019-03-07 04:50:43 +08:00
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