Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07023777 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

Merge commit '9f71025b' into froyo-plus-aosp

* commit '9f71025b':
  Add emergency call button to PUK'd lockscreen.
parents a327dbdd 9f71025b

core/res/res/layout/keyguard_screen_tab_unlock.xml

+14 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+12 −0
Original line number Diff line number Diff line
@@ -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>