From 72489725c6dbcf69de4ee96ac0d67570e24e4e5a Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Thu, 16 Nov 2017 11:03:40 -0800 Subject: [PATCH] Change superclass to InstrumentedFragment. - for fragments that do not implement the preference screen, change them to inherit from InstrumentedFragment instead. Change-Id: I791c2634024bd2c248efea955be5c680180d735c Fixes: 68277111 Test: make RunSettingsRoboTests --- .../android/settings/CryptKeeperConfirm.java | 11 +++++++++-- src/com/android/settings/MasterClear.java | 4 ++-- .../android/settings/MasterClearConfirm.java | 4 ++-- src/com/android/settings/ProxySelector.java | 11 ++++------- src/com/android/settings/ResetNetwork.java | 4 ++-- .../android/settings/ResetNetworkConfirm.java | 4 ++-- .../settings/TrustedCredentialsSettings.java | 7 ++++--- .../applications/RunningServiceDetails.java | 4 ++-- .../FingerprintAuthenticateSidecar.java | 4 ++-- .../fingerprint/FingerprintRemoveSidecar.java | 18 ++---------------- .../UserDictionaryAddWordFragment.java | 5 ++--- .../settings/network/NetworkScorerPicker.java | 6 +++++- src/com/android/settings/nfc/AndroidBeam.java | 4 ++-- .../settings/password/ChooseLockPassword.java | 4 ++-- .../settings/password/ChooseLockPattern.java | 4 ++-- .../ConfirmDeviceCredentialBaseFragment.java | 4 ++-- .../settings/password/ConfirmLockPassword.java | 5 ----- .../settings/password/ConfirmLockPattern.java | 5 ----- .../settings/security/CryptKeeperSettings.java | 1 + 19 files changed, 47 insertions(+), 62 deletions(-) diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index d61fd983f3c..227120089ee 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -16,6 +16,7 @@ package com.android.settings; +import android.annotation.Nullable; import android.app.Activity; import android.app.StatusBarManager; import android.content.Context; @@ -35,11 +36,11 @@ import android.widget.Button; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import java.util.Locale; -public class CryptKeeperConfirm extends InstrumentedPreferenceFragment { +public class CryptKeeperConfirm extends InstrumentedFragment { private static final String TAG = "CryptKeeperConfirm"; @@ -153,6 +154,12 @@ public class CryptKeeperConfirm extends InstrumentedPreferenceFragment { mFinalButton.setOnClickListener(mFinalClickListener); } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getActivity().setTitle(R.string.crypt_keeper_confirm_title); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 47aa8a6b9a9..4f5c6b95bfc 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -55,7 +55,7 @@ import android.widget.ScrollView; import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; import com.android.settingslib.RestrictedLockUtils; @@ -72,7 +72,7 @@ import java.util.List; * * This is the initial screen. */ -public class MasterClear extends InstrumentedPreferenceFragment { +public class MasterClear extends InstrumentedFragment { private static final String TAG = "MasterClear"; @VisibleForTesting static final int KEYGUARD_REQUEST = 55; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 9b324c3fddf..59736fd4cf5 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -33,7 +33,7 @@ import android.widget.Button; import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settingslib.RestrictedLockUtils; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -48,7 +48,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; * * This is the confirmation screen. */ -public class MasterClearConfirm extends InstrumentedPreferenceFragment { +public class MasterClearConfirm extends InstrumentedFragment { private View mContentView; private boolean mEraseSdCard; diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index a72525c2640..79767fb7aa3 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -41,9 +41,9 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; -public class ProxySelector extends InstrumentedPreferenceFragment implements DialogCreatable { +public class ProxySelector extends InstrumentedFragment implements DialogCreatable { private static final String TAG = "ProxySelector"; EditText mHostnameField; @@ -58,11 +58,6 @@ public class ProxySelector extends InstrumentedPreferenceFragment implements Dia private SettingsDialogFragment mDialogFragment; private View mView; - @Override - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -179,6 +174,8 @@ public class ProxySelector extends InstrumentedPreferenceFragment implements Dia String title = intent.getStringExtra("title"); if (!TextUtils.isEmpty(title)) { activity.setTitle(title); + } else { + activity.setTitle(R.string.proxy_settings_title); } } diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index f64f6dce93a..5cbee6385df 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -43,7 +43,7 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; import com.android.settingslib.RestrictedLockUtils; @@ -61,7 +61,7 @@ import java.util.List; * * This is the initial screen. */ -public class ResetNetwork extends InstrumentedPreferenceFragment { +public class ResetNetwork extends InstrumentedFragment { private static final String TAG = "ResetNetwork"; // Arbitrary to avoid conficts diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index bc0fa774a75..78e83394101 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -42,8 +42,8 @@ import android.widget.Toast; import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.wrapper.RecoverySystemWrapper; +import com.android.settings.core.InstrumentedFragment; import com.android.settingslib.RestrictedLockUtils; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -58,7 +58,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; * * This is the confirmation screen. */ -public class ResetNetworkConfirm extends InstrumentedPreferenceFragment { +public class ResetNetworkConfirm extends InstrumentedFragment { private View mContentView; private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 491419a7212..86340be98f6 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -65,7 +65,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; @@ -75,7 +75,7 @@ import java.util.List; import java.util.Set; import java.util.function.IntConsumer; -public class TrustedCredentialsSettings extends InstrumentedPreferenceFragment +public class TrustedCredentialsSettings extends InstrumentedFragment implements TrustedCredentialsDialogBuilder.DelegateInterface { public static final String ARG_SHOW_NEW_FOR_USER = "ARG_SHOW_NEW_FOR_USER"; @@ -117,7 +117,8 @@ public class TrustedCredentialsSettings extends InstrumentedPreferenceFragment private final int mContentView; private final boolean mSwitch; - private Tab(String tag, int label, int view, int progress, int contentView, boolean withSwitch) { + private Tab(String tag, int label, int view, int progress, int contentView, + boolean withSwitch) { mTag = tag; mLabel = label; mView = view; diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 7e73a9b5001..770b1d6e4a8 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -34,7 +34,7 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.utils.ThreadUtils; @@ -45,7 +45,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -public class RunningServiceDetails extends InstrumentedPreferenceFragment +public class RunningServiceDetails extends InstrumentedFragment implements RunningState.OnRefreshUiListener { static final String TAG = "RunningServicesDetails"; diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java index d649c0bfc7f..1fa59a2fb60 100644 --- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java @@ -21,12 +21,12 @@ import android.hardware.fingerprint.FingerprintManager.AuthenticationResult; import android.os.CancellationSignal; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; /** * Sidecar fragment to handle the state around fingerprint authentication */ -public class FingerprintAuthenticateSidecar extends InstrumentedPreferenceFragment { +public class FingerprintAuthenticateSidecar extends InstrumentedFragment { private static final String TAG = "FingerprintAuthenticateSidecar"; diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java index 462d09ee9e1..7caca3fff57 100644 --- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java @@ -21,7 +21,7 @@ import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.os.UserHandle; import java.util.Queue; @@ -31,7 +31,7 @@ import android.util.Log; /** * Sidecar fragment to handle the state around fingerprint removal. */ -public class FingerprintRemoveSidecar extends InstrumentedPreferenceFragment { +public class FingerprintRemoveSidecar extends InstrumentedFragment { private static final String TAG = "FingerprintRemoveSidecar"; private Listener mListener; @@ -99,20 +99,6 @@ public class FingerprintRemoveSidecar extends InstrumentedPreferenceFragment { setRetainInstance(true); } - @Override - public void onAttach(Context context) { - super.onAttach(context); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - } - public void setListener(Listener listener) { if (mListener == null && listener != null) { while (!mFingerprintsRemoved.isEmpty()) { diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java index 38b64a598db..3243e56c2f6 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java @@ -27,7 +27,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer; @@ -41,7 +41,7 @@ import java.util.Locale; * As opposed to the UserDictionaryActivity, this is only invoked within Settings * from the UserDictionarySettings. */ -public class UserDictionaryAddWordFragment extends InstrumentedPreferenceFragment +public class UserDictionaryAddWordFragment extends InstrumentedFragment implements AdapterView.OnItemSelectedListener, com.android.internal.app.LocalePicker.LocaleSelectionListener { @@ -55,7 +55,6 @@ public class UserDictionaryAddWordFragment extends InstrumentedPreferenceFragmen public void onActivityCreated(final Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); setHasOptionsMenu(true); - getActivity().getActionBar().setTitle(R.string.user_dict_settings_title); // Keep the instance so that we remember mContents when configuration changes (eg rotation) setRetainInstance(true); } diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 187c9ce3ebc..34accf24671 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -50,7 +50,6 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { super.onCreatePreferences(savedInstanceState, rootKey); - addPreferencesFromResource(R.xml.network_scorer_picker_prefs); updateCandidates(); } @@ -69,6 +68,11 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen return view; } + @Override + protected int getPreferenceScreenResId() { + return R.xml.network_scorer_picker_prefs; + } + @VisibleForTesting public void updateCandidates() { final PreferenceScreen screen = getPreferenceScreen(); diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 707017beaf4..8377f143f08 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -29,7 +29,7 @@ import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.HelpUtils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.ShowAdminSupportDetailsDialog; @@ -38,7 +38,7 @@ import com.android.settingslib.RestrictedLockUtils; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -public class AndroidBeam extends InstrumentedPreferenceFragment +public class AndroidBeam extends InstrumentedFragment implements SwitchBar.OnSwitchChangeListener { private View mView; private NfcAdapter mNfcAdapter; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 11efec3ca7f..a9c5c032769 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -64,7 +64,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; import com.android.settings.widget.ImeAwareEditText; import com.android.setupwizardlib.GlifLayout; @@ -168,7 +168,7 @@ public class ChooseLockPassword extends SettingsActivity { layout.setFitsSystemWindows(false); } - public static class ChooseLockPasswordFragment extends InstrumentedPreferenceFragment + public static class ChooseLockPasswordFragment extends InstrumentedFragment implements OnClickListener, OnEditorActionListener, TextWatcher, SaveAndFinishWorker.Listener { private static final String KEY_FIRST_PIN = "first_pin"; diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 972fac8715f..0df1a11c9f2 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -43,7 +43,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; import com.android.setupwizardlib.GlifLayout; @@ -153,7 +153,7 @@ public class ChooseLockPattern extends SettingsActivity { return super.onKeyDown(keyCode, event); } - public static class ChooseLockPatternFragment extends InstrumentedPreferenceFragment + public static class ChooseLockPatternFragment extends InstrumentedFragment implements View.OnClickListener, SaveAndFinishWorker.Listener { public static final int CONFIRM_EXISTING_REQUEST = 55; diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index 5b18925f1c7..3f2675029d0 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -52,13 +52,13 @@ import android.widget.TextView; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.core.InstrumentedPreferenceFragment; +import com.android.settings.core.InstrumentedFragment; import com.android.settings.fingerprint.FingerprintUiHelper; /** * Base fragment to be shared for PIN/Pattern/Password confirmation fragments. */ -public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedPreferenceFragment +public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment implements FingerprintUiHelper.Callback { public static final String PACKAGE = "com.android.settings"; diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index 20182cbd92a..dbca2fc12d0 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -113,11 +113,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index 1e881505027..c87ff431e8f 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -104,11 +104,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index 7d5ee9d4357..64f5abb5bc5 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -157,6 +157,7 @@ public class CryptKeeperSettings extends InstrumentedPreferenceFragment { } } } + activity.setTitle(R.string.crypt_keeper_encrypt_title); } /**