From 4cdddbac429d7eeaeec18856ac6581ed8cfef54c Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Wed, 7 Nov 2018 09:59:51 -0800 Subject: [PATCH] Fix String comparison as if Java were Dart. (#6781) This also removes unused imports and sorts imports correctly --- .../android/io/flutter/view/FlutterView.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 7609aaf77..d837522df 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -5,25 +5,20 @@ package io.flutter.view; import android.app.Activity; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.database.ContentObserver; -import android.graphics.PixelFormat; -import android.provider.Settings; -import android.net.Uri; -import android.os.Handler; import android.graphics.Bitmap; +import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.SurfaceTexture; +import android.net.Uri; import android.os.Build; +import android.os.Handler; +import android.provider.Settings; import android.text.format.DateFormat; import android.util.AttributeSet; import android.util.Log; -import android.util.TypedValue; import android.view.*; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeProvider; @@ -35,10 +30,8 @@ import io.flutter.plugin.common.*; import io.flutter.plugin.editing.TextInputPlugin; import io.flutter.plugin.platform.PlatformPlugin; import org.json.JSONException; -import org.json.JSONObject; import java.lang.reflect.Method; -import java.net.URI; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.*; @@ -972,7 +965,7 @@ public class FlutterView extends SurfaceView public void onChange(boolean selfChange, Uri uri) { String value = Settings.Global.getString(getContext().getContentResolver(), Settings.Global.TRANSITION_ANIMATION_SCALE); - if (value == "0") { + if (value != null && value.equals("0")) { mAccessibilityFeatureFlags ^= AccessibilityFeature.DISABLE_ANIMATIONS.value; } else { mAccessibilityFeatureFlags &= ~AccessibilityFeature.DISABLE_ANIMATIONS.value; -- GitLab