Projects >> android_packages_apps_Trebuchet >>8165f0dd202a2c0fbf0816f7613d66938955dc76

Chunk
Conflicting content 
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
    }

<<<<<<< HEAD
    public void onPackagesUpdated() {
=======
    public void onPackagesUpdated(boolean immediate) {
        if (immediate) {
            updatePackages();
        } else {
            // TODO: this isn't ideal, but we actually need to delay here. This call is triggered
            // by a broadcast receiver, and in order for it to work correctly, we need to know that
            // the AppWidgetService has already received and processed the same broadcast. Since there
            // is no guarantee about ordering of broadcast receipt, we just delay here. This is a
            // workaround until we add a callback from AppWidgetService to AppWidgetHost when widget
            // packages are added, updated or removed.
            postDelayed(new Runnable() {
               public void run() {
                   updatePackages();
               }
            }, 1500);
        }
    }

    public void updatePackages() {
>>>>>>> 4f174f1d27adbde6f50e11ee3a8eaf162a030284
        // Get the list of widgets and shortcuts
        mWidgets.clear();
        List widgets =
Solution content 
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
    }
    public void onPackagesUpdated() {
        // Get the list of widgets and shortcuts
        mWidgets.clear();
        List widgets =
File
AppsCustomizePagedView.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature
Chunk
Conflicting content 
            // shallow copy
            @SuppressWarnings("unchecked")
            final ArrayList list
<<<<<<< HEAD
                    = (ArrayList) mBgAllAppsList.data.clone();
            mHandler.post(new Runnable() {
=======
                    = (ArrayList) mAllAppsList.data.clone();
            Runnable r = new Runnable() {
>>>>>>> 4f174f1d27adbde6f50e11ee3a8eaf162a030284
                public void run() {
                    final long t = SystemClock.uptimeMillis();
                    final Callbacks callbacks = tryGetCallbacks(oldCallbacks);
Solution content 
            // shallow copy
            @SuppressWarnings("unchecked")
            final ArrayList list
                    = (ArrayList) mBgAllAppsList.data.clone();
            Runnable r = new Runnable() {
                public void run() {
                    final long t = SystemClock.uptimeMillis();
                    final Callbacks callbacks = tryGetCallbacks(oldCallbacks);
File
LauncherModel.java
Developer's decision
Combination
Kind of conflict
Cast expression
Method invocation
Variable