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

Commit 9055c1b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev

parents f089fb24 dde458c0

res/layout/data_usage_summary_preference.xml

+25 −22
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="24dp"

    android:paddingTop="22dp"

    android:paddingBottom="32dp"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -31,8 +31,7 @@ 
        android:id="@+id/usage_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

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

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

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



    <LinearLayout
@@ -40,7 +39,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="12dp"

        android:paddingBottom="4dp"

        android:orientation="horizontal">



        <TextView android:id="@+id/data_usage_view"
@@ -78,7 +76,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dp"

        android:paddingBottom="8dp"

        android:orientation="horizontal">



        <TextView android:id="@android:id/text1"
@@ -100,9 +97,20 @@ 


    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="12dp"

        android:orientation="vertical">



        <TextView

            android:id="@+id/data_limits"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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



        <TextView

            android:id="@+id/cycle_left_time"

        android:paddingTop="4dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />
@@ -111,21 +119,16 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



    </LinearLayout>



    <Button

        android:id="@+id/launch_mdp_app_button"

        android:paddingTop="12dp"

        android:layout_marginTop="12dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="left"

        android:layout_gravity="start"

        android:text="@string/launch_mdp_app_text"

        style="@style/ActionPrimaryButton" />



    <TextView

        android:id="@+id/data_limits"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="5dp"

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



</LinearLayout>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -8826,7 +8826,7 @@ 
    <string name="no_carrier_update_text">Updated <xliff:g name="time" example="3m">%1$s</xliff:g></string>









    <!-- Button to launch external data plan app [CHAR LIMIT=30] -->









    <string name="launch_mdp_app_text">VIEW PLAN</string>









    <string name="launch_mdp_app_text">View plan</string>

















    <!-- Name of Data Saver screens [CHAR LIMIT=30] -->









    <string name="data_saver_title">Data saver</string>