提交: f8587212e5072723db0a3bcc0311518c5438f8dd - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修訂: f8587212e5072723db0a3bcc0311518c5438f8dd (tree)
• 時間: 2020-05-06 11:01:14
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 9.0.0 release 56
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXrBHTQAKCRDorT+BmrEO
eF6zAJsE6CyIZ2fZxtdoyH5gNi1fgeA7WwCfSmdup7AjSci3zfkTOSUDoTdNyuI=
=9aGq
-----END PGP SIGNATURE-----

Merge tag 'android-9.0.0_r56' into pie-x86

Android 9.0.0 release 56

Change Summary

• modified: src/com/android/settings/SettingsActivity.java
• modified: src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

差異

--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -236,7 +236,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();
         }
@@ -810,6 +810,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());

--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -139,6 +139,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
         }
     }
 
+    @Override
+    public boolean isLaunchableInTaskModePinned() {
+        return true;
+    }
+
     public void prepareEnterAnimation() {
         getFragment().prepareEnterAnimation();
     }