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

Commit 00dc6515 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing RTL issues with transition and screen pinning." into nyc-mr1-dev

parents bce1e8c8 96f78f50

packages/SystemUI/res/layout/recents_task_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        android:id="@+id/lock_to_app_fab"

        android:layout_width="@dimen/recents_lock_to_app_size"

        android:layout_height="@dimen/recents_lock_to_app_size"

        android:layout_gravity="bottom|right"

        android:layout_marginRight="15dp"

        android:layout_gravity="bottom|end"

        android:layout_marginEnd="15dp"

        android:layout_marginBottom="15dp"

        android:translationZ="4dp"

        android:contentDescription="@string/recents_lock_to_app_button_label"

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+9 −0
Original line number Diff line number Diff line
@@ -205,9 +205,17 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
    }



    public void onConfigurationChanged() {

        Resources res = mContext.getResources();

        reloadResources();

        mDummyStackView.reloadOnConfigurationChange();

        // Update the header bar direction directly as it is not attached to anything and does not

        // layout except in updateHeaderBarLayout()

        mHeaderBar.setLayoutDirection(res.getConfiguration().getLayoutDirection());

        mHeaderBar.onConfigurationChanged();

        mHeaderBar.forceLayout();

        mHeaderBar.measure(

                MeasureSpec.makeMeasureSpec(mHeaderBar.getMeasuredWidth(), MeasureSpec.EXACTLY),

                MeasureSpec.makeMeasureSpec(mHeaderBar.getMeasuredHeight(), MeasureSpec.EXACTLY));

    }



    /**
@@ -626,6 +634,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
                synchronized (mHeaderBarLock) {

                    if (mHeaderBar.getMeasuredWidth() != taskViewWidth ||

                            mHeaderBar.getMeasuredHeight() != mTaskBarHeight) {

                        mHeaderBar.forceLayout();

                        mHeaderBar.measure(

                                MeasureSpec.makeMeasureSpec(taskViewWidth, MeasureSpec.EXACTLY),

                                MeasureSpec.makeMeasureSpec(mTaskBarHeight, MeasureSpec.EXACTLY));