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

Commit 3f039f73 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Default configuration activity to CANCELLED result"

parents b3e4ecfc 34b47532

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java

+7 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class PeopleSpaceActivity extends Activity { 
                INVALID_APPWIDGET_ID);

        mShowSingleConversation = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;

        setResult(RESULT_CANCELED);

        // Finish the configuration activity immediately if a widget is added for multiple

        // conversations. If the mAppWidgetId is INVALID, then the activity wasn't launched as a

        // widget configuration activity.
@@ -151,10 +152,14 @@ public class PeopleSpaceActivity extends Activity { 
    private void finishActivity() {

        if (PeopleSpaceUtils.DEBUG) Log.d(TAG, "Widget added!");

        mUiEventLogger.log(PeopleSpaceUtils.PeopleSpaceWidgetEvent.PEOPLE_SPACE_WIDGET_ADDED);

        setActivityResult(RESULT_OK);

        finish();

    }



    private void setActivityResult(int result) {

        Intent resultValue = new Intent();

        resultValue.putExtra(EXTRA_APPWIDGET_ID, mAppWidgetId);

        setResult(RESULT_OK, resultValue);

        finish();

        setResult(result, resultValue);

    }



    @Override