From 81682a42cf81585966700c239966c45b9c0e1e24 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 3 May 2017 15:49:11 -0700
Subject: [PATCH] Update ConvertToFbe fragment to use InstrumentedFragment

It doesn't need to use SettingsPrefFragment.

Change-Id: I3f99fdc15afe338081baf64d8387e6b53c473a48
Fix: 37765437
Test: visual
---
 res/layout/convert_fbe.xml                              | 2 +-
 src/com/android/settings/applications/ConvertToFbe.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/layout/convert_fbe.xml b/res/layout/convert_fbe.xml
index 4a9d7c05d11..d1e0ceae20a 100644
--- a/res/layout/convert_fbe.xml
+++ b/res/layout/convert_fbe.xml
@@ -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"
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index be3c371ccb9..9c43af4a540 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -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;