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

5
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
View File

@@ -47,8 +47,7 @@ public class AndroidBeamPreferenceController extends BasePreferenceController
return;
}
final RestrictedPreference restrictedPreference =
(RestrictedPreference) screen.findPreference(getPreferenceKey());
final RestrictedPreference restrictedPreference = screen.findPreference(getPreferenceKey());
mAndroidBeamEnabler = new AndroidBeamEnabler(mContext, restrictedPreference);
}
@@ -57,7 +56,7 @@ public class AndroidBeamPreferenceController extends BasePreferenceController
public int getAvailabilityStatus() {
PackageManager pm = mContext.getPackageManager();
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)) {
return UNSUPPORTED_ON_DEVICE;
return UNSUPPORTED_ON_DEVICE;
}
return mNfcAdapter != null
? AVAILABLE

8
src/com/android/settings/nfc/NfcForegroundPreferenceController.java
View File

@@ -81,16 +81,16 @@ public class NfcForegroundPreferenceController extends BasePreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (DropDownPreference) screen.findPreference(getPreferenceKey());
mPreference = screen.findPreference(getPreferenceKey());
if (mPreference == null) {
return;
}
mPreference.setEntries(new CharSequence[] {
mPreference.setEntries(new CharSequence[]{
mContext.getText(R.string.nfc_payment_favor_open),
mContext.getText(R.string.nfc_payment_favor_default)
});
mPreference.setEntryValues(new CharSequence[] {"1", "0"});
mPreference.setEntryValues(new CharSequence[]{"1", "0"});
}
@Override
@@ -124,7 +124,7 @@ public class NfcForegroundPreferenceController extends BasePreferenceController
mPaymentBackend.setForegroundMode(foregroundMode);
mMetricsFeatureProvider.action(mContext,
foregroundMode ? SettingsEnums.ACTION_NFC_PAYMENT_FOREGROUND_SETTING
: SettingsEnums.ACTION_NFC_PAYMENT_ALWAYS_SETTING);
: SettingsEnums.ACTION_NFC_PAYMENT_ALWAYS_SETTING);
return true;
}

2
src/com/android/settings/nfc/NfcPaymentPreferenceController.java
View File

@@ -98,7 +98,7 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (NfcPaymentPreference) screen.findPreference(getPreferenceKey());
mPreference = screen.findPreference(getPreferenceKey());
if (mPreference != null) {
mPreference.initialize(this);
}

10
src/com/android/settings/nfc/SecureNfcPreferenceController.java
View File

@@ -17,7 +17,6 @@ package com.android.settings.nfc;
import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.SystemProperties;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -30,7 +29,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
public class SecureNfcPreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause {
public static final String KEY_TOGGLE_NFC = "nfc_secure_setting";
private final NfcAdapter mNfcAdapter;
private SecureNfcEnabler mSecureNfcEnabler;
@@ -47,8 +45,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
return;
}
final SwitchPreference switchPreference =
(SwitchPreference) screen.findPreference(getPreferenceKey());
final SwitchPreference switchPreference = screen.findPreference(getPreferenceKey());
mSecureNfcEnabler = new SecureNfcEnabler(mContext, switchPreference);
}
@@ -69,8 +66,9 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
if (mNfcAdapter == null) {
return UNSUPPORTED_ON_DEVICE;
}
return mNfcAdapter.deviceSupportsNfcSecure() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
return mNfcAdapter.deviceSupportsNfcSecure()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override