summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder/Folder.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-10-12 21:22:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-12 21:22:05 +0000
commitcf6195268d3c1f190318b3220d321fb910349e51 (patch)
tree326eb9ceccc784ef6aafd49c78a7a02bc207519d /src/com/android/launcher3/folder/Folder.java
parent3f8864069be20d14debacddee610062f3feae5a1 (diff)
parent2fd020860533e18c64a93d14d11cb2d34bc9cbaf (diff)
downloadandroid_packages_apps_Trebuchet-cf6195268d3c1f190318b3220d321fb910349e51.tar.gz
android_packages_apps_Trebuchet-cf6195268d3c1f190318b3220d321fb910349e51.tar.bz2
android_packages_apps_Trebuchet-cf6195268d3c1f190318b3220d321fb910349e51.zip
Merge "Use Launcher.getLauncher(Context) instead of type-casting." into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android/launcher3/folder/Folder.java')
-rw-r--r--src/com/android/launcher3/folder/Folder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 0ae3a6224..698e5aa04 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -212,7 +212,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
if (sHintText == null) {
sHintText = res.getString(R.string.folder_hint_text);
}
- mLauncher = (Launcher) context;
+ mLauncher = Launcher.getLauncher(context);
// We need this view to be focusable in touch mode so that when text editing of the folder
// name is complete, we have something to focus on, thus hiding the cursor and giving
// reliable behavior when clicking the text field (since it will always gain focus on click).