LineageParts: Drop no longer necessary casts when calling findPreference() (7a3d2e13) · Commits · e / os / android_packages_apps_LineageParts

src/org/lineageos/lineageparts/hardware/DisplayRotation.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -60,13 +60,13 @@ public class DisplayRotation extends SettingsPreferenceFragment {

		PreferenceScreen prefSet = getPreferenceScreen();

		mAccelerometer = (SwitchPreference) findPreference(KEY_ACCELEROMETER);
		mAccelerometer = findPreference(KEY_ACCELEROMETER);
		mAccelerometer.setPersistent(false);

		mRotation0Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_0_PREF);
		mRotation90Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_90_PREF);
		mRotation180Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_180_PREF);
		mRotation270Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_270_PREF);
		mRotation0Pref = prefSet.findPreference(ROTATION_0_PREF);
		mRotation90Pref = prefSet.findPreference(ROTATION_90_PREF);
		mRotation180Pref = prefSet.findPreference(ROTATION_180_PREF);
		mRotation270Pref = prefSet.findPreference(ROTATION_270_PREF);

		int mode = Settings.System.getInt(getContentResolver(),
		Settings.System.ACCELEROMETER_ROTATION_ANGLES,

src/org/lineageos/lineageparts/input/ButtonSettings.java

+28 −41

Original line number	Diff line number	Diff line
		@@ -163,43 +163,34 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		final boolean showVolumeWake = (deviceWakeKeys & KEY_MASK_VOLUME) != 0;

		boolean hasAnyBindableKey = false;
		final PreferenceCategory powerCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_POWER);
		final PreferenceCategory homeCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_HOME);
		final PreferenceCategory backCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_BACK);
		final PreferenceCategory menuCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_MENU);
		final PreferenceCategory assistCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_ASSIST);
		final PreferenceCategory appSwitchCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_APPSWITCH);
		final PreferenceCategory volumeCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_VOLUME);
		final PreferenceCategory cameraCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_CAMERA);
		final PreferenceCategory powerCategory = prefScreen.findPreference(CATEGORY_POWER);
		final PreferenceCategory homeCategory = prefScreen.findPreference(CATEGORY_HOME);
		final PreferenceCategory backCategory = prefScreen.findPreference(CATEGORY_BACK);
		final PreferenceCategory menuCategory = prefScreen.findPreference(CATEGORY_MENU);
		final PreferenceCategory assistCategory = prefScreen.findPreference(CATEGORY_ASSIST);
		final PreferenceCategory appSwitchCategory = prefScreen.findPreference(CATEGORY_APPSWITCH);
		final PreferenceCategory volumeCategory = prefScreen.findPreference(CATEGORY_VOLUME);
		final PreferenceCategory cameraCategory = prefScreen.findPreference(CATEGORY_CAMERA);

		// Power button ends calls.
		mPowerEndCall = (SwitchPreference) findPreference(KEY_POWER_END_CALL);
		mPowerEndCall = findPreference(KEY_POWER_END_CALL);

		// Long press power while display is off to activate torchlight
		mTorchLongPressPowerGesture =
		(SwitchPreference) findPreference(KEY_TORCH_LONG_PRESS_POWER_GESTURE);
		mTorchLongPressPowerGesture = findPreference(KEY_TORCH_LONG_PRESS_POWER_GESTURE);
		final int torchLongPressPowerTimeout = LineageSettings.System.getInt(resolver,
		LineageSettings.System.TORCH_LONG_PRESS_POWER_TIMEOUT, 0);
		mTorchLongPressPowerTimeout = initList(KEY_TORCH_LONG_PRESS_POWER_TIMEOUT,
		torchLongPressPowerTimeout);

		// Home button answers calls.
		mHomeAnswerCall = (SwitchPreference) findPreference(KEY_HOME_ANSWER_CALL);
		mHomeAnswerCall = findPreference(KEY_HOME_ANSWER_CALL);

		mHandler = new Handler();

		// Force Navigation bar related options
		mDisableNavigationKeys = (SwitchPreference) findPreference(DISABLE_NAV_KEYS);
		mDisableNavigationKeys = findPreference(DISABLE_NAV_KEYS);

		mNavigationPreferencesCat = (PreferenceCategory) findPreference(CATEGORY_NAVBAR);
		mNavigationPreferencesCat = findPreference(CATEGORY_NAVBAR);

		Action defaultHomeLongPressAction = Action.fromIntSafe(res.getInteger(
		org.lineageos.platform.internal.R.integer.config_longPressOnHomeBehavior));
		@@ -221,7 +212,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		Action.NOTHING);

		// Navigation bar arrow keys while typing
		mNavigationArrowKeys = (SwitchPreference) findPreference(KEY_NAVIGATION_ARROW_KEYS);
		mNavigationArrowKeys = findPreference(KEY_NAVIGATION_ARROW_KEYS);

		// Navigation bar home long press
		mNavigationHomeLongPressAction = initList(KEY_NAVIGATION_HOME_LONG_PRESS,
		@@ -357,10 +348,9 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		}

		if (hasCameraKey) {
		mCameraWakeScreen = (SwitchPreference) findPreference(LineageSettings.System.CAMERA_WAKE_SCREEN);
		mCameraSleepOnRelease =
		(SwitchPreference) findPreference(LineageSettings.System.CAMERA_SLEEP_ON_RELEASE);
		mCameraLaunch = (SwitchPreference) findPreference(LineageSettings.System.CAMERA_LAUNCH);
		mCameraWakeScreen = findPreference(LineageSettings.System.CAMERA_WAKE_SCREEN);
		mCameraSleepOnRelease = findPreference(LineageSettings.System.CAMERA_SLEEP_ON_RELEASE);
		mCameraLaunch = findPreference(LineageSettings.System.CAMERA_LAUNCH);

		if (!showCameraWake) {
		prefScreen.removePreference(mCameraWakeScreen);
		@@ -390,8 +380,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements

		int swapVolumeKeys = LineageSettings.System.getInt(getContentResolver(),
		LineageSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION, 0);
		mSwapVolumeButtons = (SwitchPreference)
		prefScreen.findPreference(KEY_SWAP_VOLUME_BUTTONS);
		mSwapVolumeButtons = prefScreen.findPreference(KEY_SWAP_VOLUME_BUTTONS);
		if (mSwapVolumeButtons != null) {
		mSwapVolumeButtons.setChecked(swapVolumeKeys > 0);
		}
		@@ -399,8 +388,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		final boolean volumePanelOnLeft = LineageSettings.Secure.getIntForUser(
		getContentResolver(), LineageSettings.Secure.VOLUME_PANEL_ON_LEFT, 0,
		UserHandle.USER_CURRENT) != 0;
		mVolumePanelOnLeft = (SwitchPreference)
		prefScreen.findPreference(KEY_VOLUME_PANEL_ON_LEFT);
		mVolumePanelOnLeft = prefScreen.findPreference(KEY_VOLUME_PANEL_ON_LEFT);
		if (mVolumePanelOnLeft != null) {
		mVolumePanelOnLeft.setChecked(volumePanelOnLeft);
		}
		@@ -414,8 +402,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		prefScreen.removePreference(mNavigationPreferencesCat);
		}

		final ButtonBacklightBrightness backlight =
		(ButtonBacklightBrightness) findPreference(KEY_BUTTON_BACKLIGHT);
		final ButtonBacklightBrightness backlight = findPreference(KEY_BUTTON_BACKLIGHT);
		if (!backlight.isButtonSupported() /&& !backlight.isKeyboardSupported()/) {
		prefScreen.removePreference(backlight);
		}
		@@ -427,8 +414,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		}
		}

		mVolumeWakeScreen = (SwitchPreference) findPreference(LineageSettings.System.VOLUME_WAKE_SCREEN);
		mVolumeMusicControls = (SwitchPreference) findPreference(KEY_VOLUME_MUSIC_CONTROLS);
		mVolumeWakeScreen = findPreference(LineageSettings.System.VOLUME_WAKE_SCREEN);
		mVolumeMusicControls = findPreference(KEY_VOLUME_MUSIC_CONTROLS);

		if (mVolumeWakeScreen != null) {
		if (mVolumeMusicControls != null) {
		@@ -518,7 +505,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		}

		private ListPreference initList(String key, int value) {
		ListPreference list = (ListPreference) getPreferenceScreen().findPreference(key);
		ListPreference list = getPreferenceScreen().findPreference(key);
		if (list == null) return null;
		list.setValue(Integer.toString(value));
		list.setSummary(list.getEntry());
		@@ -610,15 +597,15 @@ public class ButtonSettings extends SettingsPreferenceFragment implements

		/* Disable hw-key options if they're disabled */
		final PreferenceCategory homeCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_HOME);
		prefScreen.findPreference(CATEGORY_HOME);
		final PreferenceCategory backCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_BACK);
		prefScreen.findPreference(CATEGORY_BACK);
		final PreferenceCategory menuCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_MENU);
		prefScreen.findPreference(CATEGORY_MENU);
		final PreferenceCategory assistCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_ASSIST);
		prefScreen.findPreference(CATEGORY_ASSIST);
		final PreferenceCategory appSwitchCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_APPSWITCH);
		prefScreen.findPreference(CATEGORY_APPSWITCH);
		final ButtonBacklightBrightness backlight =
		(ButtonBacklightBrightness) prefScreen.findPreference(KEY_BUTTON_BACKLIGHT);

