From ae3e005ff9f9fe1745f14ca7841a54762e2db61d Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Thu, 2 Jan 2025 18:31:57 +0000 Subject: [PATCH 1/3] Touchpad: fix some NullAway warnings Change I930e9fc85e09e03da3513e5f8443077fa8ea91b0 triggered some NullAway warnings that are unrelated to the change, but some are trivial to fix, for example by replacing member variables with local ones. At the same time, add some `@NonNull` annotations to overriding methods on Android Studio's recommendation. Test: check touchpad gesture tutorial and pointer speed settings work Test: $ atest SettingsRoboTests:com.android.settings.inputmethod Bug: 245989146 Flag: EXEMPT refactor Change-Id: I717eb2a2d68a46dce8ebaa95bef1183d09380f51 --- .../TouchpadGestureDialogFragment.java | 43 +++++++++---------- ...resTutorialButtonPreferenceController.java | 5 ++- ...chpadPointerSpeedPreferenceController.java | 13 +++--- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java b/src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java index ba753a8656e..3a0effcda38 100644 --- a/src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java +++ b/src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java @@ -37,6 +37,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.ImageView; +import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; @@ -51,10 +52,6 @@ import java.util.Arrays; public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { private Context mContext; - private LayoutInflater mInflater; - private View mViewArrowPrevious; - private View mViewArrowNext; - private ViewPager mViewPager; private ArrayList mPageList; private ImageView[] mDotIndicators; private View[] mViewPagerItems; @@ -68,7 +65,7 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { private static final int DOT_INDICATOR_RIGHT_PADDING = 6; @Override - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { super.onAttach(context); mContext = context; } @@ -111,13 +108,14 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { window.setNavigationBarColor(Color.TRANSPARENT); } + @NonNull @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { Dialog dialog = super.onCreateDialog(savedInstanceState); - mInflater = mContext.getSystemService(LayoutInflater.class); - View contentView = mInflater.inflate(R.layout.touchpad_gesture_preview, null); - addViewPager(contentView); + LayoutInflater inflater = mContext.getSystemService(LayoutInflater.class); + View contentView = inflater.inflate(R.layout.touchpad_gesture_preview, null); + addViewPager(contentView, inflater); dialog.setContentView(contentView); Window gestureDialogWindow = dialog.getWindow(); gestureDialogWindow.setType(TYPE_SYSTEM_DIALOG); @@ -145,7 +143,7 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { // The gesture education view shouldn't be draggable." behavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { @Override - public void onStateChanged(View bottomSheet, int newState) { + public void onStateChanged(@NonNull View bottomSheet, int newState) { if (newState == BottomSheetBehavior.STATE_DRAGGING) { if (isGestureNavigationEnabled()) { behavior.setState(BottomSheetBehavior.STATE_COLLAPSED); @@ -156,7 +154,7 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { } @Override - public void onSlide(View bottomSheet, float slideOffset) { + public void onSlide(@NonNull View bottomSheet, float slideOffset) { // Do nothing. } }); @@ -174,13 +172,12 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { R.layout.gesture_tip5_switch_apps)); } - private void addViewPager(View preview) { - mViewPager = preview.findViewById(R.id.viewpager); + private void addViewPager(View preview, LayoutInflater inflater) { + ViewPager viewPager = preview.findViewById(R.id.viewpager); int viewPagerResourceSize = getViewPagerResource().size(); mViewPagerItems = new View[viewPagerResourceSize]; for (int i = 0; i < viewPagerResourceSize; i++) { - mViewPagerItems[i] = - mInflater.inflate(getViewPagerResource().get(i), null /* root */); + mViewPagerItems[i] = inflater.inflate(getViewPagerResource().get(i), null /* root */); } mPageList = new ArrayList(); @@ -188,12 +185,12 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { mPageList.add(mViewPagerItems[i]); } - mViewPager.setAdapter(new GesturePagerAdapter(mPageList)); + viewPager.setAdapter(new GesturePagerAdapter(mPageList)); mButtonStartRestart = (Button) preview.findViewById(R.id.button_restart); mButtonStartRestart.setOnClickListener(v -> { - final int firstPos = mViewPager.getCurrentItem() - mViewPagerItems.length; - mViewPager.setCurrentItem(firstPos, true); + final int firstPos = viewPager.getCurrentItem() - mViewPagerItems.length; + viewPager.setCurrentItem(firstPos, true); }); mButtonEndDone = (Button) preview.findViewById(R.id.button_done); @@ -208,11 +205,11 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { mButtonEndNext = (Button) preview.findViewById(R.id.button_next); mButtonEndNext.setOnClickListener(v -> { - final int nextPos = mViewPager.getCurrentItem() + 1; - mViewPager.setCurrentItem(nextPos, true); + final int nextPos = viewPager.getCurrentItem() + 1; + viewPager.setCurrentItem(nextPos, true); }); - mViewPager.addOnPageChangeListener(createPageListener()); + viewPager.addOnPageChangeListener(createPageListener()); final ViewGroup viewGroup = (ViewGroup) preview.findViewById(R.id.viewGroup); mDotIndicators = new ImageView[mPageList.size()]; for (int i = 0; i < mPageList.size(); i++) { @@ -234,12 +231,14 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { } @Override - public void destroyItem(ViewGroup container, int position, Object object) { + public void destroyItem(@NonNull ViewGroup container, int position, + @NonNull Object object) { if (mPageViewList.get(position) != null) { container.removeView(mPageViewList.get(position)); } } + @NonNull @Override public Object instantiateItem(ViewGroup container, int position) { container.addView(mPageViewList.get(position)); @@ -252,7 +251,7 @@ public class TouchpadGestureDialogFragment extends BottomSheetDialogFragment { } @Override - public boolean isViewFromObject(View view, Object object) { + public boolean isViewFromObject(@NonNull View view, @NonNull Object object) { return object == view; } } diff --git a/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java index f13dc33e047..8fa0b5de2dd 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.Nullable; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; @@ -40,8 +41,8 @@ public class TouchpadGesturesTutorialButtonPreferenceController extends BasePref private static final String GESTURE_DIALOG_TAG = "GESTURE_DIALOG_TAG"; private static final String TUTORIAL_ACTION = "com.android.systemui.action.TOUCHPAD_TUTORIAL"; - private Fragment mParent; - private MetricsFeatureProvider mMetricsFeatureProvider; + private @Nullable Fragment mParent; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadGesturesTutorialButtonPreferenceController(Context context, String key) { super(context, key); diff --git a/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java index b54421d8054..dd19d14e94f 100644 --- a/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java @@ -29,8 +29,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class TouchpadPointerSpeedPreferenceController extends SliderPreferenceController { - private SeekBarPreference mPreference; - private MetricsFeatureProvider mMetricsFeatureProvider; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadPointerSpeedPreferenceController(Context context, String key) { super(context, key); @@ -40,11 +39,11 @@ public class TouchpadPointerSpeedPreferenceController extends SliderPreferenceCo @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mPreference = screen.findPreference(getPreferenceKey()); - mPreference.setMax(getMax()); - mPreference.setMin(getMin()); - mPreference.setProgress(getSliderPosition()); - updateState(mPreference); + SeekBarPreference preference = screen.findPreference(getPreferenceKey()); + preference.setMax(getMax()); + preference.setMin(getMin()); + preference.setProgress(getSliderPosition()); + updateState(preference); } @Override From 0e4edf9527a3de850166f815849c15d8f2965888 Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Wed, 8 Jan 2025 16:15:46 +0000 Subject: [PATCH 2/3] Touchpad: mark MetricsFeatureProviders final (Fixing some warnings from Android Studio) Bug: 245989146 Test: m Flag: EXEMPT refactor Change-Id: I3f473d281e8a22d108a52e56e6e53ca056e4a829 --- .../TouchpadReverseScrollingPreferenceController.java | 2 +- .../inputmethod/TouchpadRightClickZonePreferenceController.java | 2 +- .../inputmethod/TouchpadTapDraggingPreferenceController.java | 2 +- .../inputmethod/TouchpadTapToClickPreferenceController.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java index dfd763499f3..46fc576fc3a 100644 --- a/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadReverseScrollingPreferenceController.java @@ -27,7 +27,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class TouchpadReverseScrollingPreferenceController extends TogglePreferenceController { - private MetricsFeatureProvider mMetricsFeatureProvider; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadReverseScrollingPreferenceController(Context context, String key) { super(context, key); diff --git a/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java b/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java index f98812d563b..77b0b491844 100644 --- a/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadRightClickZonePreferenceController.java @@ -27,7 +27,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class TouchpadRightClickZonePreferenceController extends TogglePreferenceController { - private MetricsFeatureProvider mMetricsFeatureProvider; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadRightClickZonePreferenceController(Context context, String key) { super(context, key); diff --git a/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java index 59cf85d5a3a..12d426f45c0 100644 --- a/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadTapDraggingPreferenceController.java @@ -27,7 +27,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class TouchpadTapDraggingPreferenceController extends TogglePreferenceController { - private MetricsFeatureProvider mMetricsFeatureProvider; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadTapDraggingPreferenceController(Context context, String key) { super(context, key); diff --git a/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java b/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java index 4b9aa1f2ea3..54b34fdf921 100644 --- a/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java +++ b/src/com/android/settings/inputmethod/TouchpadTapToClickPreferenceController.java @@ -27,7 +27,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class TouchpadTapToClickPreferenceController extends TogglePreferenceController { - private MetricsFeatureProvider mMetricsFeatureProvider; + private final MetricsFeatureProvider mMetricsFeatureProvider; public TouchpadTapToClickPreferenceController(Context context, String key) { super(context, key); From fb0b459cf0eb09c86438af29e7703d3875ff1f62 Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Wed, 8 Jan 2025 16:11:47 +0000 Subject: [PATCH 3/3] 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(); }