From 80a76276dc9440ffad30dc4c820eb7d65f4df368 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 18 Apr 2012 10:52:18 -0400
Subject: [PATCH] Add visual feedback for notification expandability.

Change-Id: I0b82a465a126a6d0ec6cf6af87dc56817765b995
---
 .../drawable-xhdpi/bottom_divider_glow.png    | Bin 0 -> 1509 bytes
 .../res/drawable-xhdpi/top_divider_glow.png   | Bin 0 -> 1491 bytes
 .../layout/status_bar_notification_row.xml    |  16 ++++-
 packages/SystemUI/res/values-hdpi/dimens.xml  |   4 +-
 packages/SystemUI/res/values-xhdpi/dimens.xml |   4 +-
 packages/SystemUI/res/values/dimens.xml       |   4 +-
 packages/SystemUI/res/values/ids.xml          |  20 ++++++
 .../com/android/systemui/ExpandHelper.java    |  68 ++++++++++++++++--
 .../systemui/statusbar/BaseStatusBar.java     |   3 +
 .../policy/NotificationRowLayout.java         |   6 ++
 10 files changed, 110 insertions(+), 15 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png
 create mode 100644 packages/SystemUI/res/values/ids.xml

diff --git a/packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png b/packages/SystemUI/res/drawable-xhdpi/bottom_divider_glow.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbcea9eb30f1bcb024544b55eafa2f134d7aa850
GIT binary patch
literal 1509
zcmV<B1seK^P)<h;3K|Lk000e1NJLTq00a~O000IE1^@s6b56}400001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb_
z6fOb5mwh$>00m`9L_t(|+U;ChlG`{81Sr|b9rhSG#-4YNvB%guY{nLmAF<NY1}Tz~
zHO>rC<+Aty34srzTa;CX3=xqZ|NJK+qH9v&I;<a|bPy4Py3?AM(s-?;hxzlWJ3~7u
zKZwYM@~`W4`dp~Ll>d#&C+h#YmVICE%hs}QU`v4OnbH%aF`xZ`whH)ncKofYP01dE
zHZG(;fj;I7=<_&~B!Hffo*gj7YHS!X<SU2``#wx`*f?a!;d_Nr+8WzP`pbsCiAZ$H
zQ#xkK?~re6KM_7RD8qK{Yu;_uN$tE*Tle+*jr4zl&38!OK`*tR@)i;KAJRhQw)S%;
z9fS4+?2J&pfFB}V8`O*BkA-~7=_n%h@85ro74d~-9xfPC2?9Ovi+LeKC?uddWeA0-
zKqw?2%|rm|T&b@Fz`w88SIA>xA`uE&NhnMO!ee%bjS`_SIm8XN6Coc71qFX<0k9kS
ze+$ruOi-&|Y`zb>2KXE@WXRatUSZGs?E5R<U);EF2D;(^-RSgj1E7rc7ATJpH!TH1
zVOirbgEmw7m57EJ+Py=X35B1K7l8y>D8^o#m@UP<=sSbF1@esIOD2KR{ouo-=&V(h
z@!LOS5DG&YH~Q%O=<_C{P%mTvFP>1q&1ojU&%ioIG)zDkc$@20-k%@{)c$2Hn~CI@
zsP2XCCuE3_;FR;p2;PjjKO?^(DZnQ{JmM!;#`cRmK2ZoXzQM8kC<#Qcyc&7t<xd6w
z24}py6CYuRZBvC$LuY`F<2^O*56_w-TjQiV=AM4wp1RlmXZtpM@?g;%K=O(<#)IdG
z5n$`F=Nb38bP@{)+N^V~*S4c%Z%uzOQxCyq%bYBY-$%{qSh!DV@R3!{HGBf^>G0_Y
z1jKh|-eG%qS^?W!s2qua=;(6Z4c77^zfUOKXx#XO!p$KxBCMBmI^m6c#x^YQ5qUh3
z;OTj%K%(RGK`0Cvgu;;Oz}F}(P5_{pKtDL;UNFzVHDrhh26lk}KLZXXD%2q?LI!Aa
zJ#oN1o<8u}_rARV0bi9c@{#x2!bJL#u`dUtCMSTi0>RJ=z;pwIo=qrdMR_RrZO-_Y
z$IBy-jOJPo*q=9iI#-UB7S{XJ@SBhVin(B0E-2p<_)kD8_UvhwlL-*E!8@_^DtmsA
z-zU4Gd``iqj6Fd143L&=Jep8IAXBqm5tQ6A`=52}HzJQm&BM<7+4{}d+E=#PVL)3m
z&pgn@N9mamuuhV~1ANc?9W@7l_Y!+nIc7QkM`yoc5-2)(LIef+QK=phPm4T0^^ckK
zUEZGxxDio-^JS68lM&G&J{0O~5iHTM%^dQ^D>Lz5VL4--4fz9QysI}PEA+n#t@B7L
z>z2~qwPrw|WeAR(e%NSRoO)jWNCxCy5s^Y5w)M1f>wa57vo`Jx`lP+%?5DJQe4_=h
zt`)@2-Y3(#5pY`rS+VunOKo7^dO~3@p}@WfjpK`?i9T^2Nd~YnnHCy>Sq&ky7jULm
z!L$-wi8Ie%U81}{R;(R9vJCh>3i!tj!oxb-H3CdE>)Qxewc3)~Ga2ago~&9b@1tZ_
z+#t}@0cy4W&XEGK;O~|;H3Q7gSc`j}Qd>hC>Hy%aarSi7>C-YKNACA37Hqc6y(PkI
zi$t+Z8&auL@`p9fH>(-H@t+Ap2B9$IXwu<~`L-9>>VbCY0sUJ?-}*x9{ZHIG^yGQQ
zKtn&k?lVZ9vx%Xev9JTy`Vj$mc=5Fp<a5Uby-!rnlG3Y&t!?xIY&#G*_S$&{s8#9z
z6TxTMYmI$t1{lA(*pv0VKZ)ETwXM;HmioG5Z60BBv+f`ZhP28r_#Sqa{^3@{00000
LNkvXXu0mjf4Oh_L

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png b/packages/SystemUI/res/drawable-xhdpi/top_divider_glow.png
new file mode 100644
index 0000000000000000000000000000000000000000..56b63d0ee7a52f3e4c06ffa203dfcb54e20f3505
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq00a~O000IE1^@s6b56}400001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb_
z77!*T+y_no00mP?L_t(|+U=a{apO7+g#l8|riWX`Eo1B5GPaDZVXq^JxPPn}_ypif
z@+%=`G9F7J2!Rl-^N9-6uwgsw-(P=P4(A<R@lKz7U|f7a|I*Pn?;I{ZaOn93%a!k3
zXRO9~PtN#G<H4PN_|9Y4GZu2dwZ7Mch{BU!JK;sI?OIDv56@<z;^dt^TJ~|~7`ait
z<RBlte)Rk-cZyp&$H&{x#&&su>rigo4)Y>Tu6le+$ML-5+B_oW=C;3o{xby5urDtP
zhTRty^op5UVaAnWot<sL5e!^t9}2$7IL_*y)r|=ozPJJ?)WQzyd|R&P9x=u@nmd^8
zFGPFe;f&B?N06~`L$OD&hr*3PJODg|LO)jh*0!m+p{kuPLgBj1-PA?84cPQ<Agz2w
zBYxS@zZ`HaZ9d*WXmMfu`Nf1xBBE7+1@6d^WQ6GvLTigLH{QKMHdWS(K)bb5(0FrZ
zQnB>bZ!WGDfRa=_l;*BfnST!)B;}`7q)Mjt<N;7&56qDUADI7E(2|U8;(!<_0DzQ<
zS)6m*K(aVvMaFii$dgpWQu^KtDr7*1VFM@(tAz*L@yUi@=Yl8;AP@ows0h9zh>DXV
z3@3H-uG<G^e}MM-I7=vQZ9V_ir!`?u03`zam@)Jnoe4h_1Z#ly><AKp@#}qJ$psM_
zpKPx4M7yp7&Hw~0>{0Lv)LQF}S5W;^rjA18dFI6S)Oa&FWnw!LD2U4M)KNd%Ii4Dz
z$t`ZcqxyR$+v@E7@|nKqPu)sHOF^(d1Mpbr_|-8&M02HpXMh{CGynAf1uf!dReO8R
zrxm_%qo3{ArE(5i9kI8a_u>doDb$8!a(NG+fI_`@#ZO6Gx8&afLJZI;8QVzt6UZaO
zaT=_xFunqyL4RMAzpdVrYOm{MRk1FPpQL;(5I-5<D;cqg0b8tnIq+gZ4jF*qd)qWp
zFf8+<VLeri^!Z6V3TiUM6M_Q<AruWEuRo*u9+hx=GX(IqJt+Su@J~t%p<vg?p5T16
zFpny}VC-i{U^0lfpteN^D8vjjVDg`Uvk^aK0D=}5El;dl>=8hrrsg@bJ!bM7jPVLa
ze#4H~Vnt4S;g25g*wBV<SR<uz;vKd3C=n?K#DDAD>bdAET8(gfh8Pna4-}{q6v>SM
zlk5OHTHr}%t=IZNAzIU4PW*2Iv85(+<M*hVPE@~QBbOtotTm|+&;(#el=voN92XGY
z34E@we^J0M8EtXftghvih|U18G|*ZURG0xQXb?dPCVW87Fa`}O2=;mHtd%&ck=NQ+
zIff0OFl<1DPfy3m5t?iWb8DqRfMYZuI62_p1nqu+n16%5Hc|8rU?GD4w~Oz0x?Uad
z10ca<fDC=UCjcJ-K!No{(h{f$QWA*olLH7mK`dmiyvPYH4=Q~(kT&9K7b?TXwJ^?W
z*moEY`J#P2LoQ1z9y|!4g|GEG$qWK|1z<4K_3DJx5cGO=(+7y}S%Clzsm=hA&IXu}
z%l1X}`<Jd)Qk|XeA9Vd1*8-s81NvDF2%-VP>VOp-kCk5Ub+=&yC=7e>WRLHS;?gOG
z9|ByxfD{v-(&0)6&!-mPn?Tn~*>L56sAJdw8p}nb>xna5wtGN9e~)y%0%D@iuV&<c
z!bJ8ej}znyfdb~kyEzjF2$g_>0N^<4Y2~v%l^r&0K$!0%VtB+jY}ny*h4oJmTYRt*
zs=4-_z||`_to;kXh!sTj44@)qfI<SGfS^IQKhyOpiL-(WEBMzd6#fH%p!aW}V1YLH
tN=Q=iTCYG@K*4)Gg6Q@B@#nBR+y9bOlg1a~T~Yu5002ovPDHLkV1j#Bt|I^d

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml
index 275d6522a32ab..e69cd8aca881e 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_row.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml
@@ -4,6 +4,15 @@
     android:background="@*android:drawable/notification_bg"
     >
 
+    <View
+        android:id="@+id/top_glow"
+        android:alpha="0"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/notification_divider_height"
+        android:layout_gravity="top|center_horizontal"
+        android:background="@drawable/top_divider_glow"
+        />
+
     <Button
         android:id="@+id/veto"
         android:layout_width="48dp"
@@ -19,6 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/notification_divider_height"
+        android:layout_marginTop="@dimen/notification_divider_height"
         android:focusable="true"
         android:clickable="true"
         >
@@ -31,10 +41,12 @@
     </com.android.systemui.statusbar.LatestItemView>
 
     <View
+        android:id="@+id/bottom_glow"
+        android:alpha="0"
         android:layout_width="match_parent"
         android:layout_height="@dimen/notification_divider_height"
-        android:gravity="bottom"
-        android:background="@*android:drawable/notification_bg"
+        android:layout_gravity="bottom|center_horizontal"
+        android:background="@drawable/bottom_divider_glow"
         />
 
 </FrameLayout>
diff --git a/packages/SystemUI/res/values-hdpi/dimens.xml b/packages/SystemUI/res/values-hdpi/dimens.xml
index 6b6fd4d637366..7cd318cc5cbed 100644
--- a/packages/SystemUI/res/values-hdpi/dimens.xml
+++ b/packages/SystemUI/res/values-hdpi/dimens.xml
@@ -18,9 +18,9 @@
 <resources>
     <!-- thickness (height) of each notification row, including any separators or padding -->
     <!-- Note: this is 64dip + 1px divider = 97px. -->
-    <dimen name="notification_height">97px</dimen>
+    <dimen name="notification_height">99px</dimen>
 
     <!-- thickness (height) of dividers between each notification row; see math for
          notification_height above -->
-    <dimen name="notification_divider_height">1px</dimen>
+    <dimen name="notification_divider_height">4px</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values-xhdpi/dimens.xml b/packages/SystemUI/res/values-xhdpi/dimens.xml
index aa75c207ebf63..303841a8045ff 100644
--- a/packages/SystemUI/res/values-xhdpi/dimens.xml
+++ b/packages/SystemUI/res/values-xhdpi/dimens.xml
@@ -19,9 +19,9 @@
     <!-- thickness (height) of each notification row, including any separators or padding -->
     <!-- note: this is the same value as in values/dimens.xml; the value is overridden in
          values-hdpi/dimens.xml and so we need to re-assert the general value here -->
-    <dimen name="notification_height">65dp</dimen>
+    <dimen name="notification_height">68dp</dimen>
 
     <!-- thickness (height) of dividers between each notification row -->
     <!-- same as in values/dimens.xml; see note at notification_height -->
-    <dimen name="notification_divider_height">1dp</dimen>
+    <dimen name="notification_divider_height">2dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index f786e8665dddf..b8e8fe4f83a99 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -50,7 +50,7 @@
     <dimen name="navigation_bar_deadzone_size">12dp</dimen>
 
     <!-- thickness (height) of each notification row, including any separators or padding -->
-    <dimen name="notification_height">65dp</dimen>
+    <dimen name="notification_height">68dp</dimen>
 
     <!-- Height of notification icons in the status bar -->
     <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen>
@@ -72,7 +72,7 @@
     <dimen name="status_bar_icon_padding">0dp</dimen>
 
     <!-- thickness (height) of dividers between each notification row -->
-    <dimen name="notification_divider_height">1dp</dimen>
+    <dimen name="notification_divider_height">4dp</dimen>
 
     <!-- Notification drawer tuning parameters (phone UI) -->
     <!-- Initial velocity of the shade when expanding on its own -->
diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml
new file mode 100644
index 0000000000000..2a4c5fd0b23f1
--- /dev/null
+++ b/packages/SystemUI/res/values/ids.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 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.
+-->
+
+<resources>
+    <item type="id" name="expandable_tag" />
+</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index aa289da11ce0f..6141eadbcf15e 100644
--- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
@@ -32,17 +32,28 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
     public interface Callback {
         View getChildAtPosition(MotionEvent ev);
         View getChildAtPosition(float x, float y);
+        boolean canChildBeExpanded(View v);
     }
 
     private static final String TAG = "ExpandHelper";
     protected static final boolean DEBUG = false;
     private static final long EXPAND_DURATION = 250;
 
+    // amount of overstretch for maximum brightness expressed in U
+    // 2f: maximum brightness is stretching a 1U to 3U, or a 4U to 6U
+    private static final float STRETCH_INTERVAL = 2f;
+
+    // level of glow for a touch, without overstretch
+    // overstretch fills the range (GLOW_BASE, 1.0]
+    private static final float GLOW_BASE = 0.5f;
+
     @SuppressWarnings("unused")
     private Context mContext;
 
     private boolean mStretching;
     private View mCurrView;
+    private View mCurrViewTopGlow;
+    private View mCurrViewBottomGlow;
     private float mOldHeight;
     private float mNaturalHeight;
     private float mInitialTouchSpan;
@@ -53,7 +64,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
 
     private int mSmallSize;
     private int mLargeSize;
-
+    private float mMaximumStretch;
 
     private class ViewScaler {
         View mView;
@@ -62,7 +73,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
             mView = v;
         }
         public void setHeight(float h) {
-            Log.v(TAG, "SetHeight: setting to " + h);
+            if (DEBUG) Log.v(TAG, "SetHeight: setting to " + h);
             ViewGroup.LayoutParams lp = mView.getLayoutParams();
             lp.height = (int)h;
             mView.setLayoutParams(lp);
@@ -94,6 +105,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
 
     public ExpandHelper(Context context, Callback callback, int small, int large) {
         mSmallSize = small;
+        mMaximumStretch = mSmallSize * STRETCH_INTERVAL;
         mLargeSize = large;
         mContext = context;
         mCallback = callback;
@@ -120,10 +132,16 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
                 float h = Math.abs(detector.getCurrentSpanY());
                 if (DEBUG) Log.d(TAG, "current span is: " + h);
                 h = h + mOldHeight - mInitialTouchSpan;
+                float target = h;
+                if (DEBUG) Log.d(TAG, "target is: " + target);
                 h = h<mSmallSize?mSmallSize:(h>mLargeSize?mLargeSize:h);
                 h = h>mNaturalHeight?mNaturalHeight:h;
                 if (DEBUG) Log.d(TAG, "scale continues: h=" + h);
                 mScaler.setHeight(h);
+                float stretch = (float) Math.abs((target - h) / mMaximumStretch);
+                float strength = 1f / (1f + (float) Math.pow(Math.E, -1 * ((8f * stretch) - 5f)));
+                if (DEBUG) Log.d(TAG, "stretch: " + stretch + " strength: " + strength);
+                setGlow(GLOW_BASE + strength * (1f - GLOW_BASE));
                 return true;
             }
 
@@ -136,6 +154,14 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
             }
         });
     }
