X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fandroid%2Fdeskclock%2FSetAlarm.java;fp=src%2Fcom%2Fandroid%2Fdeskclock%2FSetAlarm.java;h=28cfe5bc47161dc607a75d70e58f511d144782b7;hb=c1a90e6b1607eaf15cacbc329ce51dec56ceb2fe;hp=ce07cc15c1ab5b81db8c576fbd5889e0db078178;hpb=5553de611a3a65dc5f2fa31d3c49b7f7a6609a36;p=android-x86%2Fpackages-apps-DeskClock.git

diff --git a/src/com/android/deskclock/SetAlarm.java b/src/com/android/deskclock/SetAlarm.java
index ce07cc1..28cfe5b 100644
--- a/src/com/android/deskclock/SetAlarm.java
+++ b/src/com/android/deskclock/SetAlarm.java
@@ -67,6 +67,7 @@ public class SetAlarm extends PreferenceActivity
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        AlarmClock.setVolumeControlForPlatform(this);
 
         addPreferencesFromResource(R.xml.alarm_prefs);
 
@@ -85,6 +86,7 @@ public class SetAlarm extends PreferenceActivity
         mTimePref = findPreference("time");
         mAlarmPref = (AlarmPreference) findPreference("alarm");
         mVibratePref = (CheckBoxPreference) findPreference("vibrate");
+        mVibratePref.setEnabled(!AlarmClock.isVolumeAdjustable());
         mRepeatPref = (RepeatPreference) findPreference("setRepeat");
 
         Intent i = getIntent();
@@ -101,7 +103,7 @@ public class SetAlarm extends PreferenceActivity
         mHour = alarm.hour;
         mMinutes = alarm.minutes;
         mRepeatPref.setDaysOfWeek(alarm.daysOfWeek);
-        mVibratePref.setChecked(alarm.vibrate);
+        mVibratePref.setChecked(alarm.vibrate && !AlarmClock.isVolumeAdjustable());
         // Give the alert uri to the preference.
         mAlarmPref.setAlert(alarm.alert);
         updateTime();