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

Commit fe2fb826 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)""... 

am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

* commit 'd65fb393':
  Revert "Fixing crash in empty folders. (Bug 11627191)"
parents cace67f7 d65fb393

src/com/android/launcher3/Folder.java

+2 −13
Original line number Diff line number Diff line
@@ -408,15 +408,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
            mFolderName.setText("");

        }

        updateItemLocationsInDatabase();



        // In case any children didn't come across during loading, clean up the folder accordingly

        mFolderIcon.post(new Runnable() {

            public void run() {

                if (getItemCount() <= 1) {

                    replaceFolderWithFinalItem();

                }

            }

        });

    }



    /**
@@ -1114,8 +1105,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        View finalChild = getItemAt(0);

        if (finalChild != null) {

            mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);

        } else {

            onCompleteRunnable.run();

        }

        mDestroyed = true;

    }

src/com/android/launcher3/FolderInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package com.android.launcher3;



import android.content.ContentValues;



import java.util.ArrayList;



import android.content.ContentValues;



/**

 * Represents a folder containing shortcuts or apps.

 */

src/com/android/launcher3/LauncherModel.java

+2 −3
Original line number Diff line number Diff line
@@ -584,9 +584,8 @@ public class LauncherModel extends BroadcastReceiver { 
            // as in Workspace.onDrop. Here, we just add/remove them from the list of items

            // that are on the desktop, as appropriate

            ItemInfo modelItem = sBgItemsIdMap.get(itemId);

            if (modelItem != null &&

                    (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||

                     modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {

            if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||

                    modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {

                switch (modelItem.itemType) {

                    case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:

                    case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: