Keyguard: don't use large clock on landscape

Large clock does not display properly on landscape mode.

Change-Id: If803ad03568671e8aed2fe37897bd1fb9cee29ae

1 files changed, 16 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
index 9238b8226bbc..1e1bcd14e23b 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.util.AttributeSet;
@@ -93,6 +94,17 @@ public class KeyguardClockSwitch extends RelativeLayout {
         super(context, attrs);
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (mDisplayedClockSize != null) {
+            boolean landscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE;
+            boolean useLargeClock = mDisplayedClockSize == LARGE && !landscape;
+            animateClockChange(useLargeClock);
+        }
+    }
+
     /**
      * Apply dp changes on font/scale change
      */
@@ -277,11 +289,14 @@ public class KeyguardClockSwitch extends RelativeLayout {
         if (mDisplayedClockSize != null && clockSize == mDisplayedClockSize) {
             return false;
         }
+        boolean landscape = getResources().getConfiguration().orientation
+                == Configuration.ORIENTATION_LANDSCAPE;
+        boolean useLargeClock = clockSize == LARGE && !landscape;
 
         // let's make sure clock is changed only after all views were laid out so we can
         // translate them properly
         if (mChildrenAreLaidOut) {
-            animateClockChange(clockSize == LARGE);
+            animateClockChange(useLargeClock);
         }
 
         mDisplayedClockSize = clockSize;