commit 65dd71ae317fae6849a22086d4d0ce08b8d76dbf
author Annie Chin <afchin@google.com> Tue Nov 18 21:02:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 18 21:02:39 2014 +0000
tree dde5fa46da6501149f36916a30f7fb3e6236876b
parent 2c6737df278a8a210854aaa2ba3ac626665c208c
parent 5a62e2da97bdcd86b73176a3cff077fc6deddfdd

Merge "Add more logging statements to HandleApiCalls." into lmp-mr1-dev

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

src/com/android/deskclock/SettingsActivity.java

diff --git a/src/com/android/deskclock/SettingsActivity.java b/src/com/android/deskclock/SettingsActivity.java
index fce9d9e..51887ad 100644
--- a/src/com/android/deskclock/SettingsActivity.java
+++ b/src/com/android/deskclock/SettingsActivity.java
@@ -25,8 +25,6 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -44,11 +42,6 @@
 public class SettingsActivity extends PreferenceActivity
         implements Preference.OnPreferenceChangeListener {
 
-    private static final int ALARM_STREAM_TYPE_BIT =
-            1 << AudioManager.STREAM_ALARM;
-
-    public static final String KEY_ALARM_IN_SILENT_MODE =
-            "alarm_in_silent_mode";
     public static final String KEY_ALARM_SNOOZE =
             "snooze_duration";
     public static final String KEY_VOLUME_BEHAVIOR =
@@ -119,7 +112,6 @@
         return super.onOptionsItemSelected(item);
     }
 
-
     @Override
     public boolean onCreateOptionsMenu (Menu menu) {
         getMenuInflater().inflate(R.menu.settings_menu, menu);
@@ -131,31 +123,6 @@
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
-        if (KEY_ALARM_IN_SILENT_MODE.equals(preference.getKey())) {
-            CheckBoxPreference pref = (CheckBoxPreference) preference;
-            int ringerModeStreamTypes = Settings.System.getInt(
-                    getContentResolver(),
-                    Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-
-            if (pref.isChecked()) {
-                ringerModeStreamTypes &= ~ALARM_STREAM_TYPE_BIT;
-            } else {
-                ringerModeStreamTypes |= ALARM_STREAM_TYPE_BIT;
-            }
-
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.MODE_RINGER_STREAMS_AFFECTED,
-                    ringerModeStreamTypes);
-
-            return true;
-        }
-
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference pref, Object newValue) {
         if (KEY_AUTO_SILENCE.equals(pref.getKey())) {
             final ListPreference listPref = (ListPreference) pref;