From fb0b459cf0eb09c86438af29e7703d3875ff1f62 Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Wed, 8 Jan 2025 16:11:47 +0000 Subject: [PATCH] Touchpad: add @NonNull annotations to controller constructors ...and to some of the preference controller base classes, too, since I had to work those out anyway. Bug: 245989146 Test: m Flag: EXEMPT unable to flag this kind of change Change-Id: I32ba2b6b8c05c1379b4d921350050979b1866805 --- src/com/android/settings/core/BasePreferenceController.java | 3 ++- .../android/settings/core/SliderPreferenceController.java | 3 ++- .../android/settings/core/TogglePreferenceController.java | 5 +++-- .../TouchpadGesturesDisabledFooterPreferenceController.java | 5 ++++- .../TouchpadGesturesTutorialButtonPreferenceController.java | 4 +++- .../TouchpadPointerSpeedPreferenceController.java | 3 ++- .../TouchpadReverseScrollingPreferenceController.java | 5 ++++- .../TouchpadRightClickZonePreferenceController.java | 5 ++++- .../inputmethod/TouchpadTapDraggingPreferenceController.java | 4 +++- .../inputmethod/TouchpadTapToClickPreferenceController.java | 4 +++- 10 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index 3f91fb70ab4..156b0620566 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -29,6 +29,7 @@ import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -194,7 +195,7 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl } } - public BasePreferenceController(Context context, String preferenceKey) { + public BasePreferenceController(@NonNull Context context, @NonNull String preferenceKey) { super(context); mPreferenceKey = preferenceKey; mPrefVisibility = true; diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 8c936f2a9b6..9cd4697eae6 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.core; import android.content.Context; +import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.slice.builders.SliceAction; @@ -24,7 +25,7 @@ import com.android.settings.slices.SliceData; public abstract class SliderPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { - public SliderPreferenceController(Context context, String preferenceKey) { + public SliderPreferenceController(@NonNull Context context, @NonNull String preferenceKey) { super(context, preferenceKey); } diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 459312a86fe..8889f8dae47 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -15,13 +15,14 @@ package com.android.settings.core; import android.content.Context; +import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; +import com.android.settings.onboarding.OnboardingFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SliceData; -import com.android.settings.onboarding.OnboardingFeatureProvider; import com.android.settings.widget.TwoStateButtonPreference; import com.android.settingslib.PrimarySwitchPreference; import com.android.settingslib.core.instrumentation.SettingsJankMonitor; @@ -37,7 +38,7 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle private static final String TAG = "TogglePrefController"; - public TogglePreferenceController(Context context, String preferenceKey) { + public TogglePreferenceController(@NonNull Context context, @NonNull String preferenceKey) { super(context, preferenceKey); } diff --git a/src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java index 6fc5f3b62e0..a99a7f8b2fe 100644 --- a/src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java @@ -19,11 +19,14 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; + import com.android.settings.core.BasePreferenceController; public class TouchpadGesturesDisabledFooterPreferenceController extends BasePreferenceController { - public TouchpadGesturesDisabledFooterPreferenceController(Context context, String key) { + public TouchpadGesturesDisabledFooterPreferenceController(@NonNull Context context, + @NonNull String key) { super(context, key); } diff --git a/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java index 8fa0b5de2dd..845ce47ad5f 100644 --- a/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.hardware.input.InputSettings; import android.os.UserHandle; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; @@ -44,7 +45,8 @@ public class TouchpadGesturesTutorialButtonPreferenceController extends BasePref private @Nullable Fragment mParent; private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadGesturesTutorialButtonPreferenceController(Context context, String key) { + public TouchpadGesturesTutorialButtonPreferenceController(@NonNull Context context, + @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java index dd19d14e94f..945ff43c7d9 100644 --- a/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java @@ -20,6 +20,7 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; import androidx.preference.PreferenceScreen; import com.android.settings.core.SliderPreferenceController; @@ -31,7 +32,7 @@ public class TouchpadPointerSpeedPreferenceController extends SliderPreferenceCo private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadPointerSpeedPreferenceController(Context context, String key) { + public TouchpadPointerSpeedPreferenceController(@NonNull Context context, @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java index 46fc576fc3a..68f26798c6b 100644 --- a/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java @@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -29,7 +31,8 @@ public class TouchpadReverseScrollingPreferenceController extends TogglePreferen private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadReverseScrollingPreferenceController(Context context, String key) { + public TouchpadReverseScrollingPreferenceController(@NonNull Context context, + @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java b/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java index 77b0b491844..73c051d5ba1 100644 --- a/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java @@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -29,7 +31,8 @@ public class TouchpadRightClickZonePreferenceController extends TogglePreference private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadRightClickZonePreferenceController(Context context, String key) { + public TouchpadRightClickZonePreferenceController(@NonNull Context context, + @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java index 12d426f45c0..ecd1b1045e4 100644 --- a/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java @@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -29,7 +31,7 @@ public class TouchpadTapDraggingPreferenceController extends TogglePreferenceCon private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadTapDraggingPreferenceController(Context context, String key) { + public TouchpadTapDraggingPreferenceController(@NonNull Context context, @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); } diff --git a/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java index 54b34fdf921..e0524157ca9 100644 --- a/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java @@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputSettings; +import androidx.annotation.NonNull; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -29,7 +31,7 @@ public class TouchpadTapToClickPreferenceController extends TogglePreferenceCont private final MetricsFeatureProvider mMetricsFeatureProvider; - public TouchpadTapToClickPreferenceController(Context context, String key) { + public TouchpadTapToClickPreferenceController(@NonNull Context context, @NonNull String key) { super(context, key); mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider(); }