drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 10c1dfad: Merge change Ifea65fb9 into eclair-mr2

Browse Source 
Merge commit '10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp

* commit '10c1dfad63ee7dace03b7914faf3c9891d096e25':
  Move the emergency call button to the top-right when there's no SIM.
This commit is contained in:
Daniel Sandler
2009-12-09 15:45:26 -08:00
committed by Android Git Automerger
parent 45ccb6a55e 10c1dfad63
commit f43eeef301
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,20 @@
android:textAppearance="?android:attr/textAppearanceMedium" 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 --> <!-- time and date -->
<com.android.internal.widget.DigitalClock android:id="@+id/time" <com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -121,6 +135,7 @@
android:layout_marginLeft="24dip" android:layout_marginLeft="24dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="12dip" android:layout_marginTop="12dip"
android:drawablePadding="4dip"
/> />
<com.android.internal.widget.SlidingTab <com.android.internal.widget.SlidingTab
@ -132,18 +147,5 @@
android:layout_marginBottom="80dip" 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> </RelativeLayout>

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

@ -45,6 +45,18 @@
android:textAppearance="?android:attr/textAppearanceMedium" 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" <com.android.internal.widget.DigitalClock android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -122,19 +134,9 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center" android:gravity="center"
android:layout_marginTop="12dip" 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> </RelativeLayout>
<!-- right side --> <!-- right side -->

7
core/res/res/values/colors.xml
View File

@ -90,5 +90,12 @@
<color name="sliding_tab_text_color_active">@android:color/black</color> <color name="sliding_tab_text_color_active">@android:color/black</color>
<color name="sliding_tab_text_color_shadow">@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> </resources>