Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6992c28b authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Port new version battery usage chart implementation from master to... 

Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569019



Change-Id: I69ba753143ff1bb5fab2db8a53785540530e3c77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4006c7e9 c586e1e4

res/layout/battery_chart_graph.xml

+14 −4
Original line number Diff line number Diff line
@@ -29,14 +29,24 @@ 
        android:layout_marginVertical="16dp"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:text="@string/battery_usage_chart_graph_hint" />

        android:text="@string/battery_usage_chart_graph_hint_last_full_charge" />



    <com.android.settings.fuelgauge.batteryusage.BatteryChartView

        android:id="@+id/battery_chart"

        android:id="@+id/daily_battery_chart"

        android:layout_width="match_parent"

        android:layout_height="170dp"

        android:layout_marginBottom="6dp"

        android:visibility="invisible"

        android:layout_marginBottom="16dp"

        android:visibility="gone"

        android:contentDescription="@string/battery_usage_chart"

        android:textAppearance="?android:attr/textAppearanceSmall"

        settings:textColor="?android:attr/textColorSecondary" />



    <com.android.settings.fuelgauge.batteryusage.BatteryChartView

        android:id="@+id/hourly_battery_chart"

        android:layout_width="match_parent"

        android:layout_height="170dp"

        android:layout_marginBottom="16dp"

        android:visibility="visible"

        android:contentDescription="@string/battery_usage_chart"

        android:textAppearance="?android:attr/textAppearanceSmall"

        settings:textColor="?android:attr/textColorSecondary" />

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -6751,10 +6751,16 @@ 
    <!-- [CHAR_LIMIT=NONE] Battery percentage: Description for preference -->

    <string name="battery_percentage_description">Show battery percentage in status bar</string>













    <!-- [CHAR_LIMIT=NONE] Battery usage main screen chart graph hint since last full charge -->













    <string name="battery_usage_chart_graph_hint_last_full_charge">Battery level since last full charge</string>















    <!-- [CHAR_LIMIT=NONE] Battery usage main screen chart graph hint -->















    <string name="battery_usage_chart_graph_hint">Battery level for past 24 hr</string>













    <!-- [CHAR_LIMIT=NONE] Battery app usage section header since last full charge -->













    <string name="battery_app_usage">App usage since last full charge</string>















    <!-- [CHAR_LIMIT=NONE] Battery app usage section header for past 24 hour -->















    <string name="battery_app_usage_for_past_24">App usage for past 24 hr</string>













    <!-- [CHAR_LIMIT=NONE] Battery system usage section header since last full charge -->













    <string name="battery_system_usage">System usage since last full charge</string>















    <!-- [CHAR_LIMIT=NONE] Battery system usage section header for past 24 hour -->















    <string name="battery_system_usage_for_past_24">System usage for past 24 hr</string>















    <!-- [CHAR_LIMIT=NONE] Battery system usage section header -->

























src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -179,7 +179,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController













                    return null;















                }















                final BatteryDiffEntry entry =













                        BatteryChartPreferenceController.getBatteryLast24HrUsageData(













                        BatteryChartPreferenceController.getAppBatteryUsageData(















                                mContext, mPackageName, mUserId);















                Log.d(TAG, "loadBatteryDiffEntries():\n" + entry);















                return entry;









@@ -200,10 +200,10 @@ public class AppBatteryPreferenceController extends BasePreferenceController













                mBatteryPercent = Utils.formatPercentage(















                        mBatteryDiffEntry.getPercentOfTotal(), /* round */ true);















                mPreference.setSummary(mContext.getString(













                        R.string.battery_summary_24hr, mBatteryPercent));













                        R.string.battery_summary, mBatteryPercent));















            } else {















                mPreference.setSummary(













                        mContext.getString(R.string.no_battery_summary_24hr));













                        mContext.getString(R.string.no_battery_summary));















            }















        }

















































src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java



+6
−9




























Original line number
Diff line number
Diff line








@@ -539,15 +539,12 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements













            return null;















        }















        if (totalTimeMs == 0) {













            final int batteryWithoutUsageTime = consumedPower > 0













                    ? R.string.battery_usage_without_time : R.string.battery_not_usage_24hr;













            usageTimeSummary = getText(isChartGraphEnabled













                    ? batteryWithoutUsageTime : R.string.battery_not_usage);













            usageTimeSummary = getText(













                    isChartGraphEnabled && consumedPower > 0 ? R.string.battery_usage_without_time













                            : R.string.battery_not_usage);















        } else if (slotTime == null) {













            // Shows summary text with past 24 hr or full charge if slot time is null.













            usageTimeSummary = isChartGraphEnabled













                    ? getAppPast24HrActiveSummary(foregroundTimeMs, backgroundTimeMs, totalTimeMs)













                    : getAppFullChargeActiveSummary(













            // Shows summary text with last full charge if slot time is null.













            usageTimeSummary = getAppFullChargeActiveSummary(















                    foregroundTimeMs, backgroundTimeMs, totalTimeMs);















        } else {















            // Shows summary text with slot time.

































src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java



+215
−263


























File changed.
Preview size limit exceeded, changes collapsed.