summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/BubbleTextView.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-03-20 03:18:20 -0700
committerMichael Jurka <mikejurka@google.com>2012-03-20 11:13:05 -0700
commita52570f8f9ad65b85e33a2f2e87722f9edd6c6f4 (patch)
tree265d71c942c1f99cb8bbc46f31eae23b4b1db231 /src/com/android/launcher2/BubbleTextView.java
parent47a876d443ddc65c8d9a0c95da58d892dbb1faea (diff)
downloadandroid_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.gz
android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.bz2
android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.zip
Eliminate custom alpha handling in CellLayout
Also rename CellLayoutChildren to ShortcutsAndWidgetsView Change-Id: Ic2ebc5497adb153cc2fce99730cc2c6fbdc101e6
Diffstat (limited to 'src/com/android/launcher2/BubbleTextView.java')
-rw-r--r--src/com/android/launcher2/BubbleTextView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index 4a3a7a452..a775ed5ab 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -247,8 +247,8 @@ public class BubbleTextView extends TextView {
}
void setCellLayoutPressedOrFocusedIcon() {
- if (getParent() instanceof CellLayoutChildren) {
- CellLayoutChildren parent = (CellLayoutChildren) getParent();
+ if (getParent() instanceof ShortcutAndWidgetContainer) {
+ ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) getParent();
if (parent != null) {
CellLayout layout = (CellLayout) parent.getParent();
layout.setPressedOrFocusedIcon((mPressedOrFocusedBackground != null) ? this : null);