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

am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo

Browse Source 
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp

* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
  Add emergency call button to PUK'd lockscreen.
This commit is contained in:
Daniel Sandler
2010-04-08 06:10:09 -07:00
committed by Android Git Automerger
parent a327dbddcc 9f71025b37
commit 070237771e
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@@ -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>

12
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -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>