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

Merge "Use a queried package name for the IME settings activity."

Browse Source
This commit is contained in:
Amith Yamasani
2010-03-09 15:13:42 -08:00
committed by Android (Google) Code Review
parent 41297ef73a e086d9ad61
commit 8542d8972c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/LanguageSettings.java
View File

@@ -120,7 +120,11 @@ public class LanguageSettings extends PreferenceActivity {
// If setting activity is available, add a setting screen entry. // If setting activity is available, add a setting screen entry.
if (null != property.getSettingsActivity()) { if (null != property.getSettingsActivity()) {
PreferenceScreen prefScreen = new PreferenceScreen(this, null); PreferenceScreen prefScreen = new PreferenceScreen(this, null);
prefScreen.setKey(property.getSettingsActivity()); String settingsActivity = property.getSettingsActivity();
if (settingsActivity.lastIndexOf("/") < 0) {
settingsActivity = property.getPackageName() + "/" + settingsActivity;
}
prefScreen.setKey(settingsActivity);
prefScreen.setTitle(label); prefScreen.setTitle(label);
if (N == 1) { if (N == 1) {
prefScreen.setSummary(getString(R.string.onscreen_keyboard_settings_summary)); prefScreen.setSummary(getString(R.string.onscreen_keyboard_settings_summary));
@@ -274,6 +278,11 @@ public class LanguageSettings extends PreferenceActivity {
String activityName = pref.getKey(); String activityName = pref.getKey();
String packageName = activityName.substring(0, activityName String packageName = activityName.substring(0, activityName
.lastIndexOf(".")); .lastIndexOf("."));
int slash = activityName.indexOf("/");
if (slash > 0) {
packageName = activityName.substring(0, slash);
activityName = activityName.substring(slash + 1);
}
if (activityName.length() > 0) { if (activityName.length() > 0) {
Intent i = new Intent(Intent.ACTION_MAIN); Intent i = new Intent(Intent.ACTION_MAIN);
i.setClassName(packageName, activityName); i.setClassName(packageName, activityName);