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

This commit is contained in:
Fabrice Di Meglio
2014-07-24 21:22:06 +00:00
committed by Android (Google) Code Review
4 changed files with 17 additions and 9 deletions

View File

@@ -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;
@@ -286,7 +287,8 @@ public class SettingsActivity extends Activity
InstalledAppDetails.class.getName(),
BatterySaverSettings.class.getName(),
AppNotificationSettings.class.getName(),
OtherSoundSettings.class.getName()
OtherSoundSettings.class.getName(),
QuickLaunchSettings.class.getName()
};