Add the new add_word interface.
This is step 2. The interface is not functional yet.
Bug: 5306641
Change-Id: Idc8d07b883a17067f777c86d83994fb040b37c59
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d489ebb..d3fcf45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -465,7 +465,9 @@
<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
android:label="@string/user_dict_settings_titlebar"
- android:theme="@android:style/Theme.Holo.Dialog.NoActionBar">
+ android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
+ android:windowSoftInputMode="stateVisible"
+ android:excludeFromRecents="true">
<intent-filter>
<action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
new file mode 100644
index 0000000..23958dd
--- /dev/null
+++ b/res/layout/user_dictionary_add_word.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <com.android.internal.widget.DialogTitle
+ style="?android:attr/windowTitleStyle"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="match_parent"
+ android:layout_height="64dip"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:gravity="center_vertical|left"
+ android:text="@string/user_dict_settings_add_dialog_title" />
+ <View android:layout_width="match_parent"
+ android:layout_height="2dip"
+ android:background="@android:color/holo_blue_light" />
+ </LinearLayout>
+
+
+ <EditText android:id="@+id/user_dictionary_add_word_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical|left"
+ android:inputType="textNoSuggestions"
+ android:paddingBottom="10dip"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
+ android:visibility="visible">
+ <requestFocus/>
+ </EditText>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="beginning"
+ android:dividerPadding="0dip">
+ <LinearLayout style="?android:attr/buttonBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:measureWithLargestChild="true">
+ <Button android:layout_width="0dip"
+ android:layout_gravity="left"
+ android:layout_weight="1"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:textSize="14sp"
+ android:text="@string/cancel"
+ android:layout_height="wrap_content" />
+ <Button android:layout_width="0dip"
+ android:layout_gravity="center_horizontal"
+ android:layout_weight="1"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:textSize="14sp"
+ android:text="@string/user_dict_settings_add_dialog_options"
+ android:layout_height="wrap_content" />
+ <Button android:layout_width="0dip"
+ android:layout_gravity="right"
+ android:layout_weight="1"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:textSize="14sp"
+ android:text="@string/user_dict_settings_add_dialog_confirm"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9218b5f..211633b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2602,6 +2602,10 @@
<string name="user_dict_settings_add_menu_title">Add</string>
<!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. -->
<string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
+ <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. -->
+ <string name="user_dict_settings_add_dialog_options">Options…</string>
+ <!-- User dictionary settings. Text on the dialog button to confirm adding a word. -->
+ <string name="user_dict_settings_add_dialog_confirm">OK</string>
<!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
<string name="user_dict_settings_edit_dialog_title">Edit word</string>
<!-- User dictionary settings. The title of the context menu item to edit the current word -->
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 35278a7..c570983 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -19,12 +19,23 @@
import com.android.settings.R;
import android.app.Activity;
+import android.content.Intent;
import android.os.Bundle;
+import android.widget.EditText;
public class UserDictionaryAddWordActivity extends Activity {
+ private static final String EXTRA_WORD = "word";
+
+ private EditText mEditText;
+
@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.dialog_edittext);
+ setContentView(R.layout.user_dictionary_add_word);
+ final Intent intent = getIntent();
+ final String word = intent.getStringExtra(EXTRA_WORD);
+ mEditText = (EditText)findViewById(R.id.user_dictionary_add_word_text);
+ mEditText.setText(word);
+ mEditText.setSelection(word.length());
}
}