diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-10-04 15:11:00 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-10-08 14:52:39 -0700 |
commit | efb7e84242e174f7bb1a994889742820d229935d (patch) | |
tree | cd2b22e3ec324ebb0f7589df0c21ea7e03c89064 /src/com/android/launcher3/accessibility | |
parent | f307b6032e708ee22b6e477e6c81ba07eecd4d4f (diff) | |
download | android_packages_apps_Trebuchet-efb7e84242e174f7bb1a994889742820d229935d.tar.gz android_packages_apps_Trebuchet-efb7e84242e174f7bb1a994889742820d229935d.tar.bz2 android_packages_apps_Trebuchet-efb7e84242e174f7bb1a994889742820d229935d.zip |
Converting long item IDs to int
> Items ids were already being typecasted to int when being bound on the UI
> Using a consistent type allow better use of platform data-structures
> Adding IntArray and IntSet as a replacement for various Collection classes
Change-Id: Id3c650ed2420c2bfca3bd7671d2b705b56112371
Diffstat (limited to 'src/com/android/launcher3/accessibility')
-rw-r--r-- | src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | 17 | ||||
-rw-r--r-- | src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 81a0e1d5d..84edb3dac 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -39,6 +39,7 @@ import com.android.launcher3.notification.NotificationListener; import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.touch.ItemLongClickListener; +import com.android.launcher3.util.IntArray; import com.android.launcher3.util.Thunk; import com.android.launcher3.widget.LauncherAppWidgetHostView; @@ -159,7 +160,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme beginAccessibleDrag(host, item); } else if (action == ADD_TO_WORKSPACE) { final int[] coordinates = new int[2]; - final long screenId = findSpaceOnWorkspace(item, coordinates); + final int screenId = findSpaceOnWorkspace(item, coordinates); mLauncher.getStateManager().goToState(NORMAL, true, new Runnable() { @Override @@ -191,7 +192,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme folder.getInfo().remove(info, false); final int[] coordinates = new int[2]; - final long screenId = findSpaceOnWorkspace(item, coordinates); + final int screenId = findSpaceOnWorkspace(item, coordinates); mLauncher.getModelWriter().moveItemInDatabase(info, LauncherSettings.Favorites.CONTAINER_DESKTOP, screenId, coordinates[0], coordinates[1]); @@ -210,7 +211,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme }); } else if (action == RESIZE) { final LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) item; - final ArrayList<Integer> actions = getSupportedResizeActions(host, info); + final IntArray actions = getSupportedResizeActions(host, info); CharSequence[] labels = new CharSequence[actions.size()]; for (int i = 0; i < actions.size(); i++) { labels[i] = mLauncher.getText(actions.get(i)); @@ -242,8 +243,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme return false; } - private ArrayList<Integer> getSupportedResizeActions(View host, LauncherAppWidgetInfo info) { - ArrayList<Integer> actions = new ArrayList<>(); + private IntArray getSupportedResizeActions(View host, LauncherAppWidgetInfo info) { + IntArray actions = new IntArray(); AppWidgetProviderInfo providerInfo = ((LauncherAppWidgetHostView) host).getAppWidgetInfo(); if (providerInfo == null) { @@ -392,10 +393,10 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme /** * Find empty space on the workspace and returns the screenId. */ - protected long findSpaceOnWorkspace(ItemInfo info, int[] outCoordinates) { + protected int findSpaceOnWorkspace(ItemInfo info, int[] outCoordinates) { Workspace workspace = mLauncher.getWorkspace(); - ArrayList<Long> workspaceScreens = workspace.getScreenOrder(); - long screenId; + IntArray workspaceScreens = workspace.getScreenOrder(); + int screenId; // First check if there is space on the current screen. int screenIndex = workspace.getCurrentPage(); diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java index cfb052029..f37f70b4c 100644 --- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java @@ -66,7 +66,7 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele } final ShortcutInfo info = ((DeepShortcutView) host.getParent()).getFinalInfo(); final int[] coordinates = new int[2]; - final long screenId = findSpaceOnWorkspace(item, coordinates); + final int screenId = findSpaceOnWorkspace(item, coordinates); Runnable onComplete = new Runnable() { @Override public void run() { |