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

Commit 0247278f authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix RTL in controls and GA" into rvc-dev am: c04b1628 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798694

Change-Id: I24b38e27c9989024e087c34eb65f965e85c72c2b
parents d782ed42 c04b1628

packages/SystemUI/res/layout/controls_base_item.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ 
        android:singleLine="true"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:ellipsize="marquee"

        android:marqueeRepeatLimit = "marquee_forever"

        android:marqueeRepeatLimit = "marquee_forever"

        android:textDirection="locale"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="@+id/icon"

        app:layout_constraintBottom_toBottomOf="@+id/icon"

        app:layout_constraintStart_toEndOf="@+id/icon" />

        app:layout_constraintStart_toEndOf="@+id/icon" />
@@ -67,6 +68,7 @@ 
        android:focusable="false"

        android:focusable="false"

        android:maxLines="1"

        android:maxLines="1"

        android:ellipsize="end"

        android:ellipsize="end"

        android:textDirection="locale"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toTopOf="@id/barrier"/>

        app:layout_constraintBottom_toTopOf="@id/barrier"/>
@@ -90,6 +92,7 @@ 
        android:focusable="false"

        android:focusable="false"

        android:maxLines="1"

        android:maxLines="1"

        android:ellipsize="end"

        android:ellipsize="end"

        android:textDirection="locale"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@id/favorite"

        app:layout_constraintEnd_toStartOf="@id/favorite"

        app:layout_constraintTop_toTopOf="@id/favorite"

        app:layout_constraintTop_toTopOf="@id/favorite"

packages/SystemUI/res/layout/controls_more_item.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,6 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="start"

    android:layout_gravity="start"

    android:paddingStart="@dimen/control_menu_horizontal_padding"

    android:paddingStart="@dimen/control_menu_horizontal_padding"

    android:paddingEnd="@dimen/control_menu_horizontal_padding"/>

    android:paddingEnd="@dimen/control_menu_horizontal_padding"

    android:textDirection="locale"/>

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources;

import android.util.LayoutDirection;

import android.view.View;

import android.view.View;

import android.view.View.MeasureSpec;

import android.view.View.MeasureSpec;

import android.view.WindowManager;

import android.view.WindowManager;
@@ -106,7 +107,11 @@ public class GlobalActionsPopupMenu extends ListPopupWindow { 
            listView.setPadding(0, mMenuVerticalPadding, 0, mMenuVerticalPadding);

            listView.setPadding(0, mMenuVerticalPadding, 0, mMenuVerticalPadding);





            setWidth(width);

            setWidth(width);

            if (getAnchorView().getLayoutDirection() == LayoutDirection.LTR) {

                setHorizontalOffset(getAnchorView().getWidth() - mGlobalActionsSidePadding - width);

                setHorizontalOffset(getAnchorView().getWidth() - mGlobalActionsSidePadding - width);

            } else {

                setHorizontalOffset(mGlobalActionsSidePadding);

            }

        }

        }





        super.show();

        super.show();