Projects >> android_packages_apps_Trebuchet >>10383e2992c0f23f1b10ddc31ef9d6d9d36129ca

Chunk
Conflicting content 
            content.setBackground(bg);
        }

<<<<<<< HEAD
        root.addView(cling);
=======
    public boolean shouldShowFirstRunOrMigrationClings() {
        SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
        return areClingsEnabled() &&
            !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
            !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false) &&
            LauncherAppState.getLauncherProvider().wasNewDbCreated();
    }

    public void removeFirstRunAndMigrationClings() {
        removeCling(R.id.first_run_cling);
        removeCling(R.id.migration_cling);
    }
>>>>>>> 0f3e20658a2386b68f23c71a83e18b9423e939e9

        if (showWelcome) {
            // This is the first cling being shown. No need to animate.
Solution content 
            content.setBackground(bg);
        }

        root.addView(cling);

        if (showWelcome) {
            // This is the first cling being shown. No need to animate.
File
LauncherClings.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method invocation