From 204af97eb075921ad87ece5f722bc64db25e5dee Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 23 Jun 2016 20:30:52 -0700
Subject: [PATCH] Remove setup specific FP find sensor layout

Remove the setup variant layout of fingerprint find sensor, because
the regular one is also GLIF themed, and positions the graphic
correctly.

Bug: 29421687
Change-Id: I20dee43c657434f63e73b5c32eb9a492d6786de5
---
 .../setup_fingerprint_enroll_find_sensor.xml  | 71 -------------------
 ...up_fingerprint_enroll_find_sensor_base.xml | 69 ------------------
 res/values-sw600dp/aliases.xml                |  1 -
 res/values/aliases.xml                        |  1 -
 .../SetupFingerprintEnrollFindSensor.java     |  2 +-
 5 files changed, 1 insertion(+), 143 deletions(-)
 delete mode 100644 res/layout-land/setup_fingerprint_enroll_find_sensor.xml
 delete mode 100644 res/layout/setup_fingerprint_enroll_find_sensor_base.xml

diff --git a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml b/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
deleted file mode 100644
index 8a81d15a2d9..00000000000
--- a/res/layout-land/setup_fingerprint_enroll_find_sensor.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<com.android.setupwizardlib.GlifLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/setup_wizard_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="?attr/fingerprint_layout_theme">
-
-    <LinearLayout
-            style="@style/SuwContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:clipToPadding="false"
-            android:clipChildren="false"
-            android:paddingBottom="0dp">
-
-        <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-            <TextView
-                    style="@style/TextAppearance.FingerprintMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <Button
-                    style="@style/SetupWizardButton.Positive"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/fingerprint_enroll_button_next" />
-        </LinearLayout>
-
-        <FrameLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent">
-
-            <include
-                    layout="@layout/fingerprint_enroll_find_sensor_graphic"
-                    android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-                    android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-                    android:layout_gravity="center"/>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml b/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
deleted file mode 100644
index 2455896f9c0..00000000000
--- a/res/layout/setup_fingerprint_enroll_find_sensor_base.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License
-  -->
-
-<com.android.setupwizardlib.GlifLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/setup_wizard_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="?attr/fingerprint_layout_theme">
-
-    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-        <include
-                layout="@layout/fingerprint_enroll_find_sensor_graphic"
-                android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_gravity="center_horizontal|bottom"/>
-
-        <LinearLayout
-                style="@style/SuwContentFrame"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:clipToPadding="false"
-                android:clipChildren="false">
-
-            <TextView
-                    style="@style/TextAppearance.FingerprintMessage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/suw_description_glif_margin_top"
-                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <View
-                    android:layout_height="0dp"
-                    android:layout_width="match_parent"
-                    android:layout_weight="1"/>
-
-            <Button
-                    style="@style/SetupWizardButton.Positive"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_gravity="end"
-                    android:text="@string/fingerprint_enroll_button_next" />
-
-        </LinearLayout>
-    </FrameLayout>
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/values-sw600dp/aliases.xml b/res/values-sw600dp/aliases.xml
index a3bf39aa8bb..163e97a3630 100644
--- a/res/values-sw600dp/aliases.xml
+++ b/res/values-sw600dp/aliases.xml
@@ -20,6 +20,5 @@
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
      <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
-     <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
 </resources>
 
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 12f2710aa6c..951b1bbb262 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -22,6 +22,5 @@
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
      <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
-     <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
 </resources>
 
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index bb78477db35..baf4fcd6ed7 100644
--- 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