commit 6343abe720a1427a4b667c2a056a62dba348e65d
author Budi Kusmiantoro <budi@google.com> Tue Nov 18 20:56:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 18 20:56:53 2014 +0000
tree e621dcbf25b1dd2c394d60d43dee9afc6ed2cca3
parent 0a24c82f14ff00c41a2341a7c0c48944b901e0fe
parent 2c6737df278a8a210854aaa2ba3ac626665c208c

am 2c6737df: Merge "Add delay upon orientation change before layout update" into lmp-mr1-dev

* commit '2c6737df278a8a210854aaa2ba3ac626665c208c':
  Add delay upon orientation change before layout update

src/com/android/deskclock/Screensaver.java

diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
index 5c74e3d..042d839 100644
--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
@@ -32,8 +32,11 @@
 import com.android.deskclock.Utils.ScreensaverMoveSaverRunnable;
 
 public class Screensaver extends DreamService {
-    static final boolean DEBUG = false;
-    static final String TAG = "DeskClock/Screensaver";
+
+    public static final int ORIENTATION_CHANGE_DELAY_MS = 250;
+
+    private static final boolean DEBUG = false;
+    private static final String TAG = "DeskClock/Screensaver";
 
     private View mContentView, mSaverView;
     private View mAnalogClock, mDigitalClock;
@@ -99,7 +102,7 @@
         super.onConfigurationChanged(newConfig);
         mHandler.removeCallbacks(mMoveSaverRunnable);
         layoutClockSaver();
-        mHandler.post(mMoveSaverRunnable);
+        mHandler.postDelayed(mMoveSaverRunnable, ORIENTATION_CHANGE_DELAY_MS);
     }
 
     @Override
@@ -149,7 +152,7 @@
     private void layoutClockSaver() {
         setContentView(R.layout.desk_clock_saver);
         mDigitalClock = findViewById(R.id.digital_clock);
-        mAnalogClock =findViewById(R.id.analog_clock);
+        mAnalogClock = findViewById(R.id.analog_clock);
         setClockStyle();
         Utils.setTimeFormat((TextClock)mDigitalClock,
             (int)getResources().getDimension(R.dimen.main_ampm_font_size));

src/com/android/deskclock/ScreensaverActivity.java

diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index 5a5b0d2..d5c8ff1 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -152,7 +152,7 @@
         super.onConfigurationChanged(newConfig);
         mHandler.removeCallbacks(mMoveSaverRunnable);
         layoutClockSaver();
-        mHandler.postDelayed(mMoveSaverRunnable, 250);
+        mHandler.postDelayed(mMoveSaverRunnable, Screensaver.ORIENTATION_CHANGE_DELAY_MS);
     }
 
     @Override