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

Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-24 21:22:06 +00:00
committed by Android (Google) Code Review
parent 468d39160f e3ff4d8e92
commit 6cef9d23b8
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -1148,8 +1148,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!-- TODO: Test this once Settings stops crashing for this intent --> <activity android:name="Settings$QuickLaunchSettingsActivity"
<activity android:name=".quicklaunch.QuickLaunchSettings"
android:label="@string/quick_launch_title"> android:label="@string/quick_launch_title">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -1158,8 +1157,10 @@
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.quicklaunch.QuickLaunchSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity> </activity>
<activity android:name=".quicklaunch.BookmarkPicker" android:label="@string/quick_launch_title"> <activity android:name=".quicklaunch.BookmarkPicker" android:label="@string/quick_launch_title">

1
src/com/android/settings/Settings.java
View File

@@ -94,6 +94,7 @@ public class Settings extends SettingsActivity {
public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
public static class QuickLaunchSettingsActivity extends SettingsActivity { /* empty */ }
public static class TopLevelSettings extends SettingsActivity { /* empty */ } public static class TopLevelSettings extends SettingsActivity { /* empty */ }
} }

4
src/com/android/settings/SettingsActivity.java
View File

@@ -84,6 +84,7 @@ import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.OtherSoundSettings; import com.android.settings.notification.OtherSoundSettings;
import com.android.settings.quicklaunch.QuickLaunchSettings;
import com.android.settings.search.DynamicIndexableContentMonitor; import com.android.settings.search.DynamicIndexableContentMonitor;
import com.android.settings.search.Index; import com.android.settings.search.Index;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -286,7 +287,8 @@ public class SettingsActivity extends Activity
InstalledAppDetails.class.getName(), InstalledAppDetails.class.getName(),
BatterySaverSettings.class.getName(), BatterySaverSettings.class.getName(),
AppNotificationSettings.class.getName(), AppNotificationSettings.class.getName(),
OtherSoundSettings.class.getName() OtherSoundSettings.class.getName(),
QuickLaunchSettings.class.getName()
}; };

12
src/com/android/settings/quicklaunch/QuickLaunchSettings.java
View File

@@ -103,7 +103,6 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements
initShortcutPreferences(); initShortcutPreferences();
mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI, mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI,
sProjection, null, null, null); sProjection, null, null, null);
getListView().setOnItemLongClickListener(this);
} }
@Override @Override
@@ -124,6 +123,7 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onStop() { public void onStop() {
super.onStop();
mBookmarksCursor.close(); mBookmarksCursor.close();
} }
@@ -131,9 +131,13 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements
public void onActivityCreated(Bundle state) { public void onActivityCreated(Bundle state) {
super.onActivityCreated(state); super.onActivityCreated(state);
// Restore the clear dialog's info getListView().setOnItemLongClickListener(this);
mClearDialogBookmarkTitle = state.getString(CLEAR_DIALOG_BOOKMARK_TITLE);
mClearDialogShortcut = (char) state.getInt(CLEAR_DIALOG_SHORTCUT, 0); if (state != null) {
// Restore the clear dialog's info
mClearDialogBookmarkTitle = state.getString(CLEAR_DIALOG_BOOKMARK_TITLE);
mClearDialogShortcut = (char) state.getInt(CLEAR_DIALOG_SHORTCUT, 0);
}
} }
@Override @Override