Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align bottom text with battery graph in RTL layout.

Browse Source 
am: dd5469e488

Change-Id: I5b434c64247f0343759549d82ba64b984487fc79
This commit is contained in:
Fan Zhang
2016-07-30 06:32:59 +00:00
committed by android-build-merger
parent 1fb9d1a848 dd5469e488
commit da61facecc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/res/layout/usage_view.xml
View File

@@ -71,9 +71,11 @@
android:id="@+id/bottom_label_group" android:id="@+id/bottom_label_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/usage_graph_labels_width"
android:orientation="horizontal"> android:orientation="horizontal">
<Space
android:id="@+id/bottom_label_space"
android:layout_width="@dimen/usage_graph_labels_width"
android:layout_height="wrap_content"/>
<include android:id="@+id/label_start" <include android:id="@+id/label_start"
layout="@layout/usage_side_label" /> layout="@layout/usage_side_label" />

7
packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java
View File

@@ -71,10 +71,11 @@ public class UsageView extends FrameLayout {
layout.addView(labels); layout.addView(labels);
// Set gravity. // Set gravity.
labels.setGravity(Gravity.END); labels.setGravity(Gravity.END);
// Swap the bottom label padding // Swap the bottom space order.
LinearLayout bottomLabels = (LinearLayout) findViewById(R.id.bottom_label_group); LinearLayout bottomLabels = (LinearLayout) findViewById(R.id.bottom_label_group);
bottomLabels.setPadding(bottomLabels.getPaddingRight(), bottomLabels.getPaddingTop(), View bottomSpace = bottomLabels.findViewById(R.id.bottom_label_space);
bottomLabels.getPaddingLeft(), bottomLabels.getPaddingBottom()); bottomLabels.removeView(bottomSpace);
bottomLabels.addView(bottomSpace);
} else if (gravity != Gravity.START) { } else if (gravity != Gravity.START) {
throw new IllegalArgumentException("Unsupported gravity " + gravity); throw new IllegalArgumentException("Unsupported gravity " + gravity);
} }