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

Commit 555fe79c authored by Jake Hamby's avatar Jake Hamby Committed by Android Git Automerger
Browse files

am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to... 

am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1

* commit 'c40f70a5':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
parents ebfce84f c40f70a5

core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml

+8 −8
Original line number Diff line number Diff line
@@ -93,29 +93,29 @@ 
        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip">



        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginRight="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="8dip"

        />



        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginLeft="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="8dip"

        />

    </LinearLayout>

core/res/res/layout/keyguard_screen_sim_pin_landscape.xml

+8 −8
Original line number Diff line number Diff line
@@ -91,29 +91,29 @@ 
        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip">



        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginRight="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="4dip"

        />



        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginLeft="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="4dip"

        />

    </LinearLayout>

core/res/res/layout/keyguard_screen_sim_puk_landscape.xml

+8 −8
Original line number Diff line number Diff line
@@ -153,29 +153,29 @@ 
        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip">



        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginRight="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="4dip"

        />



        <Button android:id="@+id/emergencyCallButton"

            android:text="@android:string/lockscreen_emergency_call"

        <Button android:id="@+id/ok"

            android:text="@android:string/ok"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1.0"

            android:layout_marginBottom="8dip"

            android:layout_marginLeft="8dip"

            android:textSize="18sp"

            android:drawableLeft="@drawable/ic_emergency"

            android:drawablePadding="4dip"

        />

    </LinearLayout>

core/res/res/layout/twelve_key_entry.xml

+4 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
        android:layout_marginRight="2dip"

        android:orientation="horizontal">



        <Button android:id="@+id/ok"

        <Button android:id="@+id/cancel"

            android:layout_width="0sp"

            android:layout_height="fill_parent"

            android:layout_weight="1"
@@ -152,7 +152,7 @@ 
            android:layout_marginRight="2dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textStyle="bold"

            android:text="@android:string/ok"

            android:text="@android:string/cancel"

        />



        <Button android:id="@+id/zero"
@@ -165,7 +165,7 @@ 
            android:textStyle="bold"

        />



        <Button android:id="@+id/cancel"

        <Button android:id="@+id/ok"

            android:layout_width="0sp"

            android:layout_height="fill_parent"

            android:layout_weight="1"
@@ -173,7 +173,7 @@ 
            android:layout_marginRight="2dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textStyle="bold"

            android:text="@android:string/cancel"

            android:text="@android:string/ok"

        />



    </LinearLayout>