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

Merge change 26954 into eclair

Browse Source 
* changes:
  Update layouts to show status (battery, alarm) info on pattern unlock screen.  make buttons dark.
This commit is contained in:
Android (Google) Code Review
2009-09-24 19:54:07 -04:00
parent 7d0bdfaf9a 816ef1c116
commit 0808c96126
5 changed files with 91 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/btn_lock_normal.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
core/res/res/drawable-mdpi/btn_lock_normal.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 B

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

@@ -85,21 +85,45 @@
android:background="@android:drawable/divider_horizontal_dark"
/>
<!-- lock icon and header message -->
<TextView
android:id="@+id/headerText"
<!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
status. -->
<LinearLayout
android:orientation="horizontal"
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:layout_marginTop="8dip"
android:gravity="center"
/>
>
<TextView
android:id="@+id/status1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
android:drawablePadding="4dip"
/>
<TextView
android:id="@+id/statusSep"
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/status2"
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"
android:drawablePadding="4dip"
/>
</LinearLayout>
<!-- fill space between header and button below -->
<View
@@ -118,12 +142,16 @@
<RelativeLayout android:id="@+id/footerNormal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
>
<Button android:id="@+id/emergencyCallAlone"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockscreen_emergency_call"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@@ -140,6 +168,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:visibility="invisible"
/>
<Button android:id="@+id/emergencyCallTogether"
@@ -147,6 +178,9 @@
android:layout_height="wrap_content"
android:text="@string/lockscreen_emergency_call"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>

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

@@ -84,19 +84,45 @@
android:background="@android:drawable/divider_horizontal_dark"
/>
<!-- lock icon and header message -->
<TextView
android:id="@+id/headerText"
<!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
status. -->
<LinearLayout
android:orientation="horizontal"
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"
/>
android:gravity="center"
>
<TextView
android:id="@+id/status1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="17sp"
android:drawablePadding="4dip"
/>
<TextView
android:id="@+id/statusSep"
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/status2"
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"
android:drawablePadding="4dip"
/>
</LinearLayout>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"
@@ -122,7 +148,9 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/lockscreen_emergency_call"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@@ -145,7 +173,9 @@
android:layout_marginLeft="4dip"
android:layout_marginRight="2dip"
android:text="@string/lockscreen_emergency_call"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@@ -157,7 +187,9 @@
android:layout_marginBottom="4dip"
android:layout_marginLeft="2dip"
android:layout_marginRight="4dip"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:visibility="invisible"
/>
</LinearLayout>

2
core/res/res/values/strings.xml
View File

@@ -1345,6 +1345,8 @@
<!-- When the lock screen is showing, the phone is plugged in and the battery is fully
charged, say that it is charged. -->
<string name="lockscreen_charged">Charged.</string>
<!-- A short representation of charging information, e.g "34%" -->
<string name="lockscreen_battery_short"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>
<!-- When the lock screen is showing and the battery is low, warn user to plug
in the phone soon. -->