summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-18 21:03:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-16 03:52:42 +0000
commit4a0eda76baeba2d8af2cc57ec64dcead03384cde (patch)
tree5f5f8a02f3677c9cfee7647a3573b63249980938 /src/com/android/launcher3/Launcher.java
parent1e4359c54e82910e3c8bfba3d520ed27c91367b9 (diff)
parentdcbcc86353e9ed52daac87f292aece667cd0ac71 (diff)
downloadandroid_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.tar.gz
android_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.tar.bz2
android_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.zip
Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8995856a4..090d2f753 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -381,6 +381,8 @@ public class Launcher extends Activity
private Stats mStats;
+ FocusIndicatorView mFocusHandler;
+
static boolean isPropertyEnabled(String propertyName) {
return Log.isLoggable(propertyName, Log.VERBOSE);
}
@@ -1278,6 +1280,7 @@ public class Launcher extends Activity
final DragController dragController = mDragController;
mLauncherView = findViewById(R.id.launcher);
+ mFocusHandler = (FocusIndicatorView) findViewById(R.id.focus_indicator);
mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace);
mWorkspace.setPageSwitchListener(this);
@@ -1417,6 +1420,7 @@ public class Launcher extends Activity
BubbleTextView favorite = (BubbleTextView) mInflater.inflate(layoutResId, parent, false);
favorite.applyFromShortcutInfo(info, mIconCache, true);
favorite.setOnClickListener(this);
+ favorite.setOnFocusChangeListener(mFocusHandler);
return favorite;
}