+    public void setGlow(float glow) {
+        if (mCurrViewTopGlow != null) {
+            mCurrViewTopGlow.setAlpha(glow);
+        }
+        if (mCurrViewBottomGlow != null) {
+            mCurrViewBottomGlow.setAlpha(glow);
+        }
+    }
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (DEBUG) Log.d(TAG, "interceptTouch: act=" + (ev.getAction()) +
@@ -154,7 +180,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
                 mStretching = false;
-                mCurrView = null;
+                clearView();
                 break;
         }
         return true;
@@ -163,14 +189,20 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
         if (v != null) {
             if (DEBUG) Log.d(TAG, "scale begins on view: " + v);
             mStretching = true;
-            mCurrView = v;
+            setView(v);
+            setGlow(GLOW_BASE);
             mScaler.setView(v);
             mOldHeight = mScaler.getHeight();
-            mNaturalHeight = mScaler.getNaturalHeight(mLargeSize);
+            if (mCallback.canChildBeExpanded(v)) {
+                if (DEBUG) Log.d(TAG, "working on an expandable child");
+                mNaturalHeight = mScaler.getNaturalHeight(mLargeSize);
+            } else {
+                if (DEBUG) Log.d(TAG, "working on a non-expandable child");
+                mNaturalHeight = mOldHeight;
+            }
             if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight +
                         " mNaturalHeight: " + mNaturalHeight);
             v.getParent().requestDisallowInterceptTouchEvent(true);
