summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-02-24 11:09:07 -0800
committerAdam Powell <adamp@google.com>2012-02-24 16:59:03 -0800
commitb98a81f86ab87f1d718f329f03256111fdabd8d1 (patch)
tree0a21f893651cdcf5ebcb60839c62919b8a9cf3c1 /core/java/android/widget/TextView.java
parent8657477721f3ab2271130c50b7a66b8593496797 (diff)
downloadframeworks_base-b98a81f86ab87f1d718f329f03256111fdabd8d1.zip
frameworks_base-b98a81f86ab87f1d718f329f03256111fdabd8d1.tar.gz
frameworks_base-b98a81f86ab87f1d718f329f03256111fdabd8d1.tar.bz2
Add support for optional titles in action modes
Optional titles will only be displayed in the CAB if they entirely fit instead of ellipsizing. Fixes bug 5821883 Change-Id: I0cfd6d4fd34a4fa9f520499d577706da30606811
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a4087d5..1620929 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10363,9 +10363,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
boolean allowText = getContext().getResources().getBoolean(
com.android.internal.R.bool.config_allowActionMenuItemTextWithIcon);
- mode.setTitle(allowText ?
- mContext.getString(com.android.internal.R.string.textSelectionCABTitle) : null);
+ mode.setTitle(mContext.getString(com.android.internal.R.string.textSelectionCABTitle));
mode.setSubtitle(null);
+ mode.setTitleOptionalHint(true);
int selectAllIconId = 0; // No icon by default
if (!allowText) {