diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-23 20:03:20 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-24 14:07:02 -0700 |
commit | e3ff4d8e92a19473c622c1d46b30c63bf2d001d0 (patch) | |
tree | cf6f25b22ca44d8247a8690f6c2fec3e7094a365 /src/com | |
parent | 958d1ee6d584b7489d57071305c44635a0534ba9 (diff) | |
download | packages_apps_Settings-e3ff4d8e92a19473c622c1d46b30c63bf2d001d0.zip packages_apps_Settings-e3ff4d8e92a19473c622c1d46b30c63bf2d001d0.tar.gz packages_apps_Settings-e3ff4d8e92a19473c622c1d46b30c63bf2d001d0.tar.bz2 |
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
- make it work again (what a code...)
Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/settings/Settings.java | 1 | ||||
-rw-r--r-- | src/com/android/settings/SettingsActivity.java | 4 | ||||
-rw-r--r-- | src/com/android/settings/quicklaunch/QuickLaunchSettings.java | 14 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 01149f3..f8f1ffb 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -93,6 +93,7 @@ public class Settings extends SettingsActivity { public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } + public static class QuickLaunchSettingsActivity extends SettingsActivity { /* empty */ } public static class TopLevelSettings extends SettingsActivity { /* empty */ } } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 90e8fd4..76a7300 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -84,6 +84,7 @@ import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.OtherSoundSettings; +import com.android.settings.quicklaunch.QuickLaunchSettings; import com.android.settings.search.DynamicIndexableContentMonitor; import com.android.settings.search.Index; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; @@ -283,7 +284,8 @@ public class SettingsActivity extends Activity InstalledAppDetails.class.getName(), BatterySaverSettings.class.getName(), AppNotificationSettings.class.getName(), - OtherSoundSettings.class.getName() + OtherSoundSettings.class.getName(), + QuickLaunchSettings.class.getName() }; diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java index a7ddc07..1367018 100644 --- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java +++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java @@ -103,7 +103,6 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements initShortcutPreferences(); mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI, sProjection, null, null, null); - getListView().setOnItemLongClickListener(this); } @Override @@ -124,16 +123,21 @@ public class QuickLaunchSettings extends SettingsPreferenceFragment implements @Override public void onStop() { + super.onStop(); mBookmarksCursor.close(); } @Override public void onActivityCreated(Bundle state) { super.onActivityCreated(state); - - // Restore the clear dialog's info - mClearDialogBookmarkTitle = state.getString(CLEAR_DIALOG_BOOKMARK_TITLE); - mClearDialogShortcut = (char) state.getInt(CLEAR_DIALOG_SHORTCUT, 0); + + getListView().setOnItemLongClickListener(this); + + 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 |