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

Commit 7ae6785b authored by LuK1337's avatar LuK1337
Browse files

SystemUI: Fix task lock & freeform buttons placement 

* Get rid of hardcoded margin
* Use proper gravity flags for task lock button

Change-Id: Ib864b23f405ad34a56c37e2d9b9d0d391cf4dc8e
parent 84e6fa99

packages/SystemUI/res/layout/recents_task_view_header.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ 
        android:alpha="0"

        android:alpha="0"

        android:visibility="gone" />

        android:visibility="gone" />

    <com.android.systemui.recents.views.FixedSizeImageView

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/dismiss_task"

        android:id="@+id/lock_task"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical|end"

        android:layout_gravity="center_vertical|end"
@@ -66,11 +66,10 @@ 
        android:alpha="0"

        android:alpha="0"

        android:visibility="gone" />

        android:visibility="gone" />

    <com.android.systemui.recents.views.FixedSizeImageView

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/lock_task"

        android:id="@+id/dismiss_task"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/recents_task_view_header_lock_button_padding"

        android:layout_gravity="center_vertical|end"

        android:layout_gravity="end|center"

        android:padding="@dimen/recents_task_view_header_button_padding"

        android:padding="@dimen/recents_task_view_header_button_padding"

        android:src="@drawable/recents_dismiss_light"

        android:src="@drawable/recents_dismiss_light"

        android:background="?android:selectableItemBackground"

        android:background="?android:selectableItemBackground"

packages/SystemUI/res/values/cm_dimens.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -29,6 +29,4 @@ 




    <dimen name="navbar_single_hand_mode_horizontal_threshhold">90dp</dimen>

    <dimen name="navbar_single_hand_mode_horizontal_threshhold">90dp</dimen>

    <dimen name="navbar_single_hand_mode_vertical_threshhold">48dp</dimen>

    <dimen name="navbar_single_hand_mode_vertical_threshhold">48dp</dimen>



    <dimen name="recents_task_view_header_lock_button_padding">48dp</dimen>

</resources>
 
</resources>

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

+13 −4
Original line number Original line Diff line number Diff line
@@ -272,7 +272,8 @@ public class TaskViewHeader extends FrameLayout 
     * we can't get resources based on the current configuration, but instead need to get them

     * we can't get resources based on the current configuration, but instead need to get them

     * based on the device configuration.

     * based on the device configuration.

     */

     */

    private void updateLayoutParams(View icon, View title, View secondaryButton, View button) {

    private void updateLayoutParams(View icon, View title, View secondaryButton,

            View tertiaryButton, View button) {

        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(

        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT, mHeaderBarHeight, Gravity.TOP);

                ViewGroup.LayoutParams.MATCH_PARENT, mHeaderBarHeight, Gravity.TOP);

        setLayoutParams(lp);

        setLayoutParams(lp);
@@ -292,6 +293,13 @@ public class TaskViewHeader extends FrameLayout 
            secondaryButton.setPadding(mHeaderButtonPadding, mHeaderButtonPadding,

            secondaryButton.setPadding(mHeaderButtonPadding, mHeaderButtonPadding,

                    mHeaderButtonPadding, mHeaderButtonPadding);

                    mHeaderButtonPadding, mHeaderButtonPadding);

        }

        }

        if (tertiaryButton != null) {

            lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.END);

            lp.setMarginEnd(2 * mHeaderBarHeight);

            tertiaryButton.setLayoutParams(lp);

            tertiaryButton.setPadding(mHeaderButtonPadding, mHeaderButtonPadding,

                    mHeaderButtonPadding, mHeaderButtonPadding);

        }

        lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.END);

        lp = new FrameLayout.LayoutParams(mHeaderBarHeight, mHeaderBarHeight, Gravity.END);

        button.setLayoutParams(lp);

        button.setLayoutParams(lp);

        button.setPadding(mHeaderButtonPadding, mHeaderButtonPadding, mHeaderButtonPadding,

        button.setPadding(mHeaderButtonPadding, mHeaderButtonPadding, mHeaderButtonPadding,
@@ -324,9 +332,10 @@ public class TaskViewHeader extends FrameLayout 
        if (headerBarHeight != mHeaderBarHeight || headerButtonPadding != mHeaderButtonPadding) {

        if (headerBarHeight != mHeaderBarHeight || headerButtonPadding != mHeaderButtonPadding) {

            mHeaderBarHeight = headerBarHeight;

            mHeaderBarHeight = headerBarHeight;

            mHeaderButtonPadding = headerButtonPadding;

            mHeaderButtonPadding = headerButtonPadding;

            updateLayoutParams(mIconView, mTitleView, mMoveTaskButton, mDismissButton);

            updateLayoutParams(mIconView, mTitleView, mLockTaskButton, mMoveTaskButton,

                    mDismissButton);

            if (mAppOverlayView != null) {

            if (mAppOverlayView != null) {

                updateLayoutParams(mAppIconView, mAppTitleView, null, mAppInfoView);

                updateLayoutParams(mAppIconView, mAppTitleView, null, null, mAppInfoView);

            }

            }

        }

        }

    }

    }
@@ -717,7 +726,7 @@ public class TaskViewHeader extends FrameLayout 
            mAppInfoView = (ImageView) mAppOverlayView.findViewById(R.id.app_info);

            mAppInfoView = (ImageView) mAppOverlayView.findViewById(R.id.app_info);

            mAppInfoView.setOnClickListener(this);

            mAppInfoView.setOnClickListener(this);

            mAppTitleView = (TextView) mAppOverlayView.findViewById(R.id.app_title);

            mAppTitleView = (TextView) mAppOverlayView.findViewById(R.id.app_title);

            updateLayoutParams(mAppIconView, mAppTitleView, null, mAppInfoView);

            updateLayoutParams(mAppIconView, mAppTitleView, null, null, mAppInfoView);

        }

        }





        // Update the overlay contents for the current app

        // Update the overlay contents for the current app