summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DrawableStateProxyView.java
diff options
context:
space:
mode:
authorCristina Stancu <crstn@google.com>2013-08-07 17:20:14 +0100
committerCristina Stancu <crstn@google.com>2013-08-22 11:41:11 +0100
commit476493bcc3b2d6cf32db62bf78714aa0f2747108 (patch)
tree9c2a5a14ea0488d9ba80e492d6694b4f0c97054f /src/com/android/launcher3/DrawableStateProxyView.java
parent2b931429dbf29633657f060151e5451522b44f15 (diff)
downloadandroid_packages_apps_Trebuchet-476493bcc3b2d6cf32db62bf78714aa0f2747108.tar.gz
android_packages_apps_Trebuchet-476493bcc3b2d6cf32db62bf78714aa0f2747108.tar.bz2
android_packages_apps_Trebuchet-476493bcc3b2d6cf32db62bf78714aa0f2747108.zip
Get the view to be used as qsb bar from the launcher directly.
This will allow more control over the qsb visuals and behaviour in GEL. Depends on ag/339203 Future changes: - revert ag/344333 since we won't need the normal qsb to support hotword anymore - Dragging icons over the Drop target bar (to remove/uninstall them or get App info) doesn't currently work in GEL. There might be future changes needed to fix that. Change-Id: Ic498f0abee5ad99ef1644ff94f174b61f8e1f5f0
Diffstat (limited to 'src/com/android/launcher3/DrawableStateProxyView.java')
-rw-r--r--src/com/android/launcher3/DrawableStateProxyView.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DrawableStateProxyView.java b/src/com/android/launcher3/DrawableStateProxyView.java
index 196e2f2e1..0758de1f7 100644
--- a/src/com/android/launcher3/DrawableStateProxyView.java
+++ b/src/com/android/launcher3/DrawableStateProxyView.java
@@ -58,8 +58,10 @@ public class DrawableStateProxyView extends LinearLayout {
View parent = (View) getParent();
mView = parent.findViewById(mViewId);
}
- mView.setPressed(isPressed());
- mView.setHovered(isHovered());
+ if (mView != null) {
+ mView.setPressed(isPressed());
+ mView.setHovered(isHovered());
+ }
}
@Override