PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename and flip meaning of auto-rotate to rotation lock.

Browse Source 
Bug: 6485348
Change-Id: I17359db3156641a69f6841d4e0c48708b5fafe4e
This commit is contained in:
Amith Yamasani
2012-05-15 16:15:40 -07:00
parent 9ca54ef688
commit b944171092
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1635,8 +1635,8 @@
<!-- Display settings --><skip/> <!-- Display settings --><skip/>
<!-- Sound & display settings screen, section header for settings related to display --> <!-- Sound & display settings screen, section header for settings related to display -->
<string name="display_settings">Display</string> <string name="display_settings">Display</string>
<!-- Sound & display settings screen, accelerometer-based rotation check box label --> <!-- Sound & display settings screen, accelerometer-based rotation lock check box label [CHAR LIMIT=30] -->
<string name="accelerometer_title">Auto-rotate screen</string> <string name="accelerometer_title">Rotation lock</string>
<!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
<string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string> <string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string>
<!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->

20
src/com/android/settings/DisplaySettings.java
View File

@@ -56,7 +56,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_NOTIFICATION_PULSE = "notification_pulse"; private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
private static final String KEY_SCREEN_SAVER = "screensaver"; private static final String KEY_SCREEN_SAVER = "screensaver";
private CheckBoxPreference mAccelerometer; private CheckBoxPreference mRotationLock;
private ListPreference mFontSizePref; private ListPreference mFontSizePref;
private CheckBoxPreference mNotificationPulse; private CheckBoxPreference mNotificationPulse;
@@ -68,7 +68,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) { private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
updateAccelerometerRotationCheckbox(); updateRotationLockCheckbox();
} }
}; };
@@ -79,8 +79,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
addPreferencesFromResource(R.xml.display_settings); addPreferencesFromResource(R.xml.display_settings);
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER); mRotationLock = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false); mRotationLock.setPersistent(false);
mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER); mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
if (mScreenSaverPreference != null if (mScreenSaverPreference != null
@@ -223,7 +223,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
} }
private void updateState() { private void updateState() {
updateAccelerometerRotationCheckbox(); updateRotationLockCheckbox();
readFontSizePreference(mFontSizePref); readFontSizePreference(mFontSizePref);
updateScreenSaverSummary(); updateScreenSaverSummary();
} }
@@ -235,11 +235,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
: R.string.screensaver_settings_summary_off); : R.string.screensaver_settings_summary_off);
} }
private void updateAccelerometerRotationCheckbox() { private void updateRotationLockCheckbox() {
if (getActivity() == null) return; if (getActivity() == null) return;
mAccelerometer.setChecked(Settings.System.getInt( mRotationLock.setChecked(Settings.System.getInt(
getContentResolver(), getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION, 0) != 0); Settings.System.ACCELEROMETER_ROTATION, 0) == 0);
} }
public void writeFontSizePreference(Object objValue) { public void writeFontSizePreference(Object objValue) {
@@ -253,11 +253,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference == mAccelerometer) { if (preference == mRotationLock) {
try { try {
IWindowManager wm = IWindowManager.Stub.asInterface( IWindowManager wm = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE)); ServiceManager.getService(Context.WINDOW_SERVICE));
if (mAccelerometer.isChecked()) { if (!mRotationLock.isChecked()) {
wm.thawRotation(); wm.thawRotation();
} else { } else {
wm.freezeRotation(Surface.ROTATION_0); wm.freezeRotation(Surface.ROTATION_0);