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

Commit fb0b459c authored by Harry Cutts's avatar Harry Cutts
Browse files

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
parent 0e4edf95

src/com/android/settings/core/BasePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/core/SliderPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/core/TogglePreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/inputmethod/TouchpadGesturesDisabledFooterPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -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();

    }