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

Commit 65171253 authored by Aran Ink's avatar Aran Ink Committed by Automerger Merge Worker
Browse files

Merge "Remove end margin from power menu when overflow button present." into... 

Merge "Remove end margin from power menu when overflow button present." into rvc-dev am: 711d0a9a am: 90f5fd6f

Change-Id: I05cfb5c8d48749b29b888105cd0e88acde5ed1c9
parents 7269a247 90f5fd6f

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);

                }

            }