Commit Graph

27 Commits

Author SHA1 Message Date
pajacechen
fe96aee940 [Reskin] Update string of incompatible charging on settings
Update the battery status of incompatible charging on settings home page

Bug: 315748218
Test: Manual Test
Flag: NA
Change-Id: I4e729a5c45a0d2f8c8bcd82c40b776d9e9900dca
2024-01-16 23:02:35 +08:00
pajacechen
f45427bd59 [Reskin] Replace string for chargin on hold
- replace the string for charging on hold in settings main page and
  battery status in battery settings page

Bug: 315748218
Test: Manual Test
Flag: NA
Change-Id: I130d377912e150d593f6480e2bbdf43048b6916e
2024-01-15 19:20:21 +08:00
Jun Lan
cca804e1ed Format battery java code
After this CL, we can follow Guideline:go/hc-mainline-dev#format-code to keep java format consistent.

Test: manual
Bug: 304439460
Change-Id: I5bb77f81b0bd9be618e34942eaaee8296bc42796
2023-11-06 13:55:48 +08:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
YK Hung
d8f0731f60 Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47 am: 4b1d5b8e8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784

Change-Id: I11be4dc1c925f0100183d842fe2d2b3a13ae2741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:21:21 +00:00
ykhung
0610d2b682 Fix inconsistent connected without charging state in the Settings
Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).

https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119

Fix: 285204150
Test: make RunSettingsRoboTests -j40

Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
2023-07-27 08:21:49 +00:00
Chaohui Wang
9ed6eccb75 Remove context from batteryStatusFeatureProvider
BatteryStatusFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Ie5f39c3f074a1937526461eba45f11f7ec212cba
2023-07-06 15:56:08 +08:00
ykhung
c234196bc1 Support incompatible charger state in the battery main page
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
2023-05-04 14:57:07 +08:00
ykhung
0288b6d4af Fix battery percentage is inconsistent in settings
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
2023-05-02 11:58:08 +08:00
ykhung
09c1a4a850 Support incompatible charger state in the Settings main page
https://screenshot.googleplex.com/9af4YCnCCjKHCFY

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
2023-05-02 00:04:01 +08:00
Ting-Kang Chang
ec90572f75 Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating.
Bug: 271665638
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I1c9cc3cfcb54051223df2ad46947d7f0c1ebbdb0
2023-03-09 13:22:53 +08:00
ykhung
0eb6c4fb34 Remove the replaced activity checking to impact launching performance
Bug: 209081502
Test: make SettingsRoboTests
Change-Id: Id8e2144a5965601be9c290bc4df6db0d0beb0917
2021-12-09 09:44:11 +00:00
TreeHugger Robot
06d312f0af Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34 am: d9195b80af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356

Change-Id: I3b030dd9ac65b93500814b62cae4ef48ceb3bc1b
2021-10-01 08:58:55 +00:00
Wesley.CW Wang
0cd29a70a4 Punt battery status action when entering Settings main page
- Checking battery sharing states at the beging may have some performance issue, post battery status update to background thread to avoid ANR

Bug: 193600924
Test: make SettingsRoboTests
Change-Id: I3b73e6bd4f952bc832783b9b3b5d45db560d088c
2021-10-01 15:15:25 +08:00
Tiffany Nguyen
161bbeaa1d Fix unbundled settings launching activity.
Bug: 194257786
Test: Unit
Change-Id: I69dc860878e5900d0c6142221349adfd52447884
2021-07-21 06:55:11 +00:00
Tiffany Nguyen
5924161061 Redirect battery-level settings preference clicks if needed
Change-Id: I64d0992544cc7e0cb41293b799577cbc43dfbb38
Bug: 181827923
Test: unit
2021-05-13 02:55:03 +00:00
Yanting Yang
d1312e8e6e Add summary back to the homepage
Also update some summaries with new strings.

Bug: 183586663
Test: robotests & atest & visual

Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +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
Mill Chen
ad99e2ef38 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
2020-10-23 23:35:15 +08:00
Yanting Yang
9aa4a5463f Remove subtitles for the homepage IA
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
2020-10-20 23:54:03 +08:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08: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
jackqdyulei
ef3b364728 Update battery summary
When it is charging, show "5% - charging"(not only "5%")

Bug: 112013485
Test: RunSettingsRoboTests
Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc
2019-02-14 19:11:10 -08:00
Ben Lin
11f698ba22 Add boolean flags to show/hide top-most settings.
Bug: None
Test: RunSettingsRoboTests
Change-Id: Ib576f5979feda0fa7f573915acffc5065d40095c
2018-12-14 16:00:21 -08:00
Fan Zhang
f6747a2f44 Add summary text for more top level setting tiles
- Connected devices
- App & notifs
- Battery

Bug: 110405144
Test: robotests
Change-Id: Ife44f7c5165483a1bad903ce90a241108ab5da25
2018-08-09 14:38:52 -07:00