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

Commit 10c1dfad authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ifea65fb9 into eclair-mr2

* changes:
  Move the emergency call button to the top-right when there's no SIM.
parents 51ef573a 7aacc59a
Loading
Loading
Loading
Loading
+15 −13
Original line number Diff line number Diff line
@@ -40,6 +40,20 @@
        android:textAppearance="?android:attr/textAppearanceMedium"
        />

    <!-- emergency call button shown when sim is missing or PUKd -->
    <Button
        android:id="@+id/emergencyCallButton"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentTop="true"
        android:layout_alignParentRight="true"
        android:layout_marginTop="10dip"
        android:layout_marginRight="8dip"
        android:drawableLeft="@drawable/ic_emergency"
        style="@style/Widget.Button.Transparent"
        android:drawablePadding="8dip"
       />

    <!-- time and date -->
    <com.android.internal.widget.DigitalClock android:id="@+id/time"
        android:layout_width="wrap_content"
@@ -121,6 +135,7 @@
        android:layout_marginLeft="24dip"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:layout_marginTop="12dip"
        android:drawablePadding="4dip"
        />

    <com.android.internal.widget.SlidingTab
@@ -132,18 +147,5 @@
        android:layout_marginBottom="80dip" 
        />

    <!-- emergency call button shown when sim is missing or PUKd -->
    <Button
        android:id="@+id/emergencyCallButton"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@id/screenLocked"
        android:layout_marginTop="8dip"
        android:layout_marginLeft="24dip"
        android:drawableLeft="@drawable/ic_emergency"
        style="@style/Widget.Button.Transparent"
        android:drawablePadding="8dip"
       />

</RelativeLayout>
+13 −11
Original line number Diff line number Diff line
@@ -45,6 +45,18 @@
            android:textAppearance="?android:attr/textAppearanceMedium"
            />

        <!-- emergency call button shown when sim is missing or PUKd -->
        <Button
            android:id="@+id/emergencyCallButton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentTop="true"
            android:layout_marginTop="20dip"
            android:drawableLeft="@drawable/ic_emergency"
            style="@style/Widget.Button.Transparent"
            android:drawablePadding="8dip"
           />

        <com.android.internal.widget.DigitalClock android:id="@+id/time"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -122,19 +134,9 @@
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:gravity="center"
            android:layout_marginTop="12dip"
            android:drawablePadding="4dip"
            />

        <!-- emergency call button shown when sim is missing or PUKd -->
        <Button
            android:id="@+id/emergencyCallButton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_below="@id/screenLocked"
            android:layout_marginTop="8dip"
            android:drawableLeft="@drawable/ic_emergency"
            style="@style/Widget.Button.Transparent"
            android:drawablePadding="8dip"
           />
    </RelativeLayout>

    <!-- right side -->
+7 −0
Original line number Diff line number Diff line
@@ -90,5 +90,12 @@
    <color name="sliding_tab_text_color_active">@android:color/black</color>
    <color name="sliding_tab_text_color_shadow">@android:color/black</color>

    <!-- keyguard tab -->
    <color name="keyguard_text_color_normal">#ffffff</color>
    <color name="keyguard_text_color_unlock">#a7d84c</color>
    <color name="keyguard_text_color_soundoff">#ffffff</color>
    <color name="keyguard_text_color_soundon">#e69310</color>
    <color name="keyguard_text_color_decline">#fe0a5a</color>

</resources>