PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor the duplicate Switch IME button to an include

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

Bug: 16375532
Change-Id: I0f9000d4a8c4bc8751b8cefd98fe429cbb02c37a
This commit is contained in:
Sami Tolvanen
2014-10-15 16:53:14 +01:00
parent 04393389a9
commit d64d05a540
4 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/crypt_keeper_password_field.xml
View File

@@ -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>

11
res/layout/crypt_keeper_pattern_field.xml
View File

@@ -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>

11
res/layout/crypt_keeper_pin_field.xml
View File

@@ -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>

31
res/layout/crypt_keeper_switch_input_method.xml Normal file
View File

@@ -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" />