From 1e8f65d9895d1be27d6e537eb2fce7ea0dd41666 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 6 Jun 2012 18:08:56 -0400
Subject: [PATCH] apply Jellybean styling to tablet system bar and panel

Bug: 6546070
Change-Id: I933883857747931388026e0beefcf092a00d531a
---
 .../notify_panel_notify_bg.9.png              | Bin 3714 -> 0 bytes
 .../notify_panel_notify_bg.9.png              | Bin 2202 -> 0 bytes
 .../notify_panel_notify_bg.9.png              | Bin 5960 -> 0 bytes
 .../layout/system_bar_notification_area.xml   |  22 +--
 .../layout/system_bar_notification_panel.xml  |  82 ++++----
 .../system_bar_notification_panel_title.xml   |  78 ++++----
 .../SystemUI/res/values-sw720dp/styles.xml    |  20 ++
 .../systemui/statusbar/tablet/HoloClock.java  | 178 ------------------
 .../statusbar/tablet/NotificationPanel.java   |  46 ++++-
 .../tablet/NotificationPanelTitle.java        |  25 +++
 10 files changed, 169 insertions(+), 282 deletions(-)
 delete mode 100644 packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png
 delete mode 100644 packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png
 delete mode 100644 packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png
 delete mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java

diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_notify_bg.9.png
deleted file mode 100644
index 6cb76649b2847375cc20dbcaeb220af39dfa1efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3714
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

diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_notify_bg.9.png
deleted file mode 100644
index e4c9dc176c2b4045f2df0d1d76b9ca4d49c7b238..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2202
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

diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_notify_bg.9.png
deleted file mode 100644
index 1f02714e789ed3a48d8e76ec1b9b98beb97732b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5960
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

diff --git a/packages/SystemUI/res/layout/system_bar_notification_area.xml b/packages/SystemUI/res/layout/system_bar_notification_area.xml
index 739f3aa25fe20..a59dad2a64551 100644
--- a/packages/SystemUI/res/layout/system_bar_notification_area.xml
+++ b/packages/SystemUI/res/layout/system_bar_notification_area.xml
@@ -78,22 +78,16 @@
         android:layout_height="match_parent"
         android:gravity="center"
         >
-        <com.android.systemui.statusbar.tablet.HoloClock
+        <com.android.systemui.statusbar.policy.Clock
             android:id="@+id/clock"
+            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="3dip"
-            android:layout_marginLeft="8dip"
-            android:layout_marginRight="4dip"
-            >
-            <TextView android:id="@+id/time_solid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-                android:singleLine="true"
-                android:textSize="40sp"
-                />
-        </com.android.systemui.statusbar.tablet.HoloClock>
+            android:layout_height="match_parent"
+            android:singleLine="true"
+            android:paddingLeft="6dip"
+            android:layout_marginRight="8dip"
+            android:gravity="center_vertical|left"
+            />
 
         <TextView
             android:id="@+id/network_text"
diff --git a/packages/SystemUI/res/layout/system_bar_notification_panel.xml b/packages/SystemUI/res/layout/system_bar_notification_panel.xml
index 55795050db23b..48a188b02ad5b 100644
--- a/packages/SystemUI/res/layout/system_bar_notification_panel.xml
+++ b/packages/SystemUI/res/layout/system_bar_notification_panel.xml
@@ -18,69 +18,57 @@
 <com.android.systemui.statusbar.tablet.NotificationPanel
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
-    android:id="@+id/panel_root"
+    android:id="@+id/content_parent"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:gravity="right"
     >
 
-    <ImageView android:id="@+id/clear_all_button"
-        android:layout_width="wrap_content"
-        android:layout_height="@*android:dimen/system_bar_height"
+    <!-- lift the panel up off the status bar while leaving a touchable are -->
+    <Space
+        android:id="@+id/system_bar_notification_panel_bottom_space"
+        android:layout_height="56dp"
+        android:layout_width="478dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="20dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:src="@drawable/ic_notify_clear"
-        android:visibility="invisible"
-        android:contentDescription="@string/accessibility_clear_all"
         />
 
-    <RelativeLayout
-        android:id="@+id/content_parent"
+    <LinearLayout
+        android:id="@+id/content_frame"
+        android:background="@drawable/notification_panel_bg"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_alignParentBottom="true"
+        android:layout_width="478dp"
+        android:orientation="vertical"
         android:layout_alignParentRight="true"
