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

Commit 7563cb6c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8969739 from 4a0bc2c3 to tm-qpr1-release 

Change-Id: I1d83b8b480ccf95df5a171f228f20b6081277455
parents 464e7eb7 4a0bc2c3

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/layout/card_preference.xml

+24 −0
Original line number Diff line number Diff line
@@ -57,6 +57,30 @@ 
            android:maxLines="10"

            style="@style/PreferenceSummaryTextStyle"/>



        <RelativeLayout

            android:id="@+id/card_preference_buttons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_below="@android:id/summary"

            android:visibility="gone">

            <Button

                android:id="@android:id/button1"

                style="@style/CardPreferencePrimaryButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_toStartOf="@android:id/button2"

                android:visibility="gone"/>

            <Button

                android:id="@android:id/button2"

                style="@style/CardPreferenceBorderlessButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_alignParentEnd="true"

                android:visibility="gone"/>

        </RelativeLayout>

    </RelativeLayout>



    <!-- Preference should place its actual preference widget here. -->

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -622,6 +622,9 @@ 
    <!-- Whether to put the apps with system UID into system component bucket or not -->

    <bool name="config_battery_combine_system_components">false</bool>



    <!-- The extra value for battery tip -->

    <integer name="config_battery_extra_tip_value">12</integer>



    <!-- Whether to enable the advanced vpn feature. The default is not to. -->

    <bool name="config_advanced_vpn_enabled">false</bool>

res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -6281,6 +6281,8 @@ 
    <string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>

    <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>

    <!-- Summary for the battery limited temporarily extra tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_extra_summary"><xliff:g id="percent" example="10%">%1$s</xliff:g></string>

    <!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_dialog_resume_charge">Resume charging</string>

    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
@@ -6337,6 +6339,8 @@ 
    <string name="battery_tip_unrestrict_app_dialog_ok">Remove</string>

    <!-- CANCEL button for dialog to remove restriction for app [CHAR LIMIT=NONE] -->

    <string name="battery_tip_unrestrict_app_dialog_cancel">Cancel</string>

    <!-- Charge to full button for battery defender tips [CHAR LIMIT=NONE] -->

    <string name="battery_tip_charge_to_full_button">Charge to full</string>









    <!-- Message for battery tip dialog to show the battery summary -->









    <string name="battery_tip_dialog_summary_message" product="default">Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.</string>








@@ -6749,10 +6753,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 -->

























res/values/styles.xml



+15
−0






























Original line number
Diff line number
Diff line







@@ -969,4 +969,19 @@







        <item name="android:textColor">?android:attr/textColorPrimary</item>









        <item name="android:textDirection">locale</item>









    </style>



















    <style name="CardPreferencePrimaryButton" parent="@style/ActionPrimaryButton">









        <item name="android:fontFamily">google-sans-medium</item>









        <item name="android:textSize">14sp</item>









        <item name="android:textAllCaps">false</item>









        <item name="android:singleLine">true</item>









    </style>



















    <style name="CardPreferenceBorderlessButton"









        parent="@style/Widget.AppCompat.Button.Borderless.Colored">









        <item name="android:fontFamily">google-sans-medium</item>









        <item name="android:textSize">14sp</item>









        <item name="android:textAllCaps">false</item>









        <item name="android:singleLine">true</item>









    </style>









</resources>