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

Fixes a regression in launching certain settings activities.

Browse Source 
Some undocumented settings and class names are being used by NotificationManagerService.
Added compatibility activities to handle them.

Bug: 3258668
This commit is contained in:
Amith Yamasani
2010-12-15 14:12:43 -08:00
parent 744b8af2fb
commit eb99f2f3f4
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
AndroidManifest.xml
View File

@@ -248,6 +248,22 @@
android:value="com.android.settings.Settings$WirelessSettingsActivity" /> android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity> </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".TetherSettings"
android:label="@string/tether_settings_title_all"
android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$TetherSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.TetherSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
android:resource="@string/wireless_networks_settings_title" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity-alias>
<activity android:name="Settings$VpnSettingsActivity" <activity android:name="Settings$VpnSettingsActivity"
android:theme="@android:style/Theme.Holo" android:theme="@android:style/Theme.Holo"
android:label="@string/vpn_settings_activity_title" android:label="@string/vpn_settings_activity_title"
@@ -771,6 +787,7 @@
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
@@ -784,6 +801,26 @@
android:value="com.android.settings.Settings$ApplicationSettingsActivity" /> android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
</activity> </activity>
<activity-alias android:name="DevelopmentSettings"
android:clearTaskOnLaunch="true"
android:exported="true"
android:label="@string/development_settings_title"
android:targetActivity="Settings$DevelopmentSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DevelopmentSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/application_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
android:resource="@string/applications_settings_header" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
</activity-alias>
<!-- Bluetooth stuff --> <!-- Bluetooth stuff -->

2
src/com/android/settings/SoundSettings.java
View File

@@ -261,6 +261,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements
// updateState in fact updates the UI to reflect the system state // updateState in fact updates the UI to reflect the system state
private void updateState(boolean force) { private void updateState(boolean force) {
if (getActivity() == null) return;
final int ringerMode = mAudioManager.getRingerMode(); final int ringerMode = mAudioManager.getRingerMode();
// NB: in the UI we now simply call this "silent mode". A separate // NB: in the UI we now simply call this "silent mode". A separate