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

Merge "[LockScreen] Don't extract UI in ChooseLockPassword"

Browse Source
This commit is contained in:
Maurice Lam
2015-01-23 17:44:05 +00:00
committed by Android (Google) Code Review
parent dee761df86 8e8a371454
commit 21f6db9184
1 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
res/layout-land/choose_lock_password.xml
View File

@@ -16,78 +16,85 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical" android:fillViewport="true">
android:gravity="center_horizontal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="vertical"
<!-- "Enter PIN(Password) to unlock" --> android:gravity="center_horizontal">
<TextView android:id="@+id/headerText"
android:layout_width="0dip" <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:orientation="horizontal">
android:orientation="horizontal" <!-- "Enter PIN(Password) to unlock" -->
android:layout_marginEnd="6dip" <TextView android:id="@+id/headerText"
android:layout_marginStart="6dip" android:layout_width="0dip"
android:layout_marginTop="10dip" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" android:layout_weight="1"
android:gravity="start" android:orientation="horizontal"
android:ellipsize="marquee" android:layout_marginEnd="6dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:layout_gravity="center"
android:layout_weight="1"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:gravity="center"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"
/>
</LinearLayout>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"
/> />
<!-- Password entry field --> <RelativeLayout
<EditText android:id="@+id/password_entry" android:layout_width="match_parent"
android:layout_width="0dip" android:layout_height="0dip"
android:layout_height="wrap_content" android:layout_weight="1">
android:layout_marginTop="5dip" <LinearLayout
android:layout_marginBottom="5dip" style="@style/SecurityPreferenceButtonContainer"
android:layout_gravity="center" android:orientation="horizontal"
android:layout_weight="1" android:layout_alignParentEnd="true"
android:inputType="textPassword" android:layout_alignParentBottom="true">
android:imeOptions="actionNext"
android:gravity="center" <!-- left : cancel -->
android:textSize="24sp" <Button android:id="@+id/cancel_button"
style="@style/TextAppearance.PasswordEntry" style="@style/SecurityPreferenceButton"
/> android:text="@string/lockpassword_cancel_label"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>
<!-- Alphanumeric keyboard --> </ScrollView>
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>