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

Commit 7c8fea9b authored by Aran Ink's avatar Aran Ink
Browse files

Remove end margin from power menu when overflow button present. 

Test: Manual -- extra margin not present when overflow button is shown, but returns if the button is not. Turning bug report shortcut on and off is an easy way to go above/below the overflow threshold.

Bug: 152624388
Change-Id: I5c3464c74599524ec322052bb98fb468f6e67db7
parent a65e6836

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
      android:clipChildren="false"

      android:clipToPadding="false"

      android:layout_marginTop="@dimen/global_actions_top_margin"

      android:layout_marginLeft="@dimen/global_actions_side_margin"

      android:layout_marginRight="@dimen/global_actions_side_margin"

      android:layout_marginStart="@dimen/global_actions_side_margin"

  >

    <LinearLayout

        android:id="@android:id/list"

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

+10 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import android.widget.BaseAdapter; 
import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.ImageView.ScaleType;

import android.widget.LinearLayout;

import android.widget.ListPopupWindow;

import android.widget.ListView;

import android.widget.TextView;
@@ -2053,8 +2054,17 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            if (overflowButton != null) {

                if (mOverflowAdapter.getCount() > 0) {

                    overflowButton.setOnClickListener((view) -> showPowerOverflowMenu());

                    LinearLayout.LayoutParams params =

                            (LinearLayout.LayoutParams) mGlobalActionsLayout.getLayoutParams();

                    params.setMarginEnd(0);

                    mGlobalActionsLayout.setLayoutParams(params);

                } else {

                    overflowButton.setVisibility(View.GONE);

                    LinearLayout.LayoutParams params =

                            (LinearLayout.LayoutParams) mGlobalActionsLayout.getLayoutParams();

                    params.setMarginEnd(mContext.getResources().getDimensionPixelSize(

                            com.android.systemui.R.dimen.global_actions_side_margin));

                    mGlobalActionsLayout.setLayoutParams(params);

                }

            }