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

Commit e38bc456 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c... 

Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c am: ff029854" into nyc-mr1-dev-plus-aosp
parents c3137c85 621a2bad

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -4081,8 +4081,6 @@ 


    <!-- Notify use that they are in Lock-to-app -->

    <string name="lock_to_app_toast">To unpin this screen, touch &amp; hold Back.</string>

    <!-- Notify use that they are in Lock-to-app in accessibility mode -->

    <string name="lock_to_app_toast_accessible">To unpin this screen, touch &amp; hold Overview.</string>

    <!-- Notify user that they are locked in lock-to-app mode -->

    <string name="lock_to_app_toast_locked">App is pinned: Unpinning isn\'t allowed on this device.</string>

    <!-- Starting lock-to-app indication. -->

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ 
  <java-symbol type="string" name="last_month" />

  <java-symbol type="string" name="launchBrowserDefault" />

  <java-symbol type="string" name="lock_to_app_toast" />

  <java-symbol type="string" name="lock_to_app_toast_accessible" />

  <java-symbol type="string" name="lock_to_app_toast_locked" />

  <java-symbol type="string" name="lock_to_app_start" />

  <java-symbol type="string" name="lock_to_app_exit" />

services/core/java/com/android/server/am/LockTaskNotify.java

+1 −6
Original line number Diff line number Diff line
@@ -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;