1 files changed, 13 insertions, 14 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
index 060d06c..bfff5f2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
@@ -25,8 +25,8 @@ import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.systemui.R;
 
@@ -48,6 +48,7 @@ public class QSPanelTopView extends FrameLayout {
     private boolean mDisplayingToast = false;
 
     private AnimatorSet mAnimator;
+    private ImageView mDropTargetIcon;
 
     public QSPanelTopView(Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
@@ -60,6 +61,7 @@ public class QSPanelTopView extends FrameLayout {
     public QSPanelTopView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
                           int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        setFocusable(true);
     }
 
     @Override
@@ -71,6 +73,10 @@ public class QSPanelTopView extends FrameLayout {
         return mDropTarget;
     }
 
+    public ImageView getDropTargetIcon() {
+        return mDropTargetIcon;
+    }
+
     public View getBrightnessView() {
         return mBrightnessView;
     }
@@ -83,6 +89,7 @@ public class QSPanelTopView extends FrameLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
         mDropTarget = findViewById(R.id.delete_container);
+        mDropTargetIcon = (ImageView) findViewById(R.id.delete_target);
         mEditTileInstructionView = findViewById(R.id.edit_container);
         mBrightnessView = findViewById(R.id.brightness_container);
         mToastView = (TextView) findViewById(R.id.qs_toast);
@@ -92,14 +99,14 @@ public class QSPanelTopView extends FrameLayout {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final int width = MeasureSpec.getSize(widthMeasureSpec);
-        mBrightnessView.measure(exactly(width), MeasureSpec.UNSPECIFIED);
+        mBrightnessView.measure(QSDragPanel.exactly(width), MeasureSpec.UNSPECIFIED);
         int dh = mBrightnessView.getMeasuredHeight();
 
-        mDropTarget.measure(exactly(width), atMost(dh));
-        mEditTileInstructionView.measure(exactly(width), atMost(dh));
-        mToastView.measure(exactly(width), atMost(dh));
+        mDropTarget.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
+        mEditTileInstructionView.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
+        mToastView.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
 
-        setMeasuredDimension(width, mBrightnessView.getMeasuredHeight());
+        setMeasuredDimension(width, QSDragPanel.exactly(mBrightnessView.getMeasuredHeight()));
     }
 
     @Override
@@ -112,14 +119,6 @@ public class QSPanelTopView extends FrameLayout {
         }
     }
 
-    private static int atMost(int height) {
-        return MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
-    }
-
-    private static int exactly(int size) {
-        return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
-    }
-
     public void setEditing(boolean editing) {
         mEditing = editing;
         if (editing) {