am a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev

* commit 'a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c':
  Add a missing fragment to list of valid ones for top-level settings
This commit is contained in:
Amith Yamasani
2013-09-03 09:00:33 -07:00
committed by Android Git Automerger

View File

@@ -71,6 +71,7 @@ import com.android.settings.deviceinfo.Memory;
import com.android.settings.deviceinfo.UsbSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
import com.android.settings.inputmethod.SpellCheckersSettings;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.location.LocationSettings;
@@ -336,7 +337,8 @@ public class Settings extends PreferenceActivity
ManageAccountsSettings.class.getName(),
PrintingSettings.class.getName(),
TrustedCredentialsSettings.class.getName(),
PaymentSettings.class.getName()
PaymentSettings.class.getName(),
KeyboardLayoutPickerFragment.class.getName()
};
@Override