Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72489725 authored by Doris Ling's avatar Doris Ling
Browse files

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
parent 7bd80f15

src/com/android/settings/CryptKeeperConfirm.java

+9 −2
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/MasterClear.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/MasterClearConfirm.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/ProxySelector.java

+4 −7
Original line number Diff line number Diff line
@@ -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);

        }

    }

src/com/android/settings/ResetNetwork.java

+2 −2
Original line number Diff line number Diff line
@@ -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