-        android:layout_marginBottom="8dp"
+        android:layout_above="@id/system_bar_notification_panel_bottom_space"
+        android:paddingBottom="8dp"
         >
 
         <include layout="@layout/system_bar_notification_panel_title"
-            android:layout_width="478dp"
-            android:layout_height="224dp"
-            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="130dp"
+            android:layout_above="@id/content_frame"
             android:layout_alignParentRight="true"
+            android:layout_weight="0"
             />
 
-        <LinearLayout
-            android:id="@+id/content_frame"
-            android:background="@drawable/notify_panel_notify_bg"
-            android:layout_height="wrap_content"
-            android:layout_width="478dp"
-            android:orientation="vertical"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="178dp"
-            >
-            <ScrollView
-                android:id="@+id/notification_scroller"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_weight="1"
-                >
-                <com.android.systemui.statusbar.policy.NotificationRowLayout
-                    android:id="@+id/content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal|bottom"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:descendantFocusability="afterDescendants"
-                    systemui:rowHeight="@dimen/notification_row_min_height"
-                    />
-            </ScrollView>
-        </LinearLayout>
-    </RelativeLayout>
+        <ScrollView
 
+            android:id="@+id/notification_scroller"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+            >
+            <com.android.systemui.statusbar.policy.NotificationRowLayout
+                android:id="@+id/content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal|bottom"
+                android:clickable="true"
+                android:focusable="true"
+                android:descendantFocusability="afterDescendants"
+                systemui:rowHeight="@dimen/notification_row_min_height"
+                />
+        </ScrollView>
+    </LinearLayout>
 </com.android.systemui.statusbar.tablet.NotificationPanel>
diff --git a/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
index b985aaf81ba19..afe3b49aef1a9 100644
--- a/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
+++ b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
@@ -18,11 +18,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     android:id="@+id/title_area"
+    android:background="@color/notification_panel_solid_background"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clickable="true"
     android:orientation="vertical"
-    android:background="@drawable/notify_panel_clock_bg"
+    android:paddingLeft="26dp"
+    android:paddingTop="14dp"
+    android:paddingRight="26dp"
     >
 
     <TableLayout
@@ -31,7 +34,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:shrinkColumns="2,4"
@@ -167,7 +169,6 @@
                     android:id="@+id/settings_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="16dp"
                     android:src="@drawable/ic_sysbar_quicksettings"
                     android:contentDescription="@string/accessibility_settings_button"
                     />
@@ -176,7 +177,6 @@
                     android:id="@+id/notification_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="16dp"
                     android:src="@drawable/ic_notification_open"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_notifications_button"
@@ -186,40 +186,46 @@
         </TableRow>
     </TableLayout>
 
-    <com.android.systemui.statusbar.tablet.HoloClock
-        android:id="@+id/clock"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="16dip"
+        android:paddingTop="@dimen/notification_panel_header_padding_top"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:baselineAligned="false"
         >
-        <TextView android:id="@+id/time_bg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textSize="92sp"
-            android:textColor="#ffffff" />
-        <TextView android:id="@+id/time_fg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textSize="92sp"
-            android:textColor="#ffffff" />
-    </com.android.systemui.statusbar.tablet.HoloClock>
 
-    <com.android.systemui.statusbar.policy.DateView
-        android:id="@+id/date"
-        style="@style/StatusBarNotificationText"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignBottom="@id/clock"
-        android:layout_alignParentLeft="true"
-        android:gravity="left"
-        android:layout_marginLeft="16dp"
-        android:textColor="#ffffff"
-        />
+        <com.android.systemui.statusbar.policy.Clock
+            android:id="@+id/clock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
+            />
+    
+        <com.android.systemui.statusbar.policy.DateView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
+            />
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            />
+
+        <ImageView android:id="@+id/clear_all_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="center"
+            android:src="@drawable/ic_notify_clear"
+            android:contentDescription="@string/accessibility_clear_all"
+            />
+    </LinearLayout>
 </com.android.systemui.statusbar.tablet.NotificationPanelTitle>
diff --git a/packages/SystemUI/res/values-sw720dp/styles.xml b/packages/SystemUI/res/values-sw720dp/styles.xml
index f3d4a0f88b920..684258ae633ef 100644
--- a/packages/SystemUI/res/values-sw720dp/styles.xml
+++ b/packages/SystemUI/res/values-sw720dp/styles.xml
@@ -51,4 +51,24 @@
         <item name="android:background">@android:drawable/divider_horizontal_dark</item>
     </style>
 
