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

am 14bee131: Fix lock screen layouts with emergency call buttons.

Browse Source 
Merge commit '14bee131da68404b33655a241de83c2eeb417559' into eclair-mr2

* commit '14bee131da68404b33655a241de83c2eeb417559':
  Fix lock screen layouts with emergency call buttons.
This commit is contained in:
Daniel Sandler
2009-12-03 08:42:34 -08:00
committed by Android Git Automerger
parent 64fc80823e 14bee131da
commit add867197c
10 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/btn_default_transparent_normal.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
core/res/res/drawable-hdpi/btn_lock_normal.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
core/res/res/drawable-mdpi/btn_default_transparent_normal.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1007 B

BIN
core/res/res/drawable-mdpi/btn_lock_normal.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

24
core/res/res/drawable/btn_default_transparent.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_default_pressed" />
<item android:state_focused="true" android:state_enabled="true"
android:drawable="@drawable/btn_default_selected" />
<item android:state_enabled="true"
android:drawable="@drawable/btn_default_transparent_normal" />
</selector>

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

@ -136,8 +136,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/screenLocked"
android:layout_marginTop="24dip"
android:layout_marginTop="8dip"
android:layout_marginLeft="24dip"
android:drawableLeft="@drawable/ic_emergency"
style="@style/Widget.Button.Transparent"
android:drawablePadding="8dip"
/>

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

@ -128,8 +128,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/screenLocked"
android:layout_marginTop="24dip"
android:layout_marginTop="8dip"
android:drawableLeft="@drawable/ic_emergency"
style="@style/Widget.Button.Transparent"
android:drawablePadding="8dip"
/>
</RelativeLayout>

15
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@ -155,10 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockscreen_emergency_call"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@ -174,20 +171,14 @@
<Button android:id="@+id/forgotPattern"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:visibility="invisible"
/>
<Button android:id="@+id/emergencyCallTogether"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/lockscreen_emergency_call"
android:textSize="14sp"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>

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

@ -165,9 +165,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/lockscreen_emergency_call"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@ -190,9 +188,7 @@
android:layout_marginLeft="4dip"
android:layout_marginRight="2dip"
android:text="@string/lockscreen_emergency_call"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:drawableLeft="@drawable/ic_emergency"
android:drawablePadding="8dip"
/>
@ -204,9 +200,7 @@
android:layout_marginBottom="4dip"
android:layout_marginLeft="2dip"
android:layout_marginRight="4dip"
android:background="@drawable/btn_lock_normal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
style="@style/Widget.Button.Transparent"
android:visibility="invisible"
/>
</LinearLayout>

6
core/res/res/values/styles.xml
View File

@ -237,6 +237,12 @@
<item name="android:background">@android:drawable/button_inset</item>
</style>
<style name="Widget.Button.Transparent">
<item name="android:background">@android:drawable/btn_default_transparent</item>
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="Widget.CompoundButton">
<item name="android:focusable">true</item>
<item name="android:clickable">true</item>