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

Unverified Commit 790e1a4e authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r76' of... 

Merge tag 'android-8.1.0_r76' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-15.1_merge-android-8.1.0_r76

Android 8.1.0 release 76

* tag 'android-8.1.0_r76' of https://android.googlesource.com/platform/packages/apps/Settings:
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen

Change-Id: I5725957330a308ee9447f3cbc947e218ca661d4c
parents 279f9fca afdfe991

src/com/android/settings/SettingsActivity.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
    protected void onCreate(Bundle savedState) {

    protected void onCreate(Bundle savedState) {

        super.onCreate(savedState);

        super.onCreate(savedState);





        if (isLockTaskModePinned() && !isSettingsRunOnTop()) {

        if (isLockTaskModePinned() && !isSettingsRunOnTop() && !isLaunchableInTaskModePinned()) {

            Log.w(LOG_TAG, "Devices lock task mode pinned.");

            Log.w(LOG_TAG, "Devices lock task mode pinned.");

            finish();

            finish();

        }

        }
@@ -964,6 +964,13 @@ public class SettingsActivity extends SettingsDrawerActivity 
        startActivity(intent);

        startActivity(intent);

    }

    }





    /**

     * @return whether or not the activity can be launched from other apps in the pinning screen.

     */

    public boolean isLaunchableInTaskModePinned() {

        return false;

    }



    private boolean isLockTaskModePinned() {

    private boolean isLockTaskModePinned() {

        final ActivityManager activityManager =

        final ActivityManager activityManager =

            getApplicationContext().getSystemService(ActivityManager.class);

            getApplicationContext().getSystemService(ActivityManager.class);

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
        }

        }

    }

    }





    @Override

    public boolean isLaunchableInTaskModePinned() {

        return true;

    }



    public void prepareEnterAnimation() {

    public void prepareEnterAnimation() {

        getFragment().prepareEnterAnimation();

        getFragment().prepareEnterAnimation();

    }

    }