From c9827b4918f234582e2ad4e7f7470dcfa1849d68 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 30 Mar 2018 16:17:12 -0700
Subject: [PATCH] Remove wrappers

Bug: 76167422
Test: robotests
Change-Id: Ic673fa2aa815b84da4b522dab85aacbeab6e39ec
---
 .../wrapper/AccessibilityManagerWrapper.java  | 38 -------------------
 .../shadow/ShadowAccessibilityManager.java    |  5 +++
 ...ShadowAccessibilityManagerWrapperImpl.java | 34 -----------------
 3 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100644 src/com/android/settings/wrapper/AccessibilityManagerWrapper.java
 delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java

diff --git a/src/com/android/settings/wrapper/AccessibilityManagerWrapper.java b/src/com/android/settings/wrapper/AccessibilityManagerWrapper.java
deleted file mode 100644
index 4fd7ccffa67..00000000000
--- a/src/com/android/settings/wrapper/AccessibilityManagerWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wrapper;
-
-import android.view.accessibility.AccessibilityManager;
-
-/**
- * This class replicates a subset of the {@link android.view.accessibility.AccessibilityManager}.
- * The interface exists so that we can use a thin wrapper around the AccessibilityManager in
- * production code and a mock in tests.
- */
-public class AccessibilityManagerWrapper {
-
-    /**
-     * Determines if the accessibility button within the system navigation area is supported.
-     *
-     * @return {@code true} if the accessibility button is supported on this device,
-     * {@code false} otherwise
-     * @hide
-     */
-    public static boolean isAccessibilityButtonSupported() {
-        return AccessibilityManager.isAccessibilityButtonSupported();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
index 7e21f1238df..124f635ea80 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
@@ -41,4 +41,9 @@ public class ShadowAccessibilityManager {
     public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList() {
         return mInstalledAccessibilityList;
     }
+
+    @Implementation
+    public static boolean isAccessibilityButtonSupported() {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
deleted file mode 100644
index 22a1c047f25..00000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settings.wrapper.AccessibilityManagerWrapper;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * This class provides shadow for API that is not supported in current roboletric
- */
-@Implements(AccessibilityManagerWrapper.class)
-public class ShadowAccessibilityManagerWrapperImpl {
-
-    @Implementation
-    public static boolean isAccessibilityButtonSupported() {
-        return true;
-    }
-}