Skip to content

GitLab

T
tangled
Commit 5c195e3b authored by Henrique Nakashima's avatar Henrique Nakashima Committed by Commit Bot
Browse files
Options

Remove unused methods in AccessibilityUtil. 

These methods were added for crbug.com/358708 but the usage was
Reverted shortly after and they were not cleaned up.

This is a reland of
https://chromium-review.googlesource.com/c/chromium/src/+/1808082
which was reverted because IDS_UPDATE_FROM_MARKET because an unused
resource in builds with arcore disabled.

The fix is to move the resource into a section of the strings
protected by '<if expr="enable_arcore">', see
https://chromium-review.googlesource.com/c/chromium/src/+/1810847/2..3

TBR=dmazzoni@chromium.org,twellington@chromium.org

Bug: 995916, 1005188
Change-Id: Ida0ec91096293735e0112d4a5fcc74a406befc99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810847Reviewed-by: default avatarHenrique Nakashima <hnakashima@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697798}
parent a10146dc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 97 deletions
chrome/android/java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java
View file @ 5c195e3b
......@@ -8,11 +8,7 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.support.v7.app.AlertDialog;
import android.view.Gravity;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
......@@ -21,10 +17,7 @@ import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ApplicationStatus.ActivityStateListener;
import org.chromium.base.ContextUtils;
import org.chromium.base.PackageUtils;
import org.chromium.base.TraceEvent;
import org.chromium.chrome.R;
import org.chromium.ui.UiUtils;
import org.chromium.ui.widget.Toast;
import java.util.List;
......@@ -33,21 +26,6 @@ import java.util.List;
* Exposes information about the current accessibility state
*/
public class AccessibilityUtil {
// Whether we've already shown an alert that they have an old version of TalkBack running.
private static boolean sOldTalkBackVersionAlertShown;
// The link to download or update TalkBack from the Play Store.
private static final String TALKBACK_MARKET_LINK =
"market://search?q=pname:com.google.android.marvin.talkback";
// The package name for TalkBack, an Android accessibility service.
private static final String TALKBACK_PACKAGE_NAME =
"com.google.android.marvin.talkback";
// The minimum TalkBack version that we support. This is the version that shipped with
// KitKat, from fall 2013. Versions older than that should be updated.
private static final int MIN_TALKBACK_VERSION = 105;
private static Boolean sIsAccessibilityEnabled;
private static ActivityStateListener sActivityStateListener;
......@@ -115,7 +93,7 @@ public class AccessibilityUtil {
}
/**
* Checks whether the given {@link AccesibilityServiceInfo} can perform gestures.
* Checks whether the given {@link AccessibilityServiceInfo} can perform gestures.
* @param service The service to check.
* @return Whether the {@code service} can perform gestures. On N+, this relies on the
* capabilities the service can perform. On L & M, this looks specifically for
......@@ -133,69 +111,6 @@ public class AccessibilityUtil {
return false;
}
/**
* Checks to see if an old version of TalkBack is running that Chrome doesn't support,
* and if so, shows an alert dialog prompting the user to update the app.
* @param context A {@link Context} instance.
* @return True if the dialog was shown.
*/
public static boolean showWarningIfOldTalkbackRunning(Context context) {
AccessibilityManager manager = (AccessibilityManager)
context.getSystemService(Context.ACCESSIBILITY_SERVICE);
if (manager == null) return false;
boolean isTalkbackRunning = false;
try {
List<AccessibilityServiceInfo> services =
manager.getEnabledAccessibilityServiceList(
AccessibilityServiceInfo.FEEDBACK_SPOKEN);
for (AccessibilityServiceInfo service : services) {
if (service.getId().contains(TALKBACK_PACKAGE_NAME)) isTalkbackRunning = true;
}
} catch (NullPointerException e) {
// getEnabledAccessibilityServiceList() can throw an NPE due to a bad
// AccessibilityService.
}
if (!isTalkbackRunning) return false;
if (PackageUtils.getPackageVersion(context, TALKBACK_PACKAGE_NAME) < MIN_TALKBACK_VERSION
&& !sOldTalkBackVersionAlertShown) {
showOldTalkbackVersionAlertOnce(context);
return true;
}
return false;
}
private static void showOldTalkbackVersionAlertOnce(final Context context) {
if (sOldTalkBackVersionAlertShown) return;
sOldTalkBackVersionAlertShown = true;
AlertDialog.Builder builder =
new UiUtils
.CompatibleAlertDialogBuilder(context, R.style.Theme_Chromium_AlertDialog)
.setTitle(R.string.old_talkback_title)
.setPositiveButton(R.string.update_from_market,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
Uri marketUri = Uri.parse(TALKBACK_MARKET_LINK);
Intent marketIntent =
new Intent(Intent.ACTION_VIEW, marketUri);
context.startActivity(marketIntent);
}
})
.setNegativeButton(R.string.cancel_talkback_alert,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
// Do nothing, this alert is only shown once either way.
}
});
AlertDialog dialog = builder.create();
dialog.show();
}
/**
* Shows the content description toast for items on the toolbar.
* @param context The context to use for the toast.
......
chrome/android/java/strings/android_chrome_strings.grd
View file @ 5c195e3b
......@@ -2203,17 +2203,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
A
</message>
<!-- TalkBack upgrade -->
<message name="IDS_OLD_TALKBACK_TITLE" desc="Title of dialog notifying user that the version of TalkBack they're running is too old.">
You need to update TalkBack to a newer version.
</message>
<message name="IDS_UPDATE_FROM_MARKET" desc="Title of button that will direct the user to update TalkBack from the market (Play Store)">
Update
</message>
<message name="IDS_CANCEL_TALKBACK_ALERT" desc="Title of button that will cancel the TalkBack alert dialog dialog.">
Cancel
</message>
<!-- Android NFC Beam strings -->
<message name="IDS_NFC_BEAM_ERROR_OVERLAY_ACTIVE" desc="Android Beam error - a tab is not in the foreground [CHAR-LIMIT=40]">
Select a tab to beam
......@@ -3724,6 +3713,11 @@ The site does NOT gain access to the camera. The camera images are only visible
<message name="IDS_AR_IMMERSIVE_MODE_CONSENT_BUTTON" desc="Confirm button for dialog shown when a site requests consent for starting an augmented reality session.">
Enter AR
</message>
<!-- App upgrade from Play Store -->
<message name="IDS_UPDATE_FROM_MARKET" desc="Title of button that will direct the user to update an app from the market (Play Store)">
Update
</message>
</if>
<!-- Dynamic feature modules -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment