summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-12-02 17:47:09 +0900
committerJean Chalard <jchalard@google.com>2011-12-07 12:05:58 +0900
commit0824d31aeaf185801b6fb3ec063a5149c78d6a49 (patch)
treed634b728b056c575892592fd87f41f009ac7b486
parente17eefab87794b30bf969ba132910e3a3ba981ac (diff)
downloadpackages_apps_Settings-0824d31aeaf185801b6fb3ec063a5149c78d6a49.zip
packages_apps_Settings-0824d31aeaf185801b6fb3ec063a5149c78d6a49.tar.gz
packages_apps_Settings-0824d31aeaf185801b6fb3ec063a5149c78d6a49.tar.bz2
Add the cancel button handler
Step 3 Bug: 5306641 Change-Id: Ida4ccf181942714799576fde0ac55596ce043434
-rw-r--r--proguard.flags4
-rw-r--r--res/layout/user_dictionary_add_word.xml3
-rw-r--r--src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java5
3 files changed, 11 insertions, 1 deletions
diff --git a/proguard.flags b/proguard.flags
index 6d41d17..a07b2ec 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,3 +12,7 @@
-keep class com.android.settings.accounts.*
-keep class com.android.settings.fuelgauge.*
+# Keep click responders
+-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+ *** onClick*(...);
+}
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 23958dd..c6fe7de 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -67,7 +67,8 @@
style="?android:attr/buttonBarButtonStyle"
android:textSize="14sp"
android:text="@string/cancel"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:onClick="onClickCancel" />
<Button android:layout_width="0dip"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index c570983..61c4e3c 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -21,6 +21,7 @@ import com.android.settings.R;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
import android.widget.EditText;
public class UserDictionaryAddWordActivity extends Activity {
@@ -38,4 +39,8 @@ public class UserDictionaryAddWordActivity extends Activity {
mEditText.setText(word);
mEditText.setSelection(word.length());
}
+
+ public void onClickCancel(final View v) {
+ finish();
+ }
}