summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-03-11 01:17:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-11 01:17:42 +0000
commitd0dfc83e347211771a8cd011680e6ea23660a08f (patch)
treeac295e1ddfadfdd75263e009c387d42e8df78d37 /src/com/android
parent434e667b5b488d6212e8c77c8ad3b02c4af37117 (diff)
parentc4918358049914a4700bc8f2eb91167eb4a67bec (diff)
downloadandroid_packages_apps_Trebuchet-d0dfc83e347211771a8cd011680e6ea23660a08f.tar.gz
android_packages_apps_Trebuchet-d0dfc83e347211771a8cd011680e6ea23660a08f.tar.bz2
android_packages_apps_Trebuchet-d0dfc83e347211771a8cd011680e6ea23660a08f.zip
Merge "Adding a dummy method for fix GSA compilation issues" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/Folder.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 0a6557907..87ef0bcb4 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -39,6 +39,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.animation.AccelerateInterpolator;
@@ -849,6 +850,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
mItemsInvalidated = true;
}
+ // TODO remove this once GSA code fix is submitted
+ public ViewGroup getContent() {
+ return (ViewGroup) mContent;
+ }
+
public int getItemCount() {
return mContent.getItemCount();
}