Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix toast with accessibility and app pinning

Browse Source 
Bug: 28912468
Change-Id: Ica33ba691bbcb921c5d3e953890498c04bb624e3
This commit is contained in:
Jorim Jaggi
2016-05-25 14:14:46 -07:00
parent bd34103c5d
commit cf984c56ad
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -4081,8 +4081,6 @@
<!-- Notify use that they are in Lock-to-app --> <!-- Notify use that they are in Lock-to-app -->
<string name="lock_to_app_toast">To unpin this screen, touch &amp; hold Back.</string> <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 --> <!-- 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> <string name="lock_to_app_toast_locked">App is pinned: Unpinning isn\'t allowed on this device.</string>
<!-- Starting lock-to-app indication. --> <!-- Starting lock-to-app indication. -->

1
core/res/res/values/symbols.xml
View File

@@ -698,7 +698,6 @@
<java-symbol type="string" name="last_month" /> <java-symbol type="string" name="last_month" />
<java-symbol type="string" name="launchBrowserDefault" /> <java-symbol type="string" name="launchBrowserDefault" />
<java-symbol type="string" name="lock_to_app_toast" /> <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_toast_locked" />
<java-symbol type="string" name="lock_to_app_start" /> <java-symbol type="string" name="lock_to_app_start" />
<java-symbol type="string" name="lock_to_app_exit" /> <java-symbol type="string" name="lock_to_app_exit" />

7
services/core/java/com/android/server/am/LockTaskNotify.java
View File

@@ -21,7 +21,6 @@ import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.R; import com.android.internal.R;
@@ -35,13 +34,10 @@ public class LockTaskNotify {
private final Context mContext; private final Context mContext;
private final H mHandler; private final H mHandler;
private AccessibilityManager mAccessibilityManager;
private Toast mLastToast; private Toast mLastToast;
public LockTaskNotify(Context context) { public LockTaskNotify(Context context) {
mContext = context; mContext = context;
mAccessibilityManager = (AccessibilityManager)
mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
mHandler = new H(); mHandler = new H();
} }
@@ -54,8 +50,7 @@ public class LockTaskNotify {
if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_LOCKED) { if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_LOCKED) {
text = mContext.getString(R.string.lock_to_app_toast_locked); text = mContext.getString(R.string.lock_to_app_toast_locked);
} else if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_PINNED) { } else if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_PINNED) {
text = mContext.getString(mAccessibilityManager.isEnabled() text = mContext.getString(R.string.lock_to_app_toast);
? R.string.lock_to_app_toast_accessible : R.string.lock_to_app_toast);
} }
if (text == null) { if (text == null) {
return; return;