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

Commit ecb18a65 authored by Xin Li's avatar Xin Li
Browse files

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 

Bug: 172690556
Merged-In: I56abeae5adec79a1c7bdad1a261f0f62c055cf2e
Change-Id: I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa
parents 75338fd4 b3ab1189

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"

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

            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"

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

            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"

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

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity="" />

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java

+2 −3
Original line number Diff line number Diff line
@@ -71,10 +71,9 @@ public class HotseatFileLog { 
    }



    private PrintWriter getWriter() {

        String fName = FILE_NAME_PREFIX + (LOG_DAYS % 10);

        if (fName.equals(mFileName)) return mCurrentWriter;



        Calendar cal = Calendar.getInstance();

        String fName = FILE_NAME_PREFIX + (cal.get(Calendar.DAY_OF_YEAR) % 10);

        if (fName.equals(mFileName)) return mCurrentWriter;



        boolean append = false;

        File logFile = new File(mLogsDir, fName);

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.launcher3.provider.LauncherDbUtils; 
 */

public class HotseatRestoreHelper {

    private final Launcher mLauncher;

    private boolean mBackupRestored = false;



    HotseatRestoreHelper(Launcher context) {

        mLauncher = context;
@@ -62,7 +61,6 @@ public class HotseatRestoreHelper { 
     * Finds and restores a previously saved snapshow of Favorites table

     */

    public void restoreBackup() {

        if (mBackupRestored) return;

        MODEL_EXECUTOR.execute(() -> {

            try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)

                    LauncherSettings.Settings.call(
@@ -78,7 +76,6 @@ public class HotseatRestoreHelper { 
                        idp.numRows);

                backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);

                transaction.commit();

                mBackupRestored = true;

                mLauncher.getModel().forceReload();

            }

        });