Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bde7780 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Remove unused code in WindowMagnificationSettings.java" into main

parents 8caf8d6f eefe10e9
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
import android.view.WindowMetrics;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.widget.Button;
@@ -75,7 +74,6 @@ import java.util.Collections;
class WindowMagnificationSettings implements MagnificationGestureDetector.OnGestureListener {
    private static final String TAG = "WindowMagnificationSettings";
    private final Context mContext;
    private final AccessibilityManager mAccessibilityManager;
    private final WindowManager mWindowManager;
    private final SecureSettings mSecureSettings;

@@ -97,7 +95,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
    private MaterialSwitch mMagnifyKeyboardSwitch;
    private LinearLayout mMagnifyTypingView;
    private MaterialSwitch mMagnifyTypingSwitch;
    private LinearLayout mPanelView;
    private LinearLayout mSettingView;
    private ImageButton mSmallButton;
    private ImageButton mMediumButton;
@@ -145,7 +142,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
            SfVsyncFrameCallbackProvider sfVsyncFrameProvider, SecureSettings secureSettings,
            WindowManager windowManager) {
        mContext = context;
        mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class);
        mWindowManager = windowManager;
        mSfVsyncFrameProvider = sfVsyncFrameProvider;
        mCallback = callback;
@@ -551,7 +547,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest

        mSettingView.setAccessibilityDelegate(mPanelDelegate);

        mPanelView = mSettingView.findViewById(R.id.magnifier_panel_view);
        mSmallButton = mSettingView.findViewById(R.id.magnifier_small_button);
        mMediumButton = mSettingView.findViewById(R.id.magnifier_medium_button);
        mLargeButton = mSettingView.findViewById(R.id.magnifier_large_button);
+0 −7
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase {
    private TestableWindowManager mWindowManager;
    private WindowMagnificationSettings mWindowMagnificationSettings;
    private MotionEventHelper mMotionEventHelper = new MotionEventHelper();

    private ArgumentCaptor<Float> mSecureSettingsScaleCaptor;
    private ArgumentCaptor<String> mSecureSettingsNameCaptor;
    private ArgumentCaptor<Integer> mSecureSettingsUserHandleCaptor;
    private ArgumentCaptor<Float> mCallbackMagnifierScaleCaptor;

    @Before
@@ -134,9 +130,6 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase {

        mSettingView = mWindowMagnificationSettings.getSettingView();
        mZoomSeekbar = mSettingView.findViewById(R.id.magnifier_zoom_slider);
        mSecureSettingsScaleCaptor = ArgumentCaptor.forClass(Float.class);
        mSecureSettingsNameCaptor = ArgumentCaptor.forClass(String.class);
        mSecureSettingsUserHandleCaptor = ArgumentCaptor.forClass(Integer.class);
        mCallbackMagnifierScaleCaptor = ArgumentCaptor.forClass(Float.class);
    }