From 86103cd7dbcf3b5a949711d2b0b21b01ed90cb74 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 18 Nov 2009 00:36:32 -0800 Subject: [PATCH] resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp --- core/res/res/layout/keyguard_screen_unlock_portrait.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 09e40f4fdbdb2..591678606780c 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -40,8 +40,7 @@ android:layout_alignParentTop="true" android:layout_marginTop="6dip" android:layout_alignParentRight="true" - android:layout_marginTop="16dip" - android:layout_marginRight="16dip" + android:layout_marginRight="8dip" android:textAppearance="?android:attr/textAppearanceMedium" />