summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-05-25 17:13:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-25 17:13:18 -0700
commitb35cd7dde521746401158fdc4f3324e6e53e095a (patch)
tree0ee0a22a0aac898ab657a572e456994b9e965152
parentac53a8a135b3e04692a553147eabf3cbafd321c1 (diff)
parentbae698cd54564b68bfd9a98f69cbf75964059f51 (diff)
downloadframeworks_base-b35cd7dde521746401158fdc4f3324e6e53e095a.zip
frameworks_base-b35cd7dde521746401158fdc4f3324e6e53e095a.tar.gz
frameworks_base-b35cd7dde521746401158fdc4f3324e6e53e095a.tar.bz2
Merge "Fix 2667859: change text back to default size" into kraken
-rw-r--r--core/res/res/layout/keyguard_screen_tab_unlock.xml1
-rw-r--r--core/res/res/layout/keyguard_screen_tab_unlock_land.xml1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 79ca617..6edbdf9 100644
--- a/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -41,7 +41,6 @@
android:ellipsize="marquee"
android:gravity="right|bottom"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="22sp"
/>
<!-- "emergency calls only" shown when sim is missing or PUKd -->
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
index 8353887..e66b492 100644
--- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
+++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
@@ -46,7 +46,6 @@
android:ellipsize="marquee"
android:gravity="right|bottom"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="22sp"
/>
<!-- "emergency calls only" shown when sim is missing or PUKd -->