src/org/lineageos/lineageparts/input/PowerMenuActions.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -63,15 +63,15 @@ public class PowerMenuActions extends SettingsPreferenceFragment {

		for (String action : mAllActions) {
		if (action.equals(GLOBAL_ACTION_KEY_SCREENSHOT)) {
		mScreenshotPref = (CheckBoxPreference) findPreference(GLOBAL_ACTION_KEY_SCREENSHOT);
		mScreenshotPref = findPreference(GLOBAL_ACTION_KEY_SCREENSHOT);
		} else if (action.equals(GLOBAL_ACTION_KEY_AIRPLANE)) {
		mAirplanePref = (CheckBoxPreference) findPreference(GLOBAL_ACTION_KEY_AIRPLANE);
		mAirplanePref = findPreference(GLOBAL_ACTION_KEY_AIRPLANE);
		} else if (action.equals(GLOBAL_ACTION_KEY_USERS)) {
		mUsersPref = (CheckBoxPreference) findPreference(GLOBAL_ACTION_KEY_USERS);
		mUsersPref = findPreference(GLOBAL_ACTION_KEY_USERS);
		} else if (action.equals(GLOBAL_ACTION_KEY_BUGREPORT)) {
		mBugReportPref = (CheckBoxPreference) findPreference(GLOBAL_ACTION_KEY_BUGREPORT);
		mBugReportPref = findPreference(GLOBAL_ACTION_KEY_BUGREPORT);
		} else if (action.equals(GLOBAL_ACTION_KEY_LOCKDOWN)) {
		mLockDownPref = (CheckBoxPreference) findPreference(GLOBAL_ACTION_KEY_LOCKDOWN);
		mLockDownPref = findPreference(GLOBAL_ACTION_KEY_LOCKDOWN);
		}
		}

src/org/lineageos/lineageparts/livedisplay/LiveDisplaySettings.java

+11 −13

Original line number	Diff line number	Diff line
		@@ -135,14 +135,12 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S

		addPreferencesFromResource(R.xml.livedisplay);

		PreferenceCategory liveDisplayPrefs = (PreferenceCategory)
		findPreference(KEY_CATEGORY_LIVE_DISPLAY);
		PreferenceCategory advancedPrefs = (PreferenceCategory)
		findPreference(KEY_CATEGORY_ADVANCED);
		PreferenceCategory liveDisplayPrefs = findPreference(KEY_CATEGORY_LIVE_DISPLAY);
		PreferenceCategory advancedPrefs = findPreference(KEY_CATEGORY_ADVANCED);

		int adaptiveMode = mLiveDisplayManager.getMode();

		mLiveDisplay = (ListPreference) findPreference(KEY_LIVE_DISPLAY);
		mLiveDisplay = findPreference(KEY_LIVE_DISPLAY);
		mLiveDisplay.setValue(String.valueOf(adaptiveMode));

		mModeEntries = res.getStringArray(
		@@ -193,7 +191,7 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S
		mLiveDisplay.setEntryValues(mModeValues);
		mLiveDisplay.setOnPreferenceChangeListener(this);

		mDisplayTemperature = (DisplayTemperature) findPreference(KEY_LIVE_DISPLAY_TEMPERATURE);
		mDisplayTemperature = findPreference(KEY_LIVE_DISPLAY_TEMPERATURE);
		if (isNightDisplayAvailable) {
		if (!mConfig.hasFeature(MODE_OUTDOOR)) {
		liveDisplayPrefs.removePreference(mLiveDisplay);
		@@ -201,7 +199,7 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S
		liveDisplayPrefs.removePreference(mDisplayTemperature);
		}

		mColorProfile = (ListPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_PROFILE);
		mColorProfile = findPreference(KEY_LIVE_DISPLAY_COLOR_PROFILE);
		if (liveDisplayPrefs != null && mColorProfile != null
		&& (!mConfig.hasFeature(FEATURE_DISPLAY_MODES) \|\| !updateDisplayModes())) {
		liveDisplayPrefs.removePreference(mColorProfile);
		@@ -210,7 +208,7 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S
		mColorProfile.setOnPreferenceChangeListener(this);
		}

		mOutdoorMode = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
		mOutdoorMode = findPreference(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
		if (liveDisplayPrefs != null && mOutdoorMode != null
		// MODE_AUTO implies automatic outdoor mode on HWC2
		&& (isNightDisplayAvailable \|\| !mConfig.hasFeature(MODE_OUTDOOR))) {
		@@ -218,7 +216,7 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S
		mOutdoorMode = null;
		}

		mReadingMode = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_READING_ENHANCEMENT);
		mReadingMode = findPreference(KEY_LIVE_DISPLAY_READING_ENHANCEMENT);
		if (liveDisplayPrefs != null && mReadingMode != null &&
		(!mHardware.isSupported(LineageHardwareManager.FEATURE_READING_ENHANCEMENT) \|\|
		PackageManagerUtils.isAppEnabled(getContext(), getContext().getString(
		@@ -229,28 +227,28 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S
		mReadingMode.setOnPreferenceChangeListener(this);
		}

		mLowPower = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_LOW_POWER);
		mLowPower = findPreference(KEY_LIVE_DISPLAY_LOW_POWER);
		if (advancedPrefs != null && mLowPower != null
		&& !mConfig.hasFeature(FEATURE_CABC)) {
		advancedPrefs.removePreference(mLowPower);
		mLowPower = null;
		}

		mColorEnhancement = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
		mColorEnhancement = findPreference(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
		if (advancedPrefs != null && mColorEnhancement != null
		&& !mConfig.hasFeature(FEATURE_COLOR_ENHANCEMENT)) {
		advancedPrefs.removePreference(mColorEnhancement);
		mColorEnhancement = null;
		}

		mPictureAdjustment = (PictureAdjustment) findPreference(KEY_PICTURE_ADJUSTMENT);
		mPictureAdjustment = findPreference(KEY_PICTURE_ADJUSTMENT);
		if (advancedPrefs != null && mPictureAdjustment != null &&
		!mConfig.hasFeature(FEATURE_PICTURE_ADJUSTMENT)) {
		advancedPrefs.removePreference(mPictureAdjustment);
		mPictureAdjustment = null;
		}

		mDisplayColor = (DisplayColor) findPreference(KEY_DISPLAY_COLOR);
		mDisplayColor = findPreference(KEY_DISPLAY_COLOR);
		if (advancedPrefs != null && mDisplayColor != null &&
		!mConfig.hasFeature(FEATURE_COLOR_ADJUSTMENT)) {
		advancedPrefs.removePreference(mDisplayColor);

src/org/lineageos/lineageparts/notificationlight/BatteryLightSettings.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -91,16 +91,12 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements

		PreferenceScreen prefSet = getPreferenceScreen();

		PreferenceGroup generalPrefs = (PreferenceGroup) prefSet.findPreference(GENERAL_SECTION);
		PreferenceGroup generalPrefs = prefSet.findPreference(GENERAL_SECTION);

		mLightEnabledPref =
		(LineageSystemSettingSwitchPreference) prefSet.findPreference(LIGHT_ENABLED_PREF);
		mPulseEnabledPref =
		(LineageSystemSettingSwitchPreference) prefSet.findPreference(PULSE_ENABLED_PREF);
		mBatteryBrightnessPref =
		(BatteryBrightnessPreference) prefSet.findPreference(BRIGHTNESS_PREFERENCE);
		mBatteryBrightnessZenPref =
		(BatteryBrightnessZenPreference) prefSet.findPreference(BRIGHTNESS_ZEN_PREFERENCE);
		mLightEnabledPref = prefSet.findPreference(LIGHT_ENABLED_PREF);
		mPulseEnabledPref = prefSet.findPreference(PULSE_ENABLED_PREF);
		mBatteryBrightnessPref = prefSet.findPreference(BRIGHTNESS_PREFERENCE);
		mBatteryBrightnessZenPref = prefSet.findPreference(BRIGHTNESS_ZEN_PREFERENCE);

		mDefaultLowColor = res.getInteger(
		com.android.internal.R.integer.config_notificationsBatteryLowARGB);
		@@ -119,17 +115,17 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
		setHasOptionsMenu(true);

		// Low, Medium and full color preferences
		mLowColorPref = (ApplicationLightPreference) prefSet.findPreference(LOW_COLOR_PREF);
		mLowColorPref = prefSet.findPreference(LOW_COLOR_PREF);
		mLowColorPref.setOnPreferenceChangeListener(this);
		mLowColorPref.setDefaultValues(mDefaultLowColor, 0, 0);
		mLowColorPref.setBrightness(mBatteryBrightness);

		mMediumColorPref = (ApplicationLightPreference) prefSet.findPreference(MEDIUM_COLOR_PREF);
		mMediumColorPref = prefSet.findPreference(MEDIUM_COLOR_PREF);
		mMediumColorPref.setOnPreferenceChangeListener(this);
		mMediumColorPref.setDefaultValues(mDefaultMediumColor, 0, 0);
		mMediumColorPref.setBrightness(mBatteryBrightness);

		mFullColorPref = (ApplicationLightPreference) prefSet.findPreference(FULL_COLOR_PREF);
		mFullColorPref = prefSet.findPreference(FULL_COLOR_PREF);
		mFullColorPref.setOnPreferenceChangeListener(this);
		mFullColorPref.setDefaultValues(mDefaultFullColor, 0, 0);
		mFullColorPref.setBrightness(mBatteryBrightness);