PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ConvertToFbe fragment to use InstrumentedFragment

Browse Source 
It doesn't need to use SettingsPrefFragment.

Change-Id: I3f99fdc15afe338081baf64d8387e6b53c473a48
Fix: 37765437
Test: visual
This commit is contained in:
Fan Zhang
2017-05-03 15:49:11 -07:00
parent b45a9fe0a9
commit 81682a42cf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/convert_fbe.xml
View File

@@ -23,7 +23,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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_marginEnd="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:textSize="18sp" android:textSize="18sp"

5
src/com/android/settings/applications/ConvertToFbe.java
View File

@@ -24,16 +24,15 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; 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 /* 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 TAG = "ConvertToFBE";
static final String CONVERT_FBE_EXTRA = "ConvertFBE"; static final String CONVERT_FBE_EXTRA = "ConvertFBE";
private static final int KEYGUARD_REQUEST = 55; private static final int KEYGUARD_REQUEST = 55;