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

Commit 670ce333 authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc clean up. move widgets from graph to widget package. 

Bug: n/a
Test: robotests, rebuild
Change-Id: I910f355312d52e81a0bf57b46a3f267e1eb9882a
parent ddd9283e

res/layout/battery_history_detail.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
                android:textAppearance="?android:attr/textAppearanceMedium"

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



            <com.android.settings.graph.UsageView

            <com.android.settings.widget.UsageView

                android:id="@+id/battery_usage"

                android:layout_width="match_parent"

                android:layout_height="141dp"

res/layout/battery_usage_graph.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:textSize="36sp"

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



    <com.android.settings.graph.UsageView

    <com.android.settings.widget.UsageView

        android:id="@+id/battery_usage"

        android:layout_width="match_parent"

        android:layout_height="141dp"

res/layout/data_usage_graph.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical">



    <com.android.settings.graph.UsageView

    <com.android.settings.widget.UsageView

        android:id="@+id/data_usage"

        android:layout_width="match_parent"

        android:layout_height="@dimen/data_usage_chart_height"

res/layout/usage_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


        </LinearLayout>



        <com.android.settings.graph.UsageGraph

        <com.android.settings.widget.UsageGraph

            android:id="@+id/usage_graph"

            android:layout_width="match_parent"

            android:layout_height="match_parent"
@@ -76,7 +76,7 @@ 
            android:id="@+id/bottom_label_space"

            android:layout_width="@dimen/usage_graph_labels_width"

            android:layout_height="wrap_content"/>

        <com.android.settings.graph.BottomLabelLayout

        <com.android.settings.widget.BottomLabelLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"
@@ -93,7 +93,7 @@ 


            <include android:id="@+id/label_end"

                     layout="@layout/usage_side_label" />

        </com.android.settings.graph.BottomLabelLayout>

        </com.android.settings.widget.BottomLabelLayout>

    </LinearLayout>



</LinearLayout>

src/com/android/settings/datausage/ChartDataUsagePreference.java

+5 −4
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ import android.content.Context; 
import android.net.NetworkPolicy;

import android.net.NetworkStatsHistory;

import android.net.TrafficStats;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;

import android.text.SpannableStringBuilder;

import android.text.TextUtils;

import android.text.format.Formatter;
@@ -30,7 +27,11 @@ import android.util.SparseIntArray; 


import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.graph.UsageView;

import com.android.settings.widget.UsageView;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



public class ChartDataUsagePreference extends Preference {