Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 540efef7 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf 

* changes:
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)
parents f9618856 268f1c56

src/com/android/launcher3/FastBitmapDrawable.java

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ class FastBitmapDrawable extends Drawable { 
    FastBitmapDrawable(Bitmap b) {

        mAlpha = 255;

        mBitmap = b;

        setBounds(0, 0, b.getWidth(), b.getHeight());

    }



    @Override

src/com/android/launcher3/Launcher.java

+3 −2
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ public class Launcher extends Activity 
            } else {

                // We only load the page synchronously if the user rotates (or triggers a

                // configuration change) while launcher is in the foreground

                mModel.startLoader(true, mWorkspace.getCurrentPage());

                mModel.startLoader(true, mWorkspace.getRestorePage());

            }

        }
@@ -1801,7 +1801,8 @@ public class Launcher extends Activity 
    @Override

    protected void onSaveInstanceState(Bundle outState) {

        if (mWorkspace.getChildCount() > 0) {

            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN, mWorkspace.getRestorePage());

            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN,

                    mWorkspace.getCurrentPageOffsetFromCustomContent());

        }

        super.onSaveInstanceState(outState);

src/com/android/launcher3/LauncherModel.java

+30 −23
Original line number Diff line number Diff line
@@ -2026,7 +2026,7 @@ public class LauncherModel extends BroadcastReceiver { 


        /** Filters the set of items who are directly or indirectly (via another container) on the

         * specified screen. */

        private void filterCurrentWorkspaceItems(int currentScreen,

        private void filterCurrentWorkspaceItems(long currentScreenId,

                ArrayList<ItemInfo> allWorkspaceItems,

                ArrayList<ItemInfo> currentScreenItems,

                ArrayList<ItemInfo> otherScreenItems) {
@@ -2041,8 +2041,8 @@ public class LauncherModel extends BroadcastReceiver { 


            // If we aren't filtering on a screen, then the set of items to load is the full set of

            // items given.

            if (currentScreen < 0) {

                currentScreenItems.addAll(allWorkspaceItems);

            if (currentScreenId < 0) {

                throw new RuntimeException("Unexpected screen id");

            }



            // Order the set of items by their containers first, this allows use to walk through the
@@ -2057,7 +2057,7 @@ public class LauncherModel extends BroadcastReceiver { 
            });

            for (ItemInfo info : allWorkspaceItems) {

                if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

                    if (info.screenId == currentScreen) {

                    if (info.screenId == currentScreenId) {

                        currentScreenItems.add(info);

                        itemsOnScreen.add(info.id);

                    } else {
@@ -2078,20 +2078,20 @@ public class LauncherModel extends BroadcastReceiver { 
        }



        /** Filters the set of widgets which are on the specified screen. */

        private void filterCurrentAppWidgets(int currentScreen,

        private void filterCurrentAppWidgets(long currentScreenId,

                ArrayList<LauncherAppWidgetInfo> appWidgets,

                ArrayList<LauncherAppWidgetInfo> currentScreenWidgets,

                ArrayList<LauncherAppWidgetInfo> otherScreenWidgets) {

            // If we aren't filtering on a screen, then the set of items to load is the full set of

            // widgets given.

            if (currentScreen < 0) {

                currentScreenWidgets.addAll(appWidgets);

            if (currentScreenId < 0) {

                throw new RuntimeException("Unexpected screen id");

            }



            for (LauncherAppWidgetInfo widget : appWidgets) {

                if (widget == null) continue;

                if (widget.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&

                        widget.screenId == currentScreen) {

                        widget.screenId == currentScreenId) {

                    currentScreenWidgets.add(widget);

                } else {

                    otherScreenWidgets.add(widget);
@@ -2100,15 +2100,15 @@ public class LauncherModel extends BroadcastReceiver { 
        }



        /** Filters the set of folders which are on the specified screen. */

        private void filterCurrentFolders(int currentScreen,

        private void filterCurrentFolders(long currentScreenId,

                HashMap<Long, ItemInfo> itemsIdMap,

                HashMap<Long, FolderInfo> folders,

                HashMap<Long, FolderInfo> currentScreenFolders,

                HashMap<Long, FolderInfo> otherScreenFolders) {

            // If we aren't filtering on a screen, then the set of items to load is the full set of

            // widgets given.

            if (currentScreen < 0) {

                currentScreenFolders.putAll(folders);

            if (currentScreenId < 0) {

                throw new RuntimeException("Unexpected screen id");

            }



            for (long id : folders.keySet()) {
@@ -2116,7 +2116,7 @@ public class LauncherModel extends BroadcastReceiver { 
                FolderInfo folder = folders.get(id);

                if (info == null || folder == null) continue;

                if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&

                        info.screenId == currentScreen) {

                        info.screenId == currentScreenId) {

                    currentScreenFolders.put(id, folder);

                } else {

                    otherScreenFolders.put(id, folder);
@@ -2243,13 +2243,7 @@ public class LauncherModel extends BroadcastReceiver { 
                return;

            }



            final boolean isLoadingSynchronously = (synchronizeBindPage > -1);

            final int currentScreen = isLoadingSynchronously ? synchronizeBindPage :

                oldCallbacks.getCurrentWorkspaceScreen();



            // Load all the items that are on the current page first (and in the process, unbind

            // all the existing workspace items before we call startBinding() below.

            unbindWorkspaceItemsOnMainThread();

            // Save a copy of all the bg-thread collections

            ArrayList<ItemInfo> workspaceItems = new ArrayList<ItemInfo>();

            ArrayList<LauncherAppWidgetInfo> appWidgets =

                    new ArrayList<LauncherAppWidgetInfo>();
@@ -2264,6 +2258,20 @@ public class LauncherModel extends BroadcastReceiver { 
                orderedScreenIds.addAll(sBgWorkspaceScreens);

            }



            final boolean isLoadingSynchronously = (synchronizeBindPage > -1);

            final int currentScreen = isLoadingSynchronously ? synchronizeBindPage :

                oldCallbacks.getCurrentWorkspaceScreen();

            if (currentScreen >= orderedScreenIds.size()) {

                Log.w(TAG, "Invalid screen id to synchronously load");

                return;

            }

            final long currentScreenId = orderedScreenIds.get(currentScreen);



            // Load all the items that are on the current page first (and in the process, unbind

            // all the existing workspace items before we call startBinding() below.

            unbindWorkspaceItemsOnMainThread();



            // Separate the items that are on the current screen, and all the other remaining items

            ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<ItemInfo>();

            ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<ItemInfo>();

            ArrayList<LauncherAppWidgetInfo> currentAppWidgets =
@@ -2273,12 +2281,11 @@ public class LauncherModel extends BroadcastReceiver { 
            HashMap<Long, FolderInfo> currentFolders = new HashMap<Long, FolderInfo>();

            HashMap<Long, FolderInfo> otherFolders = new HashMap<Long, FolderInfo>();



            // Separate the items that are on the current screen, and all the other remaining items

            filterCurrentWorkspaceItems(currentScreen, workspaceItems, currentWorkspaceItems,

            filterCurrentWorkspaceItems(currentScreenId, workspaceItems, currentWorkspaceItems,

                    otherWorkspaceItems);

            filterCurrentAppWidgets(currentScreen, appWidgets, currentAppWidgets,

            filterCurrentAppWidgets(currentScreenId, appWidgets, currentAppWidgets,

                    otherAppWidgets);

            filterCurrentFolders(currentScreen, itemsIdMap, folders, currentFolders,

            filterCurrentFolders(currentScreenId, itemsIdMap, folders, currentFolders,

                    otherFolders);

            sortWorkspaceItemsSpatially(currentWorkspaceItems);

            sortWorkspaceItemsSpatially(otherWorkspaceItems);

src/com/android/launcher3/PagedView.java

+3 −0
Original line number Diff line number Diff line
@@ -571,6 +571,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
    void setRestorePage(int restorePage) {

        mRestorePage = restorePage;

    }

    int getRestorePage() {

        return mRestorePage;

    }



    protected void notifyPageSwitchListener() {

        if (mPageSwitchListener != null) {

src/com/android/launcher3/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -3961,7 +3961,7 @@ public class Workspace extends SmoothPagedView 
        return mDragInfo;

    }



    public int getRestorePage() {

    public int getCurrentPageOffsetFromCustomContent() {

        return getNextPage() - numCustomPages();

    }