-            if (DEBUG) v.setBackgroundColor(0xFFFFFF00);
         }
         return mStretching;
     }
@@ -183,11 +215,33 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
         } else {
             h = (force || h < mNaturalHeight) ? mSmallSize : mNaturalHeight;
         }
-        if (DEBUG) mCurrView.setBackgroundColor(0);
+        if (DEBUG && mCurrView != null) mCurrView.setBackgroundColor(0);
         mAnimation = ObjectAnimator.ofFloat(mScaler, "height", h).setDuration(EXPAND_DURATION);
         mAnimation.start();
         mStretching = false;
+        setGlow(0f);
+        clearView();
+    }
+
+    private void clearView() {
         mCurrView = null;
+        mCurrViewTopGlow = null;
+        mCurrViewBottomGlow = null;
+    }
+
+    private void setView(View v) {
+        mCurrView = null;
+        if (v instanceof ViewGroup) {
+            ViewGroup g = (ViewGroup) v;
+            mCurrViewTopGlow = g.findViewById(R.id.top_glow);
+            mCurrViewBottomGlow = g.findViewById(R.id.bottom_glow);
+	    if (DEBUG) {
+                String debugLog = "Looking for glows: " + 
+                        (mCurrViewTopGlow != null ? "found top " : "didn't find top") +
+                        (mCurrViewBottomGlow != null ? "found bottom " : "didn't find bottom");
+                Log.v(TAG,  debugLog);
+            }
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index ee22eac302e11..fa541309ecafb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -397,12 +397,15 @@ public abstract class BaseStatusBar extends SystemUI implements
 
         // XXX: temporary: while testing big notifications, auto-expand all of them
         ViewGroup.LayoutParams lp = row.getLayoutParams();
+        Boolean expandable = Boolean.FALSE;
         if (large != null) {
             lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+            expandable = Boolean.TRUE;
         } else {
             lp.height = minHeight;
         }
         row.setLayoutParams(lp);
+        row.setTag(R.id.expandable_tag, expandable);
         workAroundBadLayerDrawableOpacity(row);
         View vetoButton = updateNotificationVetoButton(row, sbn);
         vetoButton.setContentDescription(mContext.getString(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
index 5c38db58b7de4..93803d983ec9a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
@@ -165,6 +165,12 @@ public class NotificationRowLayout
         return (veto != null && veto.getVisibility() != View.GONE);
     }
 
+    public boolean canChildBeExpanded(View v) {
+        Object isExpandable = v.getTag(R.id.expandable_tag);
+        return isExpandable != null && isExpandable instanceof Boolean &&
+                ((Boolean)isExpandable).booleanValue();
+    }
+
     public void onChildDismissed(View v) {
         final View veto = v.findViewById(R.id.veto);
         if (veto != null && veto.getVisibility() != View.GONE && mRemoveViews) {