+    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
+        <item name="android:textSize">30dp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@android:color/holo_blue_light</item>
+    </style>
+
+    <style name="TextAppearance.StatusBar.Expanded.Clock">
+        <item name="android:textSize">48dp</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#ffffff</item>
+    </style>
+
+    <style name="TextAppearance.StatusBar.Expanded.Date">
+        <item name="android:textSize">14dp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#666666</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java
deleted file mode 100644
index f98caa2abe78b..0000000000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HoloClock.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.statusbar.tablet;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.format.DateFormat;
-import android.text.style.CharacterStyle;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.StyleSpan;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.TimeZone;
-
-import com.android.systemui.R;
-
-public class HoloClock extends FrameLayout {
-    private boolean mAttached;
-    private Calendar mCalendar;
-    private String mClockFormatString;
-    private SimpleDateFormat mClockFormat;
-
-    private static final String FONT_DIR = "/system/fonts/";
-    private static final String CLOCK_FONT = FONT_DIR + "AndroidClock_Solid.ttf";
-    private static final String CLOCK_FG_FONT = FONT_DIR + "AndroidClock.ttf";
-    private static final String CLOCK_BG_FONT = FONT_DIR + "AndroidClock_Highlight.ttf";
-
-    private static Typeface sBackgroundType, sForegroundType, sSolidType;
-    private TextView mSolidText, mBgText, mFgText;
-
-    public HoloClock(Context context) {
-        this(context, null);
-    }
-
-    public HoloClock(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public HoloClock(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        if (sSolidType == null) {
-            sSolidType = Typeface.createFromFile(CLOCK_FONT);
-            sBackgroundType = Typeface.createFromFile(CLOCK_BG_FONT);
-            sForegroundType = Typeface.createFromFile(CLOCK_FG_FONT);
-        }
-        mBgText = (TextView) findViewById(R.id.time_bg);
-        if (mBgText != null) {
-            mBgText.setTypeface(sBackgroundType);
-            mBgText.setVisibility(View.INVISIBLE);
-        }
-
-        mFgText = (TextView) findViewById(R.id.time_fg);
-        if (mFgText != null) {
-            mFgText.setTypeface(sForegroundType);
-        }
-        mSolidText = (TextView) findViewById(R.id.time_solid);
-        if (mSolidText != null) {
-            mSolidText.setTypeface(sSolidType);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        if (!mAttached) {
-            mAttached = true;
-            IntentFilter filter = new IntentFilter();
-
-            filter.addAction(Intent.ACTION_TIME_TICK);
-            filter.addAction(Intent.ACTION_TIME_CHANGED);
-            filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
-            filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
-
-            getContext().registerReceiver(mIntentReceiver, filter, null, getHandler());
-        }
-
-        // NOTE: It's safe to do these after registering the receiver since the receiver always runs
-        // in the main thread, therefore the receiver can't run before this method returns.
-
-        // The time zone may have changed while the receiver wasn't registered, so update the Time
-        mCalendar = Calendar.getInstance(TimeZone.getDefault());
-
-        // Make sure we update to the current time
-        updateClock();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (mAttached) {
-            getContext().unregisterReceiver(mIntentReceiver);
-            mAttached = false;
-        }
-    }
-
-    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(Intent.ACTION_TIMEZONE_CHANGED)) {
-                String tz = intent.getStringExtra("time-zone");
-                mCalendar = Calendar.getInstance(TimeZone.getTimeZone(tz));
-                if (mClockFormat != null) {
-                    mClockFormat.setTimeZone(mCalendar.getTimeZone());
-                }
-            }
-            updateClock();
-        }
-    };
-
-    final void updateClock() {
-        mCalendar.setTimeInMillis(System.currentTimeMillis());
-        CharSequence txt = getTimeText();
-        if (mBgText != null) mBgText.setText(txt);
-        if (mFgText != null) mFgText.setText(txt);
-        if (mSolidText != null) mSolidText.setText(txt);
-    }
-
-    private final CharSequence getTimeText() {
-        Context context = getContext();
-        int res = DateFormat.is24HourFormat(context)
-            ? com.android.internal.R.string.twenty_four_hour_time_format
-            : com.android.internal.R.string.twelve_hour_time_format;
-
-        SimpleDateFormat sdf;
-        String format = context.getString(res);
-        if (!format.equals(mClockFormatString)) {
-            // we don't want AM/PM showing up in our statusbar, even in 12h mode
-            format = format.replaceAll("a", "").trim();
-            mClockFormat = sdf = new SimpleDateFormat(format);
-            mClockFormatString = format;
-        } else {
-            sdf = mClockFormat;
-        }
-        String result = sdf.format(mCalendar.getTime());
-        return result;
-    }
-}
-
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
index b82e1d0a066ff..71657f5238f4d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
@@ -34,10 +34,15 @@ import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.RelativeLayout;
 
