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

Commit a68a5720 authored by Ats Jenk's avatar Ats Jenk
Browse files

Update expanded view positioning for RTL 

Fix expanded view position when an RTL language is selected in the system.
Bubble bar and expanded view should be positioned on the left.

Bug: 273310265
Test: enable pseudo RTL language in the settings, observe that expanded
  view is shown on the left
Test: use LTR language, observe that expanded view is on the right

Change-Id: I7acd5157153661388b4050aa6a0035bccfac669b
parent f41e1e48

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java

+5 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.graphics.Region;

import android.graphics.drawable.ColorDrawable;

import android.view.Gravity;

import android.view.TouchDelegate;

import android.view.View;

import android.view.ViewTreeObserver;
@@ -74,10 +75,6 @@ public class BubbleBarLayerView extends FrameLayout 
    private DismissView mDismissView;

    private @Nullable Consumer<String> mUnBubbleConversationCallback;



    // TODO(b/273310265) - currently the view is always on the right, need to update for RTL.

    /** Whether the expanded view is displaying on the left of the screen or not. */

    private boolean mOnLeft = false;



    /** Whether a bubble is expanded. */

    private boolean mIsExpanded = false;
@@ -154,10 +151,10 @@ public class BubbleBarLayerView extends FrameLayout 
        return mIsExpanded;

    }



    // (TODO: b/273310265): BubblePositioner should be source of truth when this work is done.

    // TODO(b/313661121) - when dragging is implemented, check user setting first

    /** Whether the expanded view is positioned on the left or right side of the screen. */

    public boolean isOnLeft() {

        return mOnLeft;

        return getLayoutDirection() == LAYOUT_DIRECTION_RTL;

    }



    /** Shows the expanded view of the provided bubble. */
@@ -216,7 +213,7 @@ public class BubbleBarLayerView extends FrameLayout 
                        return Unit.INSTANCE;

                    });



            addView(mExpandedView, new FrameLayout.LayoutParams(width, height));

            addView(mExpandedView, new LayoutParams(width, height, Gravity.LEFT));

        }



        if (mEducationViewController.isEducationVisible()) {
@@ -311,7 +308,7 @@ public class BubbleBarLayerView extends FrameLayout 
        lp.width = width;

        lp.height = height;

        mExpandedView.setLayoutParams(lp);

        if (mOnLeft) {

        if (isOnLeft()) {

            mExpandedView.setX(mPositioner.getInsets().left + padding);

        } else {

            mExpandedView.setX(mPositioner.getAvailableRect().width() - width - padding);