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

am f5a68512: Merge change 25463 into eclair

Browse Source 
Merge commit 'f5a68512c3d0624584c3e6da1523863e401e49d0' into eclair-plus-aosp

* commit 'f5a68512c3d0624584c3e6da1523863e401e49d0':
  First pass at pattern lock screen that includes date / time and carrier info (framework portion).
This commit is contained in:
Karl Rosaen
2009-09-17 08:47:32 -07:00
committed by Android Git Automerger
parent 3455f8ee9d f5a68512c3
commit a891bce913
3 changed files with 141 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/ic_emergency.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 3.3 KiB

94
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -21,7 +21,8 @@
the user how to unlock their device, or make an emergency call. This the user how to unlock their device, or make an emergency call. This
is the portrait layout. --> is the portrait layout. -->
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android" <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@@ -34,31 +35,70 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1.0" android:layout_weight="1.0"
android:gravity="center_horizontal"
> >
<TextView
android:id="@+id/carrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
/>
<TextView
android:id="@+id/centerDot"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
/>
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="35sp"
/>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="-12dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
/>
<!-- lock icon next to header text -->
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dip"
android:gravity="center"
>
<ImageView android:id="@+id/unlockLockIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dip"
android:baselineAligned="true"
android:gravity="center"
android:src="@android:drawable/ic_lock_idle_lock"
/>
<TextView android:id="@+id/headerText" <View
android:layout_width="wrap_content" android:id="@+id/divider"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:gravity="center" android:layout_height="1dip"
android:textSize="18sp"/> android:layout_centerHorizontal="true"
</LinearLayout> android:background="@android:drawable/divider_horizontal_dark"
/>
<!-- lock icon and header message -->
<TextView
android:id="@+id/headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dip"
android:layout_centerHorizontal="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
android:drawableLeft="@drawable/ic_lock_idle_lock"
android:drawablePadding="4dip"
android:gravity="center"
/>
<!-- fill space between header and button below --> <!-- fill space between header and button below -->
@@ -82,7 +122,7 @@
<Button android:id="@+id/emergencyCallAlone" <Button android:id="@+id/emergencyCallAlone"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@android:string/lockscreen_emergency_call" android:text="@string/lockscreen_emergency_call"
android:textSize="14sp" android:textSize="14sp"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
@@ -105,7 +145,7 @@
<Button android:id="@+id/emergencyCallTogether" <Button android:id="@+id/emergencyCallTogether"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@android:string/lockscreen_emergency_call" android:text="@string/lockscreen_emergency_call"
android:textSize="14sp" android:textSize="14sp"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
@@ -115,7 +155,7 @@
</LinearLayout> </LinearLayout>
<View <View
android:background="@android:drawable/code_lock_left" android:background="@drawable/code_lock_left"
android:layout_width="2dip" android:layout_width="2dip"
android:layout_height="fill_parent" /> android:layout_height="fill_parent" />
@@ -124,4 +164,4 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

109
core/res/res/layout/keyguard_screen_unlock_portrait.xml
View File

@@ -23,54 +23,93 @@
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_horizontal"
android:background="#A0000000" android:background="#A0000000"
> >
<!-- lock icon and header message -->
<LinearLayout <LinearLayout
android:id="@+id/carrierAndDate"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="0dip" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_marginTop="13dip"
android:gravity="center" >
> <TextView
android:id="@+id/carrier"
<ImageView android:id="@+id/unlockLockIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dip" android:textAppearance="?android:attr/textAppearanceMedium"
android:baselineAligned="true" android:textColor="?android:attr/textColorSecondary"
android:gravity="center" android:textSize="17sp"
android:src="@android:drawable/ic_lock_idle_lock" />
/> <TextView
android:id="@+id/centerDot"
<TextView android:id="@+id/headerText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_marginLeft="5dip"
android:textSize="18sp"/> android:layout_marginRight="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
/>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
/>
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="-9dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="48sp"
/>
<View <View
android:background="@android:drawable/code_lock_top" android:id="@+id/divider"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" /> android:layout_height="1dip"
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" android:layout_marginTop="-4dip"
android:layout_width="wrap_content" android:layout_centerHorizontal="true"
android:layout_height="wrap_content" android:background="@android:drawable/divider_horizontal_dark"
/>
<!-- lock icon and header message -->
<TextView
android:id="@+id/headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dip"
android:layout_centerHorizontal="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
android:drawableLeft="@drawable/ic_lock_idle_lock"
android:drawablePadding="4dip"
/>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:layout_marginTop="2dip"
/> />
<View
android:background="@android:drawable/code_lock_bottom"
android:layout_width="fill_parent"
android:layout_height="8dip" />
<!-- footer --> <!-- footer -->
<FrameLayout <FrameLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dip" android:layout_height="wrap_content"
android:layout_weight="1.0"
> >
<!-- option 1: a single emergency call button --> <!-- option 1: a single emergency call button -->
@@ -82,8 +121,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:text="@android:string/lockscreen_emergency_call" android:text="@string/lockscreen_emergency_call"
android:textSize="14sp" android:textAppearance="?android:attr/textAppearanceSmall"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
/> />
@@ -105,8 +144,8 @@
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:layout_marginLeft="4dip" android:layout_marginLeft="4dip"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:text="@android:string/lockscreen_emergency_call" android:text="@string/lockscreen_emergency_call"
android:textSize="14sp" android:textAppearance="?android:attr/textAppearanceSmall"
android:drawableLeft="@drawable/ic_emergency" android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip" android:drawablePadding="8dip"
/> />
@@ -118,7 +157,7 @@
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:layout_marginLeft="2dip" android:layout_marginLeft="2dip"
android:layout_marginRight="4dip" android:layout_marginRight="4dip"
android:textSize="14sp" android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="invisible" android:visibility="invisible"
/> />
</LinearLayout> </LinearLayout>