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

This commit is contained in:
TreeHugger Robot
2018-06-12 01:01:32 +00:00
committed by Android (Google) Code Review
16 changed files with 65 additions and 54 deletions

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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>