gistfile1.txt

diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
index bc9124b80db4..6f75461b9051 100644
--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -89,8 +89,8 @@
     <dimen name="num_pad_key_margin_end">12dp</dimen>
 
     <!-- additional offset for clock switch area items -->
-    <dimen name="clock_padding_start">28dp</dimen>
-    <dimen name="below_clock_padding_start">32dp</dimen>
+    <dimen name="clock_padding_start">10dp</dimen>
+    <dimen name="below_clock_padding_start">128dp</dimen>
     <dimen name="below_clock_padding_end">16dp</dimen>
     <dimen name="below_clock_padding_start_icons">28dp</dimen>
 
@@ -107,5 +107,5 @@
          animating. Larger values will cause it to move "faster" while fading out/in. -->
     <dimen name="one_handed_bouncer_move_animation_translation">120dp</dimen>
 
-    <dimen name="title_clock_padding">4dp</dimen>
+    <dimen name="title_clock_padding">500dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values-h700dp/dimens.xml b/packages/SystemUI/res/values-h700dp/dimens.xml
index fbd985eaa751..8fed437485a3 100644
--- a/packages/SystemUI/res/values-h700dp/dimens.xml
+++ b/packages/SystemUI/res/values-h700dp/dimens.xml
@@ -16,5 +16,5 @@
 
 <resources>
     <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->
-    <dimen name="large_clock_text_size">170dp</dimen>
+    <dimen name="large_clock_text_size">100dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values-h800dp/dimens.xml b/packages/SystemUI/res/values-h800dp/dimens.xml
index 1d6f279afc66..53ff36967250 100644
--- a/packages/SystemUI/res/values-h800dp/dimens.xml
+++ b/packages/SystemUI/res/values-h800dp/dimens.xml
@@ -19,8 +19,8 @@
     <dimen name="keyguard_clock_top_margin">38dp</dimen>
 
     <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->
-    <dimen name="large_clock_text_size">200dp</dimen>
+    <dimen name="large_clock_text_size">150dp</dimen>
 
     <!-- With the large clock, move up slightly from the center -->
-    <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>
+    <dimen name="keyguard_large_clock_top_margin">-198dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index c0ad674e62fe..82434ef32f45 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -591,22 +591,22 @@
 
     <!-- The margin from the top of the screen to notifications and keyguard status view in
          split shade on keyguard-->
-    <dimen name="keyguard_split_shade_top_margin">68dp</dimen>
+    <dimen name="keyguard_split_shade_top_margin">20dp</dimen>
     <!-- The margin between the status view and the notifications on Keyguard.-->
     <dimen name="keyguard_status_view_bottom_margin">20dp</dimen>
     <!-- Minimum margin between clock and status bar -->
-    <dimen name="keyguard_clock_top_margin">18dp</dimen>
+    <dimen name="keyguard_clock_top_margin">10dp</dimen>
     <!-- The amount to shift the clocks during a small/large transition -->
-    <dimen name="keyguard_clock_switch_y_shift">10dp</dimen>
+    <dimen name="keyguard_clock_switch_y_shift">24dp</dimen>
     <!-- When large clock is showing, offset the smartspace by this amount -->
-    <dimen name="keyguard_smartspace_top_offset">12dp</dimen>
+    <dimen name="keyguard_smartspace_top_offset">8dp</dimen>
     <!-- With the large clock, move up slightly from the center -->
-    <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>
+    <dimen name="keyguard_large_clock_top_margin">-300dp</dimen>
 
     <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->
-    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>
+    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.6</item>
     <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->
-    <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
+    <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">.6</item>
 
     <dimen name="notification_scrim_corner_radius">32dp</dimen>
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
index dd16a0205d5b..837c9d91b840 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -225,13 +225,13 @@ public class KeyguardClockSwitch extends RelativeLayout {
             mClockPlugin.onDestroyView();
             mClockPlugin = null;
         }
-        boolean useLargeClock = false;
+        boolean useLargeClock = true;
         if (plugin == null) {
             this.mStatusArea.setVisibility(View.VISIBLE);
             this.mClockView.setVisibility(View.VISIBLE);
             this.mLargeClockView.setVisibility(View.VISIBLE);
             this.mClockFrame.setVisibility(View.VISIBLE);
-            setMargins(this.mLargeClockFrame, 0, 0, 0, 0);
+            setMargins(this.mLargeClockFrame, 80, 80, 80, 80);
             return;
         }
         // Attach small and big clock views to hierarchy.
@@ -254,9 +254,10 @@ public class KeyguardClockSwitch extends RelativeLayout {
         mClockPlugin.setTextColor(getCurrentTextColor());
         mClockPlugin.setDarkAmount(mDarkAmount);
         Integer num = this.mDisplayedClockSize;
-        if (num != null && num.intValue() == 0) {
+       // if (num != null && num.intValue() == 0) {
             useLargeClock = true;
-        }
+        //    Log.d(TAG, message is);
+      //  }
         setupFrames("setPlugin", useLargeClock);
         if (mColorPalette != null) {
             mClockPlugin.setColorPalette(mSupportsDarkText, mColorPalette);
@@ -454,7 +455,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
         int i = 0;
         if (useLargeClock) {
             this.mClockFrame.setVisibility(View.VISIBLE);
-            setMargins(this.mLargeClockFrame, 0, 0, 0, 0);
+            setMargins(this.mLargeClockFrame, 80, 80, 80, 80);
         } else if (hasCustomClock()) {
                 int dimensionPixelSize = mContext.getResources().getDisplayMetrics().heightPixels - mContext.getResources().getDimensionPixelSize(R.dimen.status_bar_height);
                 mClockFrame.setVisibility(!mClockPlugin.shouldShowClockFrame() ? View.GONE : View.VISIBLE);
@@ -465,11 +466,11 @@ public class KeyguardClockSwitch extends RelativeLayout {
                 if (mClockPlugin.usesPreferredY()) {
                     i = mClockPlugin.getPreferredY(dimensionPixelSize);
                 }
-                setMargins(frameLayout, 0, i, 0, 0);
+                setMargins(frameLayout, 80, 80, 80, 80);
                 }
             } else {
                 mClockFrame.setVisibility(View.VISIBLE);
-                setMargins(mLargeClockFrame, 0, 0, 0, 0);
+                setMargins(mLargeClockFrame, 80, 80, 80, 80);
             }
             refresh();
     }