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

Commit 6470ada1 authored by Zaiyue Xue's avatar Zaiyue Xue Committed by Automerger Merge Worker
Browse files

Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953ea 

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



Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53561dc4 3b7953ea

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />

                android:value="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_battery"/>

        </activity>

res/layout/battery_chart_graph.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:textColor="?android:attr/textColorSecondary"

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



    <com.android.settings.fuelgauge.BatteryChartView

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

        android:id="@+id/battery_chart"

        android:layout_width="match_parent"

        android:layout_height="170dp"

res/xml/power_usage_advanced.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:title="@string/advanced_battery_title"

    settings:keywords="@string/keywords_battery_usage">



    <com.android.settings.fuelgauge.BatteryHistoryPreference

    <com.android.settings.fuelgauge.batteryusage.BatteryHistoryPreference

        android:key="battery_graph"/>



    <PreferenceCategory

res/xml/power_usage_summary.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />



    <Preference

        android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"

        android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced"

        android:key="battery_usage_summary"

        android:title="@string/advanced_battery_preference_title"

        settings:keywords="@string/keywords_battery_usage" />

res/xml/top_level_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
        settings:highlightableMenuKey="@string/menu_key_notifications"/>



    <com.android.settings.widget.HomepagePreference

        android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"

        android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"

        android:icon="@drawable/ic_settings_battery_white"

        android:key="top_level_battery"

        android:order="-110"