summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-07-21 15:32:28 +0900
committersatok <satok@google.com>2011-07-22 07:48:29 +0900
commit5e9c5e7bcfbdc3d61f80bc95d16a7d57a362bc39 (patch)
tree6c1a79a63fdef03e8176db095e6b0ad26b19ec4b /src/com
parentc29c6d3f8cec4e326cb1ca7417f383253eb717c9 (diff)
downloadpackages_apps_settings-5e9c5e7bcfbdc3d61f80bc95d16a7d57a362bc39.zip
packages_apps_settings-5e9c5e7bcfbdc3d61f80bc95d16a7d57a362bc39.tar.gz
packages_apps_settings-5e9c5e7bcfbdc3d61f80bc95d16a7d57a362bc39.tar.bz2
Allow applications to set the title of the subtype enabler
Bug: 5058105 Change-Id: Id5e4ccbdf4f830ce5c67232f530d73679d9e038f
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 43d54a2..b5353d6 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -22,6 +22,7 @@ import com.android.settings.SettingsPreferenceFragment;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Bundle;
@@ -56,19 +57,29 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
Configuration config = getResources().getConfiguration();
mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY);
+ final Bundle arguments = getArguments();
// Input method id should be available from an Intent when this preference is launched as a
// single Activity (see InputMethodAndSubtypeEnablerActivity). It should be available
// from a preference argument when the preference is launched as a part of the other
// Activity (like a right pane of 2-pane Settings app)
mInputMethodId = getActivity().getIntent().getStringExtra(
android.provider.Settings.EXTRA_INPUT_METHOD_ID);
- if (mInputMethodId == null && (getArguments() != null)) {
+ if (mInputMethodId == null && (arguments != null)) {
final String inputMethodId =
- getArguments().getString(android.provider.Settings.EXTRA_INPUT_METHOD_ID);
+ arguments.getString(android.provider.Settings.EXTRA_INPUT_METHOD_ID);
if (inputMethodId != null) {
mInputMethodId = inputMethodId;
}
}
+ CharSequence title = getActivity().getIntent().getStringExtra(
+ Intent.EXTRA_TITLE);
+ if (title == null && (arguments != null)) {
+ title = arguments.getString(Intent.EXTRA_TITLE);
+ }
+
+ if (!TextUtils.isEmpty(title)) {
+ getActivity().setTitle(title);
+ }
onCreateIMM();
setPreferenceScreen(createPreferenceHierarchy());