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

Commit 1635b9e6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Align bottom text with battery graph in RTL layout. am: dd5469e4 am:... 

Merge "Align bottom text with battery graph in RTL layout. am: dd5469e4 am: da61face" into nyc-mr1-dev-plus-aosp
parents 8b5f40f3 42475086

packages/SettingsLib/res/layout/usage_view.xml

+4 −2
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ 
        android:id="@+id/bottom_label_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/usage_graph_labels_width"

        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"

            layout="@layout/usage_side_label" />

packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java

+4 −3
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ public class UsageView extends FrameLayout { 
                layout.addView(labels);

                // Set gravity.

                labels.setGravity(Gravity.END);

                // Swap the bottom label padding

                // Swap the bottom space order.

                LinearLayout bottomLabels = (LinearLayout) findViewById(R.id.bottom_label_group);

                bottomLabels.setPadding(bottomLabels.getPaddingRight(), bottomLabels.getPaddingTop(),

                        bottomLabels.getPaddingLeft(), bottomLabels.getPaddingBottom());

                View bottomSpace = bottomLabels.findViewById(R.id.bottom_label_space);

                bottomLabels.removeView(bottomSpace);

                bottomLabels.addView(bottomSpace);

            } else if (gravity != Gravity.START) {

                throw new IllegalArgumentException("Unsupported gravity " + gravity);

            }