diff options
| -rw-r--r-- | core/res/res/drawable-hdpi/btn_lock_normal.9.png | bin | 0 -> 1394 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/btn_lock_normal.9.png | bin | 0 -> 982 bytes | |||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_landscape.xml | 60 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 52 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 2 |
5 files changed, 91 insertions, 23 deletions
diff --git a/core/res/res/drawable-hdpi/btn_lock_normal.9.png b/core/res/res/drawable-hdpi/btn_lock_normal.9.png Binary files differnew file mode 100644 index 000000000000..f1dac62e17b4 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_lock_normal.9.png diff --git a/core/res/res/drawable-mdpi/btn_lock_normal.9.png b/core/res/res/drawable-mdpi/btn_lock_normal.9.png Binary files differnew file mode 100644 index 000000000000..6bdc2c64f19a --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_lock_normal.9.png diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index 6dd294994500..0ef73fa99850 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -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" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index a5d44fc376cb..f3c7559a0a44 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -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> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e2f698159a8d..eb151835a5d0 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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. --> |
