Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev (5e788604) · Commits · e / os / android_packages_apps_Settings

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++) {

+5 −0

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

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

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