PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Touchpad: fix some NullAway warnings

Browse Source 
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
This commit is contained in:
Harry Cutts
2025-01-02 18:31:57 +00:00
parent 509fd17515
commit ae3e005ff9
3 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/inputmethod/TouchpadGestureDialogFragment.java
View File

@@ -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<View> 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<View>();
@@ -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;
}
}

5
src/com/android/settings/inputmethod/TouchpadGesturesTutorialButtonPreferenceController.java
View File

@@ -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);

13
src/com/android/settings/inputmethod/TouchpadPointerSpeedPreferenceController.java
View File

@@ -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