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

Commit 7e28298e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284,... 

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-release

Change-Id: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
parents 360a04f3 abe9cee2

src/com/android/settings/core/SettingsBaseActivity.java

+8 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class SettingsBaseActivity extends FragmentActivity { 
    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

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

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

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

            finish();

        }
@@ -147,6 +147,13 @@ public class SettingsBaseActivity extends FragmentActivity { 
        ((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);

    }



    /**

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

     */

    public boolean isLaunchableInTaskModePinned() {

        return false;

    }



    private void onCategoriesChanged() {

        final int N = mCategoryListeners.size();

        for (int i = 0; i < N; i++) {

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

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

    }



    @Override

    public boolean isLaunchableInTaskModePinned() {

        return true;

    }



    public void prepareEnterAnimation() {

        getFragment().prepareEnterAnimation();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public final class PasswordUtils extends com.android.settingslib.Utils { 
                    /* initialPid= */ -1,

                    getCallingAppPackageName(activityToken),

                    userId,

                    message);

                    message,

                    false);

        } catch (RemoteException e) {

            Log.v(TAG, "Could not talk to activity manager.", e);

        }