Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aran Ink
2020-04-20 15:03:17 +00:00
committed by Android (Google) Code Review
parent f8448d1538 7c8fea9b13
commit 711d0a9a76
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/global_actions_grid_v2.xml
View File

@@ -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"

10
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

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