LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := user development
+LOCAL_MODULE_TAGS := user
LOCAL_SRC_FILES := $(call all-java-files-under, src)
<!-- Sound & display settings screen, animations check box label -->
<string name="animations_title">Animation</string>
<!-- Sound & display settings screen, animations option summary text when check box is selected -->
- <string name="animations_summary_on">Show animation when opening/closing windows</string>
+ <string name="animations_summary_on">Show animation when opening & closing windows</string>
<!-- Sound & display settings screen, animations option summary text when check box is clear -->
- <string name="animations_summary_off">Show animation when opening/closing windows</string>
+ <string name="animations_summary_off">Show animation when opening & closing windows</string>
+ <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+ <string name="accelerometer_title">Orientation</string>
+ <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+ <string name="accelerometer_summary_on">Switch orientation automatically when rotating phone</string>
+ <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+ <string name="accelerometer_summary_off">Switch orientation automatically when rotating phone</string>
<!-- Sound & display settings screen, setting option name to change brightness -->
<string name="brightness">Brightness</string>
<!-- Sound & display settings screen, setting option summary to change brightness -->
<PreferenceCategory
android:title="@string/display_settings">
+ <CheckBoxPreference
+ android:key="accelerometer"
+ android:title="@string/accelerometer_title"
+ android:summaryOn="@string/accelerometer_summary_on"
+ android:summaryOff="@string/accelerometer_summary_off"/>
+
<CheckBoxPreference
android:key="animations"
android:title="@string/animations_title"
android:summaryOn="@string/animations_summary_on"
android:summaryOff="@string/animations_summary_off" />
-
<com.android.settings.BrightnessPreference
android:key="brightness"
android:title="@string/brightness"
private static final String KEY_DTMF_TONE = "dtmf_tone";
private static final String KEY_SOUND_EFFECTS = "sound_effects";
private static final String KEY_ANIMATIONS = "animations";
+ private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
private CheckBoxPreference mSilent;
private CheckBoxPreference mDtmfTone;
private CheckBoxPreference mSoundEffects;
private CheckBoxPreference mAnimations;
+ private CheckBoxPreference mAccelerometer;
private float[] mAnimationScales;
private AudioManager mAudioManager;
Settings.System.SOUND_EFFECTS_ENABLED, 0) != 0);
mAnimations = (CheckBoxPreference) findPreference(KEY_ANIMATIONS);
mAnimations.setPersistent(false);
+ mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
+ mAccelerometer.setPersistent(false);
ListPreference screenTimeoutPreference =
(ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
if (animations != mAnimations.isChecked() || force) {
mAnimations.setChecked(animations);
}
+ mAccelerometer.setChecked(Settings.System.getInt(
+ getContentResolver(),
+ Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
}
@Override
mWindowManager.setAnimationScales(mAnimationScales);
} catch (RemoteException e) {
}
+
+ } else if (preference == mAccelerometer) {
+ Settings.System.putInt(getContentResolver(),
+ Settings.System.ACCELEROMETER_ROTATION,
+ mAccelerometer.isChecked() ? 1 : 0);
}
return true;
}
int timeout = getDiscoverableTimeout();
manager.setDiscoverableTimeout(timeout);
-
+
+ mCheckBoxPreference.setSummaryOn(
+ mContext.getResources().getString(R.string.bluetooth_is_discoverable, timeout));
+
long endTimestamp = System.currentTimeMillis() + timeout * 1000;
persistDiscoverableEndTimestamp(endTimestamp);
@Override
public int connect(String address) {
+ List<String> sinks = mService.listConnectedSinks();
+ if (sinks != null) {
+ for (String sinkAddress : sinks) {
+ mService.disconnectSink(sinkAddress);
+ }
+ }
return mService.connectSink(address);
}