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

Commit befdce36 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Update data usage UX"

parents e7770650 b37e2887

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2226,7 +2226,7 @@ 
            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.wireless" />

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

                android:value="com.android.settings.DataUsageSummary" />

                android:value="com.android.settings.datausage.DataUsageSummary" />

        </activity>



        <activity android:name="Settings$DreamSettingsActivity"

res/drawable/data_sweep_limit.xml

+9 −3
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@drawable/data_sweep_limit_activated" />

</selector>
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="2dp"

    android:height="14.5dp"

    android:viewportWidth="2"

    android:viewportHeight="56">

    <path

        android:fillColor="#ffffffff"

        android:pathData="M0,48l2,0l0,8l-2,0l0,-8z" />

</vector>

res/drawable/data_sweep_warning.xml

+9 −3
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@drawable/data_sweep_warning_activated" />

</selector>
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="2dp"

    android:height="14.5dp"

    android:viewportWidth="2"

    android:viewportHeight="56">

    <path

        android:fillColor="#ffffffff"

        android:pathData="M0,48l2,0l0,8l-2,0l0,-8z" />

</vector>

res/layout/app_header.xml

+0 −6
Original line number Diff line number Diff line
@@ -53,11 +53,5 @@ 
        android:src="@drawable/ic_info"

        style="?android:attr/borderlessButtonStyle" />



    <View

        android:id="@+id/row_divider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/listDivider" />



</RelativeLayout>

res/layout/apps_filter_spinner.xml

+17 −5
Original line number Diff line number Diff line
@@ -20,22 +20,34 @@ 
    android:layout_height="?android:attr/actionBarSize"

    android:background="@drawable/switchbar_background"

    android:gravity="center_vertical"

    android:paddingEnd="@dimen/switchbar_subsettings_margin_end"

    android:theme="?attr/switchBarTheme" >



    <Spinner

        android:id="@+id/filter_spinner"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_marginStart="64dp"

        android:layout_marginEnd="70dp"

        android:layout_alignWithParentIfMissing="true"

        android:layout_centerVertical="true"

        android:textAlignment="viewStart" />



    <View

        android:id="@+id/row_divider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/listDivider" />

    <ImageView

        android:id="@+id/filter_settings"

        android:layout_width="56dp"

        android:layout_height="56dp"

        android:layout_alignParentEnd="true"

        android:layout_centerVertical="true"

        android:minHeight="0dp"

        android:minWidth="0dp"

        android:contentDescription="@string/configure"

        android:scaleType="center"

        android:src="@drawable/ic_settings_24dp"

        style="?android:attr/borderlessButtonStyle"

        android:visibility="gone" />





</RelativeLayout>