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

Commit d21f9404 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Disabling auto restore of widgets. > Always show "Setup" button for a... 

Merge "Disabling auto restore of widgets.   > Always show "Setup" button for a widget which has a config activity." into ub-launcher3-burnaby
parents d468ee90 84b4adc3

src/com/android/launcher3/AppWidgetsRestoredReceiver.java

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import android.os.AsyncTask; 
import android.util.Log;



import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.compat.AppWidgetManagerCompat;



import java.util.ArrayList;

import java.util.List;
@@ -48,7 +49,8 @@ public class AppWidgetsRestoredReceiver extends BroadcastReceiver { 
            final AppWidgetProviderInfo provider = widgets.getAppWidgetInfo(newWidgetIds[i]);

            final int state;

            if (LauncherModel.isValidProvider(provider)) {

                state = LauncherAppWidgetInfo.RESTORE_COMPLETED;

                // This will ensure that we show 'Click to setup' UI if required.

                state = LauncherAppWidgetInfo.FLAG_UI_NOT_READY;

            } else {

                state = LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY;

            }

src/com/android/launcher3/Launcher.java

+42 −32
Original line number Diff line number Diff line
@@ -3889,7 +3889,8 @@ public class Launcher extends Activity 


        if (!mIsSafeModeEnabled

                && ((item.restoreStatus & LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY) == 0)

                && ((item.restoreStatus & LauncherAppWidgetInfo.FLAG_ID_NOT_VALID) != 0)) {

                && (item.restoreStatus != LauncherAppWidgetInfo.RESTORE_COMPLETED)) {



            if (appWidgetInfo == null) {

                if (DEBUG_WIDGETS) {

                    Log.d(TAG, "Removing restored widget: id=" + item.appWidgetId
@@ -3899,6 +3900,9 @@ public class Launcher extends Activity 
                LauncherModel.deleteItemFromDatabase(this, item);

                return;

            }



            // If we do not have a valid id, try to bind an id.

            if ((item.restoreStatus & LauncherAppWidgetInfo.FLAG_ID_NOT_VALID) != 0) {

                // Note: This assumes that the id remap broadcast is received before this step.

                // If that is not the case, the id remap will be ignored and user may see the

                // click to setup view.
@@ -3935,6 +3939,12 @@ public class Launcher extends Activity 
                        : LauncherAppWidgetInfo.FLAG_UI_NOT_READY;



                LauncherModel.updateItemInDatabase(this, item);

            } else if (((item.restoreStatus & LauncherAppWidgetInfo.FLAG_UI_NOT_READY) != 0)

                    && (appWidgetInfo.configure == null)) {

                // If the ID is already valid, verify if we need to configure or not.

                item.restoreStatus = LauncherAppWidgetInfo.RESTORE_COMPLETED;

                LauncherModel.updateItemInDatabase(this, item);

            }

        }



        if (!mIsSafeModeEnabled && item.restoreStatus == LauncherAppWidgetInfo.RESTORE_COMPLETED) {

src/com/android/launcher3/LauncherModel.java

+7 −1
Original line number Diff line number Diff line
@@ -2195,7 +2195,7 @@ public class LauncherModel extends BroadcastReceiver 


                                            // Id would be valid only if the widget restore broadcast was received.

                                            if (isIdValid) {

                                                status = LauncherAppWidgetInfo.RESTORE_COMPLETED;

                                                status = LauncherAppWidgetInfo.FLAG_UI_NOT_READY;

                                            } else {

                                                status &= ~LauncherAppWidgetInfo

                                                        .FLAG_PROVIDER_NOT_READY;
@@ -3197,6 +3197,12 @@ public class LauncherModel extends BroadcastReceiver 
                                widgetInfo.restoreStatus &=

                                        ~LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY &

                                        ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED;



                                // adding this flag ensures that launcher shows 'click to setup'

                                // if the widget has a config activity. In case there is no config

                                // activity, it will be marked as 'restored' during bind.

                                widgetInfo.restoreStatus |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY;



                                widgets.add(widgetInfo);

                                updateItemInDatabase(context, widgetInfo);

                            }