+import com.android.systemui.ExpandHelper;
 import com.android.systemui.R;
+import com.android.systemui.statusbar.policy.NotificationRowLayout;
 
 public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
         View.OnClickListener {
+    private ExpandHelper mExpandHelper;
+    private NotificationRowLayout latestItems;
+
     static final String TAG = "Tablet/NotificationPanel";
     static final boolean DEBUG = false;
 
@@ -103,6 +108,16 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
         setContentFrameVisible(mNotificationCount > 0, false);
     }
 
+    @Override
+    protected void onAttachedToWindow () {
+        super.onAttachedToWindow();
+        latestItems = (NotificationRowLayout) findViewById(R.id.content);
+        int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_row_min_height);
+        int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_row_max_height);
+        mExpandHelper = new ExpandHelper(mContext, latestItems, minHeight, maxHeight);
+        mExpandHelper.setEventSource(this);
+    }
+
     private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
         public void onClick(View v) {
             mBar.clearAll();
@@ -321,14 +336,11 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
     }
 
     public boolean isInContentArea(int x, int y) {
-        mContentArea.left = mTitleArea.getLeft() + mTitleArea.getPaddingLeft();
-        mContentArea.top = mTitleArea.getTop() + mTitleArea.getPaddingTop() 
+        mContentArea.left = mContentFrame.getLeft() + mContentFrame.getPaddingLeft();
+        mContentArea.top = mContentFrame.getTop() + mContentFrame.getPaddingTop()
             + (int)mContentParent.getTranslationY(); // account for any adjustment
-        mContentArea.right = mTitleArea.getRight() - mTitleArea.getPaddingRight();
-
-        View theBottom = (mContentFrame.getVisibility() == View.VISIBLE)
-            ? mContentFrame : mTitleArea;
-        mContentArea.bottom = theBottom.getBottom() - theBottom.getPaddingBottom();
+        mContentArea.right = mContentFrame.getRight() - mContentFrame.getPaddingRight();
+        mContentArea.bottom = mContentFrame.getBottom() - mContentFrame.getPaddingBottom();
 
         offsetDescendantRectToMyCoords(mContentParent, mContentArea);
         return mContentArea.contains(x, y);
@@ -440,5 +452,25 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
         public void onAnimationStart(Animator animation) {
         }
     }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        MotionEvent cancellation = MotionEvent.obtain(ev);
+        cancellation.setAction(MotionEvent.ACTION_CANCEL);
+
+        boolean intercept = mExpandHelper.onInterceptTouchEvent(ev) ||
+                super.onInterceptTouchEvent(ev);
+        if (intercept) {
+            latestItems.onInterceptTouchEvent(cancellation);
+        }
+        return intercept;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        boolean handled = mExpandHelper.onTouchEvent(ev) ||
+                super.onTouchEvent(ev);
+        return handled;
+    }
 }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanelTitle.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanelTitle.java
index 689bc36a4320f..00cf3c54f4a7c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanelTitle.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanelTitle.java
@@ -16,6 +16,8 @@
 
 package com.android.systemui.statusbar.tablet;
 
+import java.util.ArrayList;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -24,11 +26,17 @@ import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.RelativeLayout;
 
+import com.android.systemui.R;
+
+
 public class NotificationPanelTitle extends RelativeLayout implements View.OnClickListener {
     private NotificationPanel mPanel;
+    private ArrayList<View> buttons;
+    private View mNotificationsButton;
 
     public NotificationPanelTitle(Context context, AttributeSet attrs) {
         super(context, attrs);
+        buttons = new ArrayList<View>();
         setOnClickListener(this);
     }
 
@@ -36,6 +44,23 @@ public class NotificationPanelTitle extends RelativeLayout implements View.OnCli
         mPanel = p;
     }
 
+    @Override
+    public void onFinishInflate() {
+        super.onFinishInflate();
+        buttons.add(findViewById(R.id.settings_button));
+        buttons.add(findViewById(R.id.notification_button));
+    }
+
+    @Override
+    public void setPressed(boolean pressed) {
+        super.setPressed(pressed);
+        for (View button : buttons) {
+            if (button != null) {
+                button.setPressed(pressed);
+            }
+        }
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent e) {
         switch (e.getAction()) {