commit 5dbaefadd7c8939877290ee30b4de662230ce889
author Keisuke Kuroyanagi <ksk@google.com> Fri Apr 24 11:40:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 11:40:58 2015 +0000
tree 0aa09062ded2c8496b479ba594e9050464f3fcd0
parent dad03bf1852b46b78d4f780bae61cbbfe2ebbb81
parent 0591651a62e605ee326720900f754226fe66085c

Merge "Quit showing "SELECT ALL" for inappropriate fields."

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index dc7a296..652fff2 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3088,10 +3088,12 @@
                                 MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
             }
 
-            menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).
-                    setAlphabeticShortcut('a').
-                    setShowAsAction(
-                            MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+            if (canSelectText() && !hasPasswordTransformationMethod()) {
+                menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).
+                        setAlphabeticShortcut('a').
+                        setShowAsAction(
+                                MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+            }
 
             updateReplaceItem(menu);
         }