diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-18 21:03:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 03:52:42 +0000 |
| commit | 4a0eda76baeba2d8af2cc57ec64dcead03384cde (patch) | |
| tree | 5f5f8a02f3677c9cfee7647a3573b63249980938 /src/com/android/launcher3/CellLayout.java | |
| parent | 1e4359c54e82910e3c8bfba3d520ed27c91367b9 (diff) | |
| parent | dcbcc86353e9ed52daac87f292aece667cd0ac71 (diff) | |
| download | android_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/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index afe9619fb..93006b3f5 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -971,10 +971,7 @@ public class CellLayout extends ViewGroup { } public ShortcutAndWidgetContainer getShortcutsAndWidgets() { - if (getChildCount() > 0) { - return (ShortcutAndWidgetContainer) getChildAt(0); - } - return null; + return mShortcutsAndWidgets; } public View getChildAt(int x, int y) { |