SystemUI: runtime configurable audio panel location
* Updates for twelve (bgcngm / Arian)
* Adapt to new UI
* Updates for eleven (LuK1337):
* Disable on TVs
* Simplify changes once again.
* Updates for ten (sam3000):
* Squash in tuner service settings reset blacklist.
* Remove layout xml changes that aren't needed.
* Apply slide in/out animations to landscape too
(they work fine).
* Few other simplifications.
* Placement is now determined at runtime by a lineage setting.
Use TunerService to track settings change.
Various cleanup and fix formatting.
Fixed left/right gravity on expand arrow and ringer.
Fix commit author.
(sam3000)
This is a squashed and adapted commit of the following patches:
----
From cf187bd54fbd807e16b0ac3593e839008efd302e Mon Sep 17 00:00:00 2001
From: "a.derendyaev" <a.derendyaev@magdv.com>
Date: Wed, 19 Dec 2018 21:57:45 +0800
Subject: [PATCH] SystemUI: allow devices override audio panel location
Some devices have volume buttons on left side and it not fancy if volume panel will be at right side.
You can override panel location using overlay for SystemUI:
<!-- Allow devices override audio panel location to the left side -->
<bool name="config_audioPanelOnLeftSide">true</bool>
Change-Id: I8a2302867010b0e6a02efa68df57e534ce7bbf46
Signed-off-by: Jagrav Naik <jagravnaik0@gmail.com>
Signed-off-by: Anirudh Gupta <anirudhgupta109@gmail.com>
----
From 9d0ff1efd26961a4f14d0821f50ebe80c2a65ff9 Mon Sep 17 00:00:00 2001
From: Alex Cruz <alex@dirtyunicorns.com>
Date: Fri, 21 Dec 2018 22:08:52 -0600
Subject: [PATCH] Volume panel: Do the same with less
Use common volume_dialog layout for both left- and right-aligned panel
[@TheDorkKnightRises - POSP]
- Tweak padding values to make them uniform across both alignments
- Remove redundant comment
Change-Id: If41456f71ffd18466166e7b4120ff34d9e6f5a46
Signed-off-by: Josh Fox (XlxFoXxlX) <joshfox87@gmail.com>
----
Author: Sam Mortimer <sam@mortimer.me.uk>
Date: Sun Jun 9 13:33:05 2019 -0700
SystemUI: Blacklist volume panel on left setting from tuner reset
Change-Id: I47ddb3b818cfa3548fef42fa686d0991e2a35605
Author: programminghoch10 <hoch10@kabelbw.de>
Date: Mon Jul 12 17:55:28 2021 +0200
SystemUI: VolumeDialogImpl: Fix volume panel permanently visible
* The Volume Panel is permanently visible when changing the panel side while the panel is open until SystemUI is restarted
* This change removes the Panel View when changing the panel side
Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/3482
Change-Id: Ic3ca5a196315e96024121c995cc6282fb74f6e4c
Change-Id: I666420e97f0c7b4435c69ca773631e2d9e738a14
diff --git a/packages/SystemUI/res/layout-land/volume_dialog.xml b/packages/SystemUI/res/layout-land/volume_dialog.xml
index 5ce2601..4834a7b 100644
--- a/packages/SystemUI/res/layout-land/volume_dialog.xml
+++ b/packages/SystemUI/res/layout-land/volume_dialog.xml
@@ -25,14 +25,14 @@
android:background="@android:color/transparent"
android:theme="@style/volume_dialog_theme">
- <!-- right-aligned to be physically near volume button -->
<LinearLayout
android:id="@+id/volume_dialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_gravity="right"
- android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"
+ android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding_horizontal"
+ android:paddingRight="@dimen/volume_dialog_panel_transparent_padding_horizontal"
android:orientation="vertical"
android:clipToPadding="false"
android:clipChildren="false">
@@ -141,6 +141,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom | right"
- android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>
+ android:layout_marginLeft="@dimen/volume_tool_tip_horizontal_margin"
+ android:layout_marginRight="@dimen/volume_tool_tip_horizontal_margin"/>
</FrameLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 39a1f1f..3fe54e0 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -25,14 +25,14 @@
android:clipToPadding="false"
android:theme="@style/volume_dialog_theme">
- <!-- right-aligned to be physically near volume button -->
<LinearLayout
android:id="@+id/volume_dialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_gravity="right"
- android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"
+ android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding_horizontal"
+ android:paddingRight="@dimen/volume_dialog_panel_transparent_padding_horizontal"
android:orientation="vertical"
android:clipToPadding="false"
android:clipChildren="false">
@@ -140,6 +140,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom | right"
- android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>
+ android:layout_marginLeft="@dimen/volume_tool_tip_horizontal_margin"
+ android:layout_marginRight="@dimen/volume_tool_tip_horizontal_margin"/>
</FrameLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index baff9f6..9a93829 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -23,4 +23,7 @@
<string name="quick_settings_powershare_off_powersave_label">Wireless PowerShare off\nBattery saver</string>
<string name="quick_settings_powershare_off_low_battery_label">Wireless PowerShare off\nBattery too low</string>
<string name="quick_settings_powershare_enabled_label">Wireless PowerShare is enabled</string>
+
+ <!-- Allow devices override audio panel location to the left side -->
+ <bool name="config_audioPanelOnLeftSide">false</bool>
</resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index b947801..4108342 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -557,7 +557,7 @@
<dimen name="brightness_mirror_height">48dp</dimen>
- <dimen name="volume_dialog_panel_transparent_padding_right">8dp</dimen>
+ <dimen name="volume_dialog_panel_transparent_padding_horizontal">8dp</dimen>
<dimen name="volume_dialog_panel_transparent_padding">20dp</dimen>
@@ -596,7 +596,7 @@
<dimen name="volume_dialog_background_blur_radius">0dp</dimen>
- <dimen name="volume_tool_tip_right_margin">76dp</dimen>
+ <dimen name="volume_tool_tip_horizontal_margin">76dp</dimen>
<dimen name="volume_tool_tip_arrow_corner_radius">2dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 9461dbc..3fc0779 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -98,6 +98,7 @@
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.animation.DecelerateInterpolator;
+import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -285,6 +286,9 @@
private ViewStub mODICaptionsTooltipViewStub;
@VisibleForTesting View mODICaptionsTooltipView = null;
+ // Volume panel placement left or right
+ private boolean mVolumePanelOnLeft;
+
private final boolean mUseBackgroundBlur;
private Consumer<Boolean> mCrossWindowBlurEnabledListener;
private BackgroundBlurDrawable mDialogRowsViewBackground;
@@ -370,6 +374,10 @@
};
}
+ if (!mShowActiveStreamOnly) {
+ mVolumePanelOnLeft = mContext.getResources().getBoolean(R.bool.config_audioPanelOnLeftSide);;
+ }
+
initDimens();
mOrientation = mContext.getResources().getConfiguration().orientation;
@@ -460,8 +468,8 @@
final int[] locInWindow = new int[2];
view.getLocationInWindow(locInWindow);
- float x = locInWindow[0];
- float y = locInWindow[1];
+ float xExtraSize = 0;
+ float yExtraSize = 0;
// The ringer and rows container has extra height at the top to fit the expanded ringer
// drawer. This area should not be touchable unless the ringer drawer is open.
@@ -469,18 +477,27 @@
// are multiple rows they are touchable.
if (view == mTopContainer && !mIsRingerDrawerOpen) {
if (!isLandscape()) {
- y += getRingerDrawerOpenExtraSize();
+ yExtraSize = getRingerDrawerOpenExtraSize();
} else if (getRingerDrawerOpenExtraSize() > getVisibleRowsExtraSize()) {
- x += (getRingerDrawerOpenExtraSize() - getVisibleRowsExtraSize());
+ xExtraSize = (getRingerDrawerOpenExtraSize() - getVisibleRowsExtraSize());
}
}
- mTouchableRegion.op(
- (int) x,
- (int) y,
- locInWindow[0] + view.getWidth(),
- locInWindow[1] + view.getHeight(),
- Region.Op.UNION);
+ if (mVolumePanelOnLeft) {
+ mTouchableRegion.op(
+ locInWindow[0],
+ locInWindow[1] + (int) yExtraSize,
+ locInWindow[0] + view.getWidth() - (int) xExtraSize,
+ locInWindow[1] + view.getHeight(),
+ Region.Op.UNION);
+ } else {
+ mTouchableRegion.op(
+ locInWindow[0] + (int) xExtraSize,
+ locInWindow[1] + (int) yExtraSize,
+ locInWindow[0] + view.getWidth(),
+ locInWindow[1] + view.getHeight(),
+ Region.Op.UNION);
+ }
}
private void initDialog(int lockTaskModeState) {
@@ -510,6 +527,10 @@
lp.windowAnimations = -1;
mOriginalGravity = mContext.getResources().getInteger(R.integer.volume_dialog_gravity);
+ if (!mShowActiveStreamOnly) {
+ mOriginalGravity &= ~(Gravity.LEFT | Gravity.RIGHT);
+ mOriginalGravity |= mVolumePanelOnLeft ? Gravity.LEFT : Gravity.RIGHT;
+ }
mWindowGravity = Gravity.getAbsoluteGravity(mOriginalGravity,
mContext.getResources().getConfiguration().getLayoutDirection());
lp.gravity = mWindowGravity;
@@ -665,6 +686,34 @@
mSettingsView = mDialog.findViewById(R.id.settings_container);
mSettingsIcon = mDialog.findViewById(R.id.settings);
+ if (mVolumePanelOnLeft) {
+ if (mRingerAndDrawerContainer != null) {
+ mRingerAndDrawerContainer.setLayoutDirection(LAYOUT_DIRECTION_RTL);
+ }
+
+ ViewGroup container = mDialog.findViewById(R.id.volume_dialog_container);
+ setGravity(container, Gravity.LEFT);
+ setLayoutGravity(container, Gravity.LEFT);
+
+ setGravity(mDialogView, Gravity.LEFT);
+ setLayoutGravity(mDialogView, Gravity.LEFT);
+
+ setGravity((ViewGroup) mTopContainer, Gravity.LEFT);
+
+ setLayoutGravity(mSelectedRingerContainer, Gravity.BOTTOM | Gravity.LEFT);
+
+ setLayoutGravity(mRingerDrawerNewSelectionBg, Gravity.BOTTOM | Gravity.LEFT);
+
+ setGravity(mRinger, Gravity.LEFT);
+ setLayoutGravity(mRinger, Gravity.BOTTOM | Gravity.LEFT);
+
+ setGravity(mDialogRowsViewContainer, Gravity.LEFT);
+ setLayoutGravity(mDialogRowsViewContainer, Gravity.LEFT);
+
+ setGravity(mODICaptionsView, Gravity.LEFT);
+ setLayoutGravity(mODICaptionsView, Gravity.LEFT);
+ }
+
if (mRows.isEmpty()) {
if (!AudioSystem.isSingleVolume(mContext)) {
addRow(STREAM_ACCESSIBILITY, R.drawable.ic_volume_accessibility,
@@ -718,6 +767,25 @@
mRingerCount = mShowVibrate ? 3 : 2;
}
+ // Helper to set gravity.
+ private void setGravity(ViewGroup viewGroup, int gravity) {
+ if (viewGroup instanceof LinearLayout) {
+ ((LinearLayout) viewGroup).setGravity(gravity);
+ }
+ }
+
+ // Helper to set layout gravity.
+ private void setLayoutGravity(ViewGroup viewGroup, int gravity) {
+ if (viewGroup != null) {
+ Object obj = viewGroup.getLayoutParams();
+ if (obj instanceof FrameLayout.LayoutParams) {
+ ((FrameLayout.LayoutParams) obj).gravity = gravity;
+ } else if (obj instanceof LinearLayout.LayoutParams) {
+ ((LinearLayout.LayoutParams) obj).gravity = gravity;
+ }
+ }
+ }
+
protected ViewGroup getDialogView() {
return mDialogView;
}
@@ -931,6 +999,12 @@
mDialogView.getPaddingTop(),
mDialogView.getPaddingRight(),
mDialogView.getPaddingBottom() + getRingerDrawerOpenExtraSize());
+ } else if (mVolumePanelOnLeft) {
+ mDialogView.setPadding(
+ mDialogView.getPaddingLeft(),
+ mDialogView.getPaddingTop(),
+ mDialogView.getPaddingRight() + getRingerDrawerOpenExtraSize(),
+ mDialogView.getPaddingBottom());
} else {
mDialogView.setPadding(
mDialogView.getPaddingLeft() + getRingerDrawerOpenExtraSize(),
@@ -1001,15 +1075,22 @@
}
/**
- * Translation to apply form the origin (either top or left) to overlap the selection background
- * with the given mode in the drawer.
+ * Translation to apply form the origin (either top or left/right) to overlap the selection
+ * background with the given mode in the drawer.
*/
private float getTranslationInDrawerForRingerMode(int mode) {
- return mode == RINGER_MODE_VIBRATE
+ return (mode == RINGER_MODE_VIBRATE
? -mRingerDrawerItemSize * 2
: mode == RINGER_MODE_SILENT
? -mRingerDrawerItemSize
- : 0;
+ : 0)
+ * (isLandscape()
+ ? getTranslationForPanelLocation()
+ : 1);
+ }
+
+ private float getTranslationForPanelLocation() {
+ return mVolumePanelOnLeft ? -1 : 1;
}
@VisibleForTesting String getSelectedRingerContainerDescription() {
@@ -1053,12 +1134,13 @@
getTranslationInDrawerForRingerMode(mState.ringerModeInternal));
}
- // Move the drawer so that the top/rightmost ringer choice overlaps with the selected ringer
+ // Move the drawer so that the top/outmost ringer choice overlaps with the selected ringer
// icon.
if (!isLandscape()) {
mRingerDrawerContainer.setTranslationY(mRingerDrawerItemSize * (mRingerCount - 1));
} else {
- mRingerDrawerContainer.setTranslationX(mRingerDrawerItemSize * (mRingerCount - 1));
+ mRingerDrawerContainer.setTranslationX(
+ getTranslationForPanelLocation() * mRingerDrawerItemSize * (mRingerCount - 1));
}
mRingerDrawerContainer.setAlpha(0f);
mRingerDrawerContainer.setVisibility(VISIBLE);
@@ -1135,7 +1217,7 @@
.start();
} else {
mRingerDrawerContainer.animate()
- .translationX(mRingerDrawerItemSize * 2)
+ .translationX(getTranslationForPanelLocation() * mRingerDrawerItemSize * 2)
.start();
}
@@ -1656,8 +1738,10 @@
trimObsoleteH();
}
+ boolean isOutmostIndexMax = mVolumePanelOnLeft ? isRtl() : !isRtl();
+
// Index of the last row that is actually visible.
- int rightmostVisibleRowIndex = !isRtl() ? -1 : Short.MAX_VALUE;
+ int outmostVisibleRowIndex = isOutmostIndexMax ? -1 : Short.MAX_VALUE;
// apply changes to all rows
for (final VolumeRow row : mRows) {
@@ -1666,14 +1750,11 @@
Util.setVisOrGone(row.view, shouldBeVisible);
if (shouldBeVisible && mRingerAndDrawerContainerBackground != null) {
- // For RTL, the rightmost row has the lowest index since child views are laid out
+ // For RTL, the outmost row has the lowest index since child views are laid out
// from right to left.
- rightmostVisibleRowIndex =
- !isRtl()
- ? Math.max(rightmostVisibleRowIndex,
- mDialogRowsView.indexOfChild(row.view))
- : Math.min(rightmostVisibleRowIndex,
- mDialogRowsView.indexOfChild(row.view));
+ outmostVisibleRowIndex = isOutmostIndexMax
+ ? Math.max(outmostVisibleRowIndex, mDialogRowsView.indexOfChild(row.view))
+ : Math.min(outmostVisibleRowIndex, mDialogRowsView.indexOfChild(row.view));
// Add spacing between each of the visible rows - we'll remove the spacing from the
// last row after the loop.
@@ -1681,7 +1762,7 @@
if (layoutParams instanceof LinearLayout.LayoutParams) {
final LinearLayout.LayoutParams linearLayoutParams =
((LinearLayout.LayoutParams) layoutParams);
- if (!isRtl()) {
+ if (isOutmostIndexMax) {
linearLayoutParams.setMarginEnd(mRingerRowsPadding);
} else {
linearLayoutParams.setMarginStart(mRingerRowsPadding);
@@ -1699,8 +1780,8 @@
}
}
- if (rightmostVisibleRowIndex > -1 && rightmostVisibleRowIndex < Short.MAX_VALUE) {
- final View lastVisibleChild = mDialogRowsView.getChildAt(rightmostVisibleRowIndex);
+ if (outmostVisibleRowIndex > -1 && outmostVisibleRowIndex < Short.MAX_VALUE) {
+ final View lastVisibleChild = mDialogRowsView.getChildAt(outmostVisibleRowIndex);
final ViewGroup.LayoutParams layoutParams = lastVisibleChild.getLayoutParams();
// Remove the spacing on the last row, and remove its background since the container is
// drawing a background for this row.
@@ -2228,6 +2309,9 @@
final Rect bounds = mRingerAndDrawerContainerBackground.copyBounds();
if (!isLandscape()) {
bounds.top = (int) (mRingerDrawerClosedAmount * getRingerDrawerOpenExtraSize());
+ } else if (mVolumePanelOnLeft) {
+ bounds.right = (int) ((mDialogCornerRadius / 2) + mRingerDrawerItemSize
+ + (1f - mRingerDrawerClosedAmount) * getRingerDrawerOpenExtraSize());
} else {
bounds.left = (int) (mRingerDrawerClosedAmount * getRingerDrawerOpenExtraSize());
}
@@ -2235,7 +2319,7 @@
}
/*
- * The top container is responsible for drawing the solid color background behind the rightmost
+ * The top container is responsible for drawing the solid color background behind the outmost
* (primary) volume row. This is because the volume drawer animates in from below, initially
* overlapping the primary row. We need the drawer to draw below the row's SeekBar, since it
* looks strange to overlap it, but above the row's background color, since otherwise it will be
@@ -2269,8 +2353,9 @@
? mDialogRowsViewContainer.getTop()
: mDialogRowsViewContainer.getTop() - mDialogCornerRadius);
- // Set gravity to top-right, since additional rows will be added on the left.
- background.setLayerGravity(0, Gravity.TOP | Gravity.RIGHT);
+ // Set gravity to top and opposite side where additional rows will be added.
+ background.setLayerGravity(
+ 0, mVolumePanelOnLeft ? Gravity.TOP | Gravity.LEFT : Gravity.TOP | Gravity.RIGHT);
// In landscape, the ringer drawer animates out to the left (instead of down). Since the
// drawer comes from the right (beyond the bounds of the dialog), we should clip it so it