diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 22329422251bc..9d714758f3aef 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4081,8 +4081,6 @@ To unpin this screen, touch & hold Back. - - To unpin this screen, touch & hold Overview. App is pinned: Unpinning isn\'t allowed on this device. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ba58f15d71e9a..4925e52db6dc0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -698,7 +698,6 @@ - diff --git a/services/core/java/com/android/server/am/LockTaskNotify.java b/services/core/java/com/android/server/am/LockTaskNotify.java index afde3226e9339..8c18c462e956a 100644 --- a/services/core/java/com/android/server/am/LockTaskNotify.java +++ b/services/core/java/com/android/server/am/LockTaskNotify.java @@ -21,7 +21,6 @@ import android.content.Context; import android.os.Handler; import android.os.Message; import android.view.WindowManager; -import android.view.accessibility.AccessibilityManager; import android.widget.Toast; import com.android.internal.R; @@ -35,13 +34,10 @@ public class LockTaskNotify { private final Context mContext; private final H mHandler; - private AccessibilityManager mAccessibilityManager; private Toast mLastToast; public LockTaskNotify(Context context) { mContext = context; - mAccessibilityManager = (AccessibilityManager) - mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mHandler = new H(); } @@ -54,8 +50,7 @@ public class LockTaskNotify { if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_LOCKED) { text = mContext.getString(R.string.lock_to_app_toast_locked); } else if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_PINNED) { - text = mContext.getString(mAccessibilityManager.isEnabled() - ? R.string.lock_to_app_toast_accessible : R.string.lock_to_app_toast); + text = mContext.getString(R.string.lock_to_app_toast); } if (text == null) { return;