Allow the width of the notification panel to be adjusted separately from
the quick settings panel.
Also, introduce the option to allow the clipping that the panel by
default does to be disabled. This allows the items in the panel to be
swiped beyond the edges of the panel.
Test: booted up on AAE headunit and Angler device.
Change-Id: I8d8f501f98fea5c1c85541099df4ca34d10fc648
diff --git a/packages/SystemUI/res/layout/brightness_mirror.xml b/packages/SystemUI/res/layout/brightness_mirror.xml
index bbaff6a..d6e7507 100644
--- a/packages/SystemUI/res/layout/brightness_mirror.xml
+++ b/packages/SystemUI/res/layout/brightness_mirror.xml
@@ -16,7 +16,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/brightness_mirror"
- android:layout_width="@dimen/notification_panel_width"
+ android:layout_width="@dimen/qs_panel_width"
android:layout_height="wrap_content"
android:layout_gravity="@integer/notification_panel_layout_gravity"
android:visibility="invisible">
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index e603c9f..8db00b0 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -41,7 +41,7 @@
<FrameLayout
android:id="@+id/qs_frame"
android:layout="@layout/qs_panel"
- android:layout_width="@dimen/notification_panel_width"
+ android:layout_width="@dimen/qs_panel_width"
android:layout_height="match_parent"
android:layout_gravity="@integer/notification_panel_layout_gravity"
android:clipToPadding="false"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index ae125b5..a98afa9 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -69,10 +69,6 @@
<!-- Height of a small notification in the status bar-->
<dimen name="notification_min_height">92dp</dimen>
- <!-- Width of each individual notification in the notification panel. MATCH_PARENT in this
- case means the notifications will be measured with its parent's MeasureSpec. -->
- <dimen name="notification_child_width">@dimen/match_parent</dimen>
-
<!-- Increased height of a small notification in the status bar -->
<dimen name="notification_min_height_increased">132dp</dimen>
@@ -209,6 +205,9 @@
<dimen name="notification_panel_width">@dimen/match_parent</dimen>
+ <!-- The width of the panel that holds the quick settings. -->
+ <dimen name="qs_panel_width">@dimen/notification_panel_width</dimen>
+
<dimen name="volume_dialog_panel_width">@dimen/standard_notification_panel_width</dimen>
<!-- Gravity for the notification panel -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index 6a1f470..efe5e0c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -24,8 +24,8 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
-import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
import com.android.systemui.statusbar.stack.ExpandableViewState;
+import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
import com.android.systemui.statusbar.stack.StackScrollState;
import java.util.ArrayList;
@@ -355,7 +355,7 @@
if (mClipToActualHeight) {
int top = getClipTopAmount();
mClipRect.set(0, top, getWidth(), Math.max(getActualHeight() + getExtraBottomPadding()
- - mClipBottomAmount, top));
+ - mClipBottomAmount, top));
setClipBounds(mClipRect);
} else {
setClipBounds(null);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 7465f19..f9cf67c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
@@ -287,16 +288,18 @@
}
public void updateResources() {
- int panelWidth = getResources().getDimensionPixelSize(R.dimen.notification_panel_width);
+ Resources res = getResources();
+ int qsWidth = res.getDimensionPixelSize(R.dimen.qs_panel_width);
int panelGravity = getResources().getInteger(R.integer.notification_panel_layout_gravity);
FrameLayout.LayoutParams lp =
(FrameLayout.LayoutParams) mQsFrame.getLayoutParams();
- if (lp.width != panelWidth || lp.gravity != panelGravity) {
- lp.width = panelWidth;
+ if (lp.width != qsWidth || lp.gravity != panelGravity) {
+ lp.width = qsWidth;
lp.gravity = panelGravity;
mQsFrame.setLayoutParams(lp);
}
+ int panelWidth = res.getDimensionPixelSize(R.dimen.notification_panel_width);
lp = (FrameLayout.LayoutParams) mNotificationStackScroller.getLayoutParams();
if (lp.width != panelWidth || lp.gravity != panelGravity) {
lp.width = panelWidth;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
index c85584e..906a23e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
@@ -85,7 +85,7 @@
private void reloadWidth(View view) {
LayoutParams params = (LayoutParams) view.getLayoutParams();
params.width = getContext().getResources().getDimensionPixelSize(
- R.dimen.notification_panel_width);
+ R.dimen.qs_panel_width);
view.setLayoutParams(params);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
index 21d03fd..ad406c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
@@ -109,7 +109,7 @@
FrameLayout.LayoutParams lp =
(FrameLayout.LayoutParams) mBrightnessMirror.getLayoutParams();
lp.width = mBrightnessMirror.getResources().getDimensionPixelSize(
- R.dimen.notification_panel_width);
+ R.dimen.qs_panel_width);
lp.gravity = mBrightnessMirror.getResources().getInteger(
R.integer.notification_panel_layout_gravity);
mBrightnessMirror.setLayoutParams(lp);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 859c435..7349ee4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -151,13 +151,6 @@
private int mBottomInset = 0;
/**
- * The width of each child View in this layout. A value of -1 or
- * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT} will make it so that the children
- * match this View's width.
- */
- private int mChildWidth;
-
- /**
* The algorithm which calculates the properties for our children
*/
protected final StackScrollAlgorithm mStackScrollAlgorithm;
@@ -400,7 +393,6 @@
mBgColor = context.getColor(R.color.notification_shade_background_color);
int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);
- mChildWidth = res.getDimensionPixelSize(R.dimen.notification_child_width);
mExpandHelper = new ExpandHelper(getContext(), this,
minHeight, maxHeight);
mExpandHelper.setEventSource(this);
@@ -550,18 +542,11 @@
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- // If the children want to match the parent's width, then simply pass this View's width
- // MeasureSpec. It should contain the width to measure at.
- int childWidthSpec = mChildWidth == LayoutParams.MATCH_PARENT
- ? widthMeasureSpec
- : MeasureSpec.makeMeasureSpec(mChildWidth, MeasureSpec.EXACTLY);
-
// We need to measure all children even the GONE ones, such that the heights are calculated
// correctly as they are used to calculate how many we can fit on the screen.
final int size = getChildCount();
for (int i = 0; i < size; i++) {
- measureChild(getChildAt(i), childWidthSpec, heightMeasureSpec);
+ measureChild(getChildAt(i), widthMeasureSpec, heightMeasureSpec);
}
}