diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-08 06:06:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-08 06:06:50 -0700 |
| commit | 9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7 (patch) | |
| tree | 4edba2135b6d1d9364c679b9b8d8f2e44519f5de /core/res | |
| parent | ecb0e637870553f9c12dc6b9178de0512563af9c (diff) | |
| parent | 789a25eb9bd9c2953e9d7cd1a5cbfd1f92b8f3a0 (diff) | |
| download | frameworks_base-9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7.zip frameworks_base-9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7.tar.gz frameworks_base-9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7.tar.bz2 | |
Merge "Add emergency call button to PUK'd lockscreen." into froyo
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock.xml | 14 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock_land.xml | 12 |
2 files changed, 26 insertions, 0 deletions
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index a4b2357..945d283 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -152,5 +152,19 @@ android:layout_marginBottom="80dip" /> + <!-- emergency call button shown when sim is PUKd and tab_selector is + hidden --> + <Button + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@drawable/ic_emergency" + android:layout_centerInParent="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="80dip" + style="@style/Widget.Button.Transparent" + android:drawablePadding="8dip" + /> + </RelativeLayout> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index e1c9772..6b76004 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -153,4 +153,16 @@ android:layout_marginRight="80dip" /> + <!-- emergency call button shown when sim is PUKd and tab_selector is + hidden --> + <Button + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@drawable/ic_emergency" + style="@style/Widget.Button.Transparent" + android:drawablePadding="8dip" + android:layout_marginRight="80dip" + /> + </LinearLayout> |