Merge tag 'android-9.0.0_r56' of... (141a3566) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		super.onCreate(savedState);
		Log.d(LOG_TAG, "Starting onCreate");

		if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
		if (isLockTaskModePinned() && !isSettingsRunOnTop() && !isLaunchableInTaskModePinned()) {
		Log.w(LOG_TAG, "Devices lock task mode pinned.");
		finish();
		}
		@@ -804,6 +804,13 @@ public class SettingsActivity extends SettingsDrawerActivity
		return mNextButton;
		}

		/**
		* @return whether or not the activity can be launched from other apps in the pinning screen.
		*/
		public boolean isLaunchableInTaskModePinned() {
		return false;
		}

		@VisibleForTesting
		Bitmap getBitmapFromXmlResource(int drawableRes) {
		Drawable drawable = getResources().getDrawable(drawableRes, getTheme());

+5 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		}
		}

		@Override
		public boolean isLaunchableInTaskModePinned() {
		return true;
		}

		public void prepareEnterAnimation() {
		getFragment().prepareEnterAnimation();
		}