Projects >> android_packages_apps_Trebuchet >>c03f8c04714b919999dafa1551d6a2834ce6e15b

Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * Some shortcuts were updated in the background.
     *
     * Implementation of the method from LauncherModel.Callbacks.
     */
    public void bindShortcutsUpdated(final ArrayList shortcuts) {
        Runnable r = new Runnable() {
            public void run() {
                bindShortcutsUpdated(shortcuts);
=======
     * Packages were restored
     */
    public void bindAppsRestored(final ArrayList apps) {
        Runnable r = new Runnable() {
            public void run() {
                bindAppsRestored(apps);
>>>>>>> 8cce9dd83aecd90920db751ab3f8fb6969f087c5
            }
        };
        if (waitUntilResume(r)) {
Solution content 
    }

    /**
     * Some shortcuts were updated in the background.
     *
     * Implementation of the method from LauncherModel.Callbacks.
     */
    public void bindShortcutsUpdated(final ArrayList shortcuts) {
        Runnable r = new Runnable() {
            public void run() {
                bindShortcutsUpdated(shortcuts);
            }
        };
        if (waitUntilResume(r)) {
File
Launcher.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        }

        if (mWorkspace != null) {
<<<<<<< HEAD
            mWorkspace.updateShortcuts(shortcuts);
=======
            mWorkspace.updateShortcutsAndWidgets(apps);
>>>>>>> 8cce9dd83aecd90920db751ab3f8fb6969f087c5
        }
    }
Solution content 
        }

        if (mWorkspace != null) {
            mWorkspace.updateShortcuts(shortcuts);
        }
    }
File
Launcher.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                                  ArrayList addAnimated,
                                  ArrayList addedApps);
        public void bindAppsUpdated(ArrayList apps);
<<<<<<< HEAD
        public void bindShortcutsUpdated(ArrayList shortcuts);
=======
        public void bindAppsRestored(ArrayList apps);
>>>>>>> 8cce9dd83aecd90920db751ab3f8fb6969f087c5
        public void updatePackageState(ArrayList installInfo);
        public void updatePackageBadge(String packageName);
        public void bindComponentsRemoved(ArrayList packageNames,
Solution content 
                                  ArrayList addAnimated,
                                  ArrayList addedApps);
        public void bindAppsUpdated(ArrayList apps);
        public void bindShortcutsUpdated(ArrayList shortcuts);
        public void updatePackageState(ArrayList installInfo);
        public void updatePackageBadge(String packageName);
        public void bindComponentsRemoved(ArrayList packageNames,
File
LauncherModel.java
Developer's decision
Version 1
Kind of conflict
Method interface