Merge "Update ConvertToFbe fragment to use InstrumentedFragment"
This commit is contained in:
committed by
Android (Google) Code Review
commit
6643a399ba
@@ -24,16 +24,15 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.ChooseLockSettingsHelper;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.core.InstrumentedFragment;
|
||||
|
||||
/* Class to prompt for conversion of userdata to file based encryption
|
||||
*/
|
||||
public class ConvertToFbe extends SettingsPreferenceFragment {
|
||||
public class ConvertToFbe extends InstrumentedFragment {
|
||||
static final String TAG = "ConvertToFBE";
|
||||
static final String CONVERT_FBE_EXTRA = "ConvertFBE";
|
||||
private static final int KEYGUARD_REQUEST = 55;
|
||||
|
||||
Reference in New Issue
Block a user