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

Commit cdec3495 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add InstrumentFragment for non-PreferenceFragment types."

parents 5af7763f 2d0b3447

src/com/android/settings/ChooseLockPassword.java

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils.RequestThrottledException;

import com.android.internal.widget.TextViewInputDisabler;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.notification.RedactionInterstitial;

import com.android.settings.password.PasswordRequirementAdapter;

import com.android.setupwizardlib.GlifLayout;
@@ -157,7 +157,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        layout.setFitsSystemWindows(false);

    }



    public static class ChooseLockPasswordFragment extends InstrumentedFragment

    public static class ChooseLockPasswordFragment extends InstrumentedPreferenceFragment

            implements OnClickListener, OnEditorActionListener, TextWatcher,

            SaveAndFinishWorker.Listener {

        private static final String KEY_FIRST_PIN = "first_pin";

src/com/android/settings/ChooseLockPattern.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.android.internal.widget.LockPatternUtils.RequestThrottledException; 
import com.android.internal.widget.LockPatternView;

import com.android.internal.widget.LockPatternView.Cell;

import com.android.internal.widget.LockPatternView.DisplayMode;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.notification.RedactionInterstitial;

import com.android.setupwizardlib.GlifLayout;

import com.google.android.collect.Lists;
@@ -127,7 +127,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        return super.onKeyDown(keyCode, event);

    }



    public static class ChooseLockPatternFragment extends InstrumentedFragment

    public static class ChooseLockPatternFragment extends InstrumentedPreferenceFragment

            implements View.OnClickListener, SaveAndFinishWorker.Listener {



        public static final int CONFIRM_EXISTING_REQUEST = 55;

src/com/android/settings/CryptKeeperConfirm.java

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ import android.widget.Button; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedPreferenceFragment;



import java.util.Locale;



public class CryptKeeperConfirm extends InstrumentedFragment {

public class CryptKeeperConfirm extends InstrumentedPreferenceFragment {



    private static final String TAG = "CryptKeeperConfirm";

src/com/android/settings/CryptKeeperSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ import android.view.ViewGroup; 
import android.widget.Button;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedPreferenceFragment;



public class CryptKeeperSettings extends InstrumentedFragment {

public class CryptKeeperSettings extends InstrumentedPreferenceFragment {

    private static final String TAG = "CryptKeeper";

    private static final String TYPE = "type";

    private static final String PASSWORD = "password";

src/com/android/settings/OptionsMenuFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package com.android.settings; 


import android.os.Bundle;



import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedPreferenceFragment;



/**

 * Base class for a fragment that has the options menu.
@@ -25,7 +25,7 @@ import com.android.settings.core.InstrumentedFragment; 
 * preferences, and we need to call setHasOptionsMenu(true) for the back button on action bar.

 * For preference fragments, use SettingsPreferenceFragment.

 */

public abstract class OptionsMenuFragment extends InstrumentedFragment {

public abstract class OptionsMenuFragment extends InstrumentedPreferenceFragment {



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {