diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 10:23:18 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-18 10:23:18 -0800 |
| commit | ecd365293fedf8b78cf1e8df0b9d93968c9910ba (patch) | |
| tree | fa3ef4506b2bd56d92397586dafa51a0d327f6f0 | |
| parent | f63c46bf5e304c36fc15fa4f15af9cb98fde762d (diff) | |
| parent | 2953833bcba6c4aba3c5211bfb41434321ce255f (diff) | |
| download | android_packages_apps_Trebuchet-ecd365293fedf8b78cf1e8df0b9d93968c9910ba.tar.gz android_packages_apps_Trebuchet-ecd365293fedf8b78cf1e8df0b9d93968c9910ba.tar.bz2 android_packages_apps_Trebuchet-ecd365293fedf8b78cf1e8df0b9d93968c9910ba.zip | |
resolve merge conflicts of 2953833bcb to ub-launcher3-calgary
Change-Id: Ia7fc406d1e287974e87979af9a4b1f5f1e4e23d9
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bd98997b1..40aaf79aa 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -123,6 +123,7 @@ import java.io.PrintWriter; import java.text.DateFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -4815,6 +4816,14 @@ public class Launcher extends Activity public static HashMap<String, CustomAppWidget> getCustomAppWidgets() { return sCustomAppWidgets; } + + public static List<View> getFolderContents(View icon) { + if (icon instanceof FolderIcon) { + return ((FolderIcon) icon).getFolder().getItemsInReadingOrder(); + } else { + return Collections.EMPTY_LIST; + } + } } interface DebugIntents { |