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

Mass clean up: don't cast class when not needed.

Browse Source 
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
This commit is contained in:
Fan Zhang
2019-02-14 12:25:29 -08:00
parent 09285d72bd
commit 7db118e367
77 changed files with 153 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/GesturePreferenceController.java
View File

@@ -51,7 +51,7 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
mVideoPreference = (VideoPreference) screen.findPreference(getVideoPrefKey());
mVideoPreference = screen.findPreference(getVideoPrefKey());
}
}

36
src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
View File

@@ -45,9 +45,11 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState,
OnResume, OnPause, OnCreate, PreferenceControllerMixin {
@VisibleForTesting static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";
@VisibleForTesting
static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";
@VisibleForTesting static final String KEY_MUTE = "prevent_ringing_option_mute";
@VisibleForTesting
static final String KEY_MUTE = "prevent_ringing_option_mute";
private final String KEY_VIDEO_PAUSED = "key_video_paused";
private final String PREF_KEY_VIDEO = "gesture_prevent_ringing_video";
@@ -57,9 +59,12 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
private VideoPreference mVideoPreference;
private boolean mVideoPaused;
@VisibleForTesting PreferenceCategory mPreferenceCategory;
@VisibleForTesting RadioButtonPreference mVibratePref;
@VisibleForTesting RadioButtonPreference mMutePref;
@VisibleForTesting
PreferenceCategory mPreferenceCategory;
@VisibleForTesting
RadioButtonPreference mVibratePref;
@VisibleForTesting
RadioButtonPreference mMutePref;
private SettingObserver mSettingObserver;
@@ -75,17 +80,18 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
mPreferenceCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);
mMutePref = makeRadioPreference(KEY_MUTE, R.string.prevent_ringing_option_mute);
if (mPreferenceCategory != null) {
mSettingObserver = new SettingObserver(mPreferenceCategory);
}
mVideoPreference = (VideoPreference) screen.findPreference(getVideoPrefKey());
if (!isAvailable()) {
return;
}
mPreferenceCategory = screen.findPreference(getPreferenceKey());
mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);
mMutePref = makeRadioPreference(KEY_MUTE, R.string.prevent_ringing_option_mute);
if (mPreferenceCategory != null) {
mSettingObserver = new SettingObserver(mPreferenceCategory);
}
mVideoPreference = screen.findPreference(getVideoPrefKey());
}
@Override

7
src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
View File

@@ -35,13 +35,14 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.LayoutPreference;
public class PreventRingingSwitchPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
private static final String KEY = "gesture_prevent_ringing_switch";
private final Context mContext;
private SettingObserver mSettingObserver;
@VisibleForTesting SwitchBar mSwitch;
@VisibleForTesting
SwitchBar mSwitch;
public PreventRingingSwitchPreferenceController(Context context) {
super(context);
@@ -57,7 +58,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
LayoutPreference pref = (LayoutPreference) screen.findPreference(getPreferenceKey());
LayoutPreference pref = screen.findPreference(getPreferenceKey());
if (pref != null) {
mSettingObserver = new SettingObserver(pref);
mSwitch = pref.findViewById(R.id.switch_bar);