Merge "Fixes alignment for fingerprint animation during setup."

src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java

@@ -42,7 +42,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.fingerprint_enroll_find_sensor);
+        setContentView(getContentView());
         setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
         if (savedInstanceState != null) {
             mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
@@ -58,6 +58,10 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
                 R.id.fingerprint_sensor_location_animation);
     }
 
+    protected int getContentView() {
+        return R.layout.fingerprint_enroll_find_sensor;
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java

@@ -30,6 +30,11 @@ import com.android.setupwizardlib.view.NavigationBar;
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor
         implements NavigationBar.NavigationBarListener {
 
+    @Override
+    protected int getContentView() {
+        return R.layout.setup_fingerprint_enroll_find_sensor;
+    }
+
     @Override
     protected Intent getEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);