Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 05de7c88: Merge change I420cc110 into eclair-mr2

Browse Source 
Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp

* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
This commit is contained in:
Jim Miller
2009-12-18 16:10:31 -08:00
committed by Android Git Automerger
parent 24317443fd 05de7c882e
commit 5ee51f0735
1 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
View File

@@ -16,59 +16,55 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@android:color/background_dark" android:background="@android:color/background_dark"
> android:gravity="center_horizontal">
<LinearLayout android:id="@+id/topDisplayGroup" <LinearLayout android:id="@+id/topDisplayGroup"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:orientation="vertical">
android:orientation="vertical"
>
<!-- header text ('Enter Pin Code') --> <!-- header text ('Enter Pin Code') -->
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="9dip"
android:gravity="center" android:gravity="center"
android:lines="2" android:lines="2"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"/>
/>
<RelativeLayout <!-- password entry -->
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="18dip" android:orientation="horizontal"
android:layout_marginRight="6dip" android:layout_marginRight="6dip"
android:layout_marginLeft="6dip" android:layout_marginLeft="6dip"
android:background="@android:drawable/edit_text" android:gravity="center_vertical"
> android:background="@android:drawable/edit_text">
<!-- displays dots as user enters pin --> <!-- displays dots as user enters pin -->
<TextView android:id="@+id/pinDisplay" <TextView android:id="@+id/pinDisplay"
android:layout_width="wrap_content" android:layout_width="0dip"
android:layout_height="64dip" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_weight="1"
android:maxLines="1" android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceLargeInverse" android:textAppearance="?android:attr/textAppearanceLargeInverse"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
/> />
<ImageButton android:id="@+id/backspace" <ImageButton android:id="@+id/backspace"
android:src="@android:drawable/ic_input_delete" android:src="@android:drawable/ic_input_delete"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginRight="-3dip"
android:layout_centerVertical="true" android:layout_marginBottom="-3dip"
android:layout_marginRight="1dip" />
/> </LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>
@@ -78,16 +74,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/topDisplayGroup" android:layout_below="@id/topDisplayGroup"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:orientation="vertical" android:orientation="vertical">
>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="64dip" android:layout_height="64dip"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:orientation="horizontal" android:orientation="horizontal">
>
<Button android:id="@+id/one" <Button android:id="@+id/one"
android:layout_width="0sp" android:layout_width="0sp"
@@ -125,8 +119,7 @@
android:layout_height="64dip" android:layout_height="64dip"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:orientation="horizontal" android:orientation="horizontal">
>
<Button android:id="@+id/four" <Button android:id="@+id/four"
android:layout_width="0sp" android:layout_width="0sp"
@@ -164,8 +157,7 @@
android:layout_height="64dip" android:layout_height="64dip"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:orientation="horizontal" android:orientation="horizontal">
>
<Button android:id="@+id/seven" <Button android:id="@+id/seven"
android:layout_width="0sp" android:layout_width="0sp"
@@ -203,8 +195,7 @@
android:layout_height="64dip" android:layout_height="64dip"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:orientation="horizontal" android:orientation="horizontal">
>
<Button android:id="@+id/ok" <Button android:id="@+id/ok"
android:layout_width="0sp" android:layout_width="0sp"
@@ -242,27 +233,33 @@
<!-- end keypad --> <!-- end keypad -->
</LinearLayout> </LinearLayout>
<!-- emergency call button -->
<Button
android:id="@+id/emergencyCall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:drawableLeft="@android:drawable/ic_emergency"
android:drawablePadding="8dip"
android:text="@android:string/lockscreen_emergency_call"
/>
<!-- spacer below keypad --> <!-- spacer below keypad -->
<View <View
android:id="@+id/spacerBottom" android:id="@+id/spacerBottom"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:layout_marginBottom="6dip" android:layout_marginTop="6dip"
android:layout_above="@id/emergencyCall" android:layout_above="@id/emergencyCall"
android:background="@android:drawable/divider_horizontal_dark"/> android:background="@android:drawable/divider_horizontal_dark"
/>
<!-- The emergency button should take the rest of the space and be centered vertically -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
</RelativeLayout> <!-- emergency call button -->
<Button
android:id="@+id/emergencyCall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@android:drawable/ic_emergency"
android:drawablePadding="8dip"
android:text="@android:string/lockscreen_emergency_call"
/>
</LinearLayout>
</LinearLayout>