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

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

Merge "Update ConvertToFbe fragment to use InstrumentedFragment"

parents 9168d6d1 81682a42

res/layout/convert_fbe.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                android:layout_marginStart="@dimen/preference_no_icon_padding_start"

                android:layout_marginEnd="12dp"

                android:layout_marginTop="12dp"

                android:textSize="18sp"

src/com/android/settings/applications/ConvertToFbe.java

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