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

Commit a18b9f3e authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert_ui_mode_changes" into rvc-qpr-dev 

* changes:
  DO NOT MERGE Revert "Handle uiMode changes"
  DO NOT MERGE Revert "Defer recreation until resumed"
parents 64340cca 4b4341d3

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

quickstep/AndroidManifest-launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

quickstep/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
            android:stateNotNeeded="true"

            android:theme="@style/LauncherTheme"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity="" />

src/com/android/launcher3/BaseDraggingActivity.java

+1 −12
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.widget.Toast; 


import androidx.annotation.Nullable;



import com.android.launcher3.Launcher.OnResumeCallback;

import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.logging.InstanceId;

import com.android.launcher3.logging.InstanceIdSequence;
@@ -109,20 +108,10 @@ public abstract class BaseDraggingActivity extends BaseActivity 


    private void updateTheme() {

        if (mThemeRes != Themes.getActivityThemeRes(this)) {

            // Workaround (b/162812884): The system currently doesn't allow recreating an activity

            // when it is not resumed, in such a case defer recreation until it is possible

            if (hasBeenResumed()) {

            recreate();

            } else {

                addOnResumeCallback(this::recreate);

            }

        }

    }



    protected void addOnResumeCallback(OnResumeCallback callback) {

        // To be overridden

    }



    @Override

    public void onActionModeStarted(ActionMode mode) {

        super.onActionModeStarted(mode);

src/com/android/launcher3/Launcher.java

+0 −1
Original line number Diff line number Diff line
@@ -1944,7 +1944,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        return result;

    }



    @Override

    public void addOnResumeCallback(OnResumeCallback callback) {

        mOnResumeCallbacks.add(callback);

    }