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

Commit dd5469e4 authored by Fan Zhang's avatar Fan Zhang
Browse files

Align bottom text with battery graph in RTL layout. 

Bug: 30161009

Bottom text (estmitated remaining battery time) should be stay under the
battery graph in RTL. To help alignment, we use a spacer view to the
left or right of text depending on layout direction.

Change-Id: Iaf706c1a963246e7f04764e5f24e6cb4bf3d2bbf
parent 7f37f269

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);

            }