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

Merge commit '5c20034b' into fix

Browse Source 
Conflicts:

	res/values/strings.xml
This commit is contained in:
Mitsuru Oshima
2009-07-20 23:30:04 -07:00
parent 3a76bcaa83 5c20034b7f
commit 7f44ca3170
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -895,13 +895,6 @@
<!-- Sound & display settings screen, setting option summary to change screen timeout --> <!-- Sound & display settings screen, setting option summary to change screen timeout -->
<string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string> <string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string>
<!-- Sound & display settings screen, compatibility mode check box label -->
<string name="compatibility_mode_title">Compatibility mode</string>
<!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
<string name="compatibility_mode_summary_on">Run older applications in Compatibility mode. This requires a reboot. </string>
<!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
<string name="compatibility_mode_summary_off">Run older applications in Compatibility mode. This requires a reboot. </string>
<!-- SIM lock settings title --> <!-- SIM lock settings title -->
<string name="sim_lock_settings">SIM card lock settings</string> <string name="sim_lock_settings">SIM card lock settings</string>
<!-- Security & location settings screen, setting option name --> <!-- Security & location settings screen, setting option name -->

6
res/xml/sound_and_display_settings.xml
View File

@@ -130,12 +130,6 @@
android:persistent="false" android:persistent="false"
android:entries="@array/screen_timeout_entries" android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" /> android:entryValues="@array/screen_timeout_values" />
<CheckBoxPreference
android:key="compatibility_mode"
android:title="@string/compatibility_mode_title"
android:summaryOn="@string/compatibility_mode_summary_on"
android:summaryOff="@string/compatibility_mode_summary_off" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

10
src/com/android/settings/SoundAndDisplaySettings.java
View File

@@ -55,7 +55,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private static final String KEY_ANIMATIONS = "animations"; private static final String KEY_ANIMATIONS = "animations";
private static final String KEY_ACCELEROMETER = "accelerometer"; private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds"; private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
private static final String KEY_COMPATIBILITY_MODE = "compatibility_mode";
private static final String KEY_EMERGENCY_TONE ="emergency_tone"; private static final String KEY_EMERGENCY_TONE ="emergency_tone";
private CheckBoxPreference mSilent; private CheckBoxPreference mSilent;
@@ -76,7 +75,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private CheckBoxPreference mSoundEffects; private CheckBoxPreference mSoundEffects;
private CheckBoxPreference mAnimations; private CheckBoxPreference mAnimations;
private CheckBoxPreference mAccelerometer; private CheckBoxPreference mAccelerometer;
private CheckBoxPreference mCompatibilityMode;
private float[] mAnimationScales; private float[] mAnimationScales;
private AudioManager mAudioManager; private AudioManager mAudioManager;
@@ -124,10 +122,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
mAnimations.setPersistent(false); mAnimations.setPersistent(false);
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER); mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false); mAccelerometer.setPersistent(false);
mCompatibilityMode = (CheckBoxPreference) findPreference(KEY_COMPATIBILITY_MODE);
mCompatibilityMode.setPersistent(false);
mCompatibilityMode.setChecked(Settings.System.getInt(resolver,
Settings.System.COMPATIBILITY_MODE, 1) != 0);
ListPreference screenTimeoutPreference = ListPreference screenTimeoutPreference =
(ListPreference) findPreference(KEY_SCREEN_TIMEOUT); (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
@@ -269,10 +263,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
Settings.System.putInt(getContentResolver(), Settings.System.putInt(getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION, Settings.System.ACCELEROMETER_ROTATION,
mAccelerometer.isChecked() ? 1 : 0); mAccelerometer.isChecked() ? 1 : 0);
} else if (preference == mCompatibilityMode) {
Settings.System.putInt(getContentResolver(),
Settings.System.COMPATIBILITY_MODE,
mCompatibilityMode.isChecked() ? 1 : 0);
} }
return true; return true;
} }