Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev

am: 17eb2e2ec4 Change-Id: I9914bce9a3c8e4f7e87692a27df87bd2d6532a1a
2016-06-25 01:35:26 +00:00
parent 87c6bc8ce9 17eb2e2ec4
commit ff56688d64
5 changed files with 1 additions and 143 deletions
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -29,7 +29,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso

    @Override
    protected int getContentView() {
-        return R.layout.setup_fingerprint_enroll_find_sensor;
+        return R.layout.fingerprint_enroll_find_sensor;
    }

    @Override