| Index: chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java b/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
|
| index 46d59d4ab13a5b708eca47972cfe3dd75120ba06..020600718ab25ca83665bd08a248c00362196582 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
|
| @@ -4,14 +4,11 @@
|
|
|
| package org.chromium.chrome.browser.device;
|
|
|
| -import android.content.Context;
|
| -import android.view.accessibility.AccessibilityManager;
|
| -
|
| import org.chromium.base.CommandLine;
|
| import org.chromium.base.ContextUtils;
|
| import org.chromium.base.SysUtils;
|
| -import org.chromium.base.TraceEvent;
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| +import org.chromium.chrome.browser.util.AccessibilityUtil;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
|
|
| /**
|
| @@ -109,11 +106,10 @@ public class DeviceClassManager {
|
| }
|
|
|
| /**
|
| - * @param context A {@link Context} instance.
|
| - * @return Whether or not we are showing animations.
|
| + * @return Whether or not we are showing animations.
|
| */
|
| - public static boolean enableAnimations(Context context) {
|
| - return getInstance().mEnableAnimations && !isAccessibilityModeEnabled(context);
|
| + public static boolean enableAnimations() {
|
| + return getInstance().mEnableAnimations && !AccessibilityUtil.isAccessibilityEnabled();
|
| }
|
|
|
| /**
|
| @@ -136,14 +132,4 @@ public class DeviceClassManager {
|
| public static boolean disableDomainReliability() {
|
| return getInstance().mDisableDomainReliability;
|
| }
|
| -
|
| - public static boolean isAccessibilityModeEnabled(Context context) {
|
| - TraceEvent.begin("DeviceClassManager::isAccessibilityModeEnabled");
|
| - AccessibilityManager manager = (AccessibilityManager)
|
| - context.getSystemService(Context.ACCESSIBILITY_SERVICE);
|
| - boolean enabled = manager != null && manager.isEnabled()
|
| - && manager.isTouchExplorationEnabled();
|
| - TraceEvent.end("DeviceClassManager::isAccessibilityModeEnabled");
|
| - return enabled;
|
| - }
|
| }
|
|
|