From d64d05a540d902a44e211ed02dfd797f990d31ec Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Wed, 15 Oct 2014 16:53:14 +0100
Subject: [PATCH] Refactor the duplicate Switch IME button to an include

Move duplicate code for switching input method from crypt_keeper_*_field.xml to an include.

Bug: 16375532
Change-Id: I0f9000d4a8c4bc8751b8cefd98fe429cbb02c37a
---
 res/layout/crypt_keeper_password_field.xml    | 11 +------
 res/layout/crypt_keeper_pattern_field.xml     | 11 +------
 res/layout/crypt_keeper_pin_field.xml         | 11 +------
 .../crypt_keeper_switch_input_method.xml      | 31 +++++++++++++++++++
 4 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 res/layout/crypt_keeper_switch_input_method.xml

diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 2d98b25845f..9f2c598b0db 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,15 +28,6 @@
         android:inputType="textPassword"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_pattern_field.xml b/res/layout/crypt_keeper_pattern_field.xml
index cf6a29fb487..e12f77b7a83 100644
--- a/res/layout/crypt_keeper_pattern_field.xml
+++ b/res/layout/crypt_keeper_pattern_field.xml
@@ -26,15 +26,6 @@
        android:layout_height="match_parent"
        android:background="@color/lock_pattern_background" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 2fc1e818972..af0ade5771d 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,15 +28,6 @@
         android:inputType="numberPassword"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml
new file mode 100644
index 00000000000..b55db22f340
--- /dev/null
+++ b/res/layout/crypt_keeper_switch_input_method.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switch_ime_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:src="@drawable/ic_lockscreen_ime"
+    android:clickable="true"
+    android:contentDescription="@string/crypt_keeper_switch_input_method"
+    android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
+    android:layout_gravity="center"
+    android:background="?android:attr/selectableItemBackground"
+    android:visibility="gone" />