Drop not needed and not working functionality

Signed-off-by: Patryk Miś <foss@patrykmis.com>
GrapheneOS · Mar 25, 2024 · ec6af73 · ec6af73
1 parent d392275
commit ec6af73
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/HelpAndFeedbackUtils.java b/talkback/src/main/java/com/google/android/accessibility/talkback/HelpAndFeedbackUtils.java
@@ -23,6 +23,6 @@ public final class HelpAndFeedbackUtils {
   public static void launchHelpAndFeedback(Activity activity) {}
 
   public static boolean supportsHelpAndFeedback(Context context) {
-    return true;
+    return false;
   }
 }
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/actor/ImageCaptioner.java b/talkback/src/main/java/com/google/android/accessibility/talkback/actor/ImageCaptioner.java
@@ -139,7 +139,7 @@ public class ImageCaptioner extends Handler
 
   private static final String TAG = "ImageCaptioner";
   public static final int CAPTION_REQUEST_CAPACITY = 10;
-  private static boolean supportIconDetection = true;
+  private static boolean supportIconDetection = false;
   private static final int MSG_RESULT_TIMEOUT = 0;
   private static final long RESULT_MAX_WAITING_TIME_MS = 5000;
   private static final ExecutorService executorService = Executors.newSingleThreadExecutor();

diff --git a/...va/com/google/android/accessibility/talkback/preference/base/TutorialAndHelpFragment.java b/...va/com/google/android/accessibility/talkback/preference/base/TutorialAndHelpFragment.java
@@ -101,11 +101,7 @@ private void assignFeedbackIntentToPreference() {
           });
     } else {
       pref.setTitle(R.string.title_pref_help);
-      if (FormFactorUtils.getInstance().isAndroidTv()) {
-        pref.setIntent(new Intent(getContext(), WebActivity.class).setData(Uri.parse(HELP_URL)));
-      } else {
-        RemoteIntentUtils.assignWebIntentToPreference(this, pref, HELP_URL);
-      }
+      pref.setIntent(new Intent(getContext(), WebActivity.class).setData(Uri.parse(HELP_URL)));
     }
   }
 }
diff --git a/utils/src/main/java/com/google/android/accessibility/utils/PackageManagerUtils.java b/utils/src/main/java/com/google/android/accessibility/utils/PackageManagerUtils.java
@@ -38,11 +38,6 @@ public class PackageManagerUtils {
   public static final String TALKBACK_SERVICE_NAME =
       "com.google.android.marvin.talkback.TalkBackService";
 
-  /** gmscore-package-name constants */
-  private static final String GMSCORE_PACKAGE_NAME = "com.google.android.gms";
-
-  private static final int MIN_GMSCORE_VERSION = 9200000; // Version should be at least V4.
-
   /** Returns the package version code. */
   public static long getVersionCode(Context context) {
     return getVersionCodeCompat(context, context.getPackageName());
@@ -96,7 +91,7 @@ public static boolean hasPackage(Context context, String packageName) {
 
   /** Returns {@code true} if the platform has GMS core package */
   public static boolean hasGmsCorePackage(Context context) {
-    return hasPackage(context, GMSCORE_PACKAGE_NAME);
+    return false;
   }
 
   /** Returns {@code true} if the package is Talkback package */
@@ -106,7 +101,7 @@ public static boolean isTalkBackPackage(@Nullable CharSequence packageName) {
 
   /** Returns {@code true} if the package supports help and feedback. */
   public static boolean supportsHelpAndFeedback(Context context) {
-    return getVersionCodeCompat(context, GMSCORE_PACKAGE_NAME) > MIN_GMSCORE_VERSION;
+    return false;
   }
 
   private static @Nullable PackageInfo getPackageInfo(Context context, CharSequence packageName) {