From c9ae2a24dc1fa274ca0916c91a2e9a2764ba4bb3 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 28 Jul 2010 14:44:21 -0700
Subject: [PATCH] Add support for setting action mode titles/subtitles by
 resource ID

Change-Id: Ia0d5234cc16f325eeb29127fb87e2616d67379ec
---
 api/current.xml                               | 26 +++++++++++++++++++
 core/java/android/view/ActionMode.java        | 24 +++++++++++++++++
 .../android/internal/app/ActionBarImpl.java   | 10 +++++++
 .../internal/view/StandaloneActionMode.java   | 10 +++++++
 4 files changed, 70 insertions(+)

diff --git a/api/current.xml b/api/current.xml
index 7df46679d56a3..e59ea2d6f77c4 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -177071,6 +177071,19 @@
 <parameter name="subtitle" type="java.lang.CharSequence">
 </parameter>
 </method>
+<method name="setSubtitle"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resId" type="int">
+</parameter>
+</method>
 <method name="setTitle"
  return="void"
  abstract="true"
@@ -177084,6 +177097,19 @@
 <parameter name="title" type="java.lang.CharSequence">
 </parameter>
 </method>
+<method name="setTitle"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="resId" type="int">
+</parameter>
+</method>
 </class>
 <interface name="ActionMode.Callback"
  abstract="true"
diff --git a/core/java/android/view/ActionMode.java b/core/java/android/view/ActionMode.java
index d4f4b933e0ba3..4a7d7ad43a9a8 100644
--- a/core/java/android/view/ActionMode.java
+++ b/core/java/android/view/ActionMode.java
@@ -29,20 +29,44 @@ public abstract class ActionMode {
      *
      * @param title Title string to set
      *
+     * @see #setTitle(int)
      * @see #setCustomView(View)
      */
     public abstract void setTitle(CharSequence title);
 
+    /**
+     * Set the title of the action mode. This method will have no visible effect if
+     * a custom view has been set.
+     *
+     * @param resId Resource ID of a string to set as the title
+     *
+     * @see #setTitle(CharSequence)
+     * @see #setCustomView(View)
+     */
+    public abstract void setTitle(int resId);
+
     /**
      * Set the subtitle of the action mode. This method will have no visible effect if
      * a custom view has been set.
      *
      * @param subtitle Subtitle string to set
      *
+     * @see #setSubtitle(int)
      * @see #setCustomView(View)
      */
     public abstract void setSubtitle(CharSequence subtitle);
 
+    /**
+     * Set the subtitle of the action mode. This method will have no visible effect if
+     * a custom view has been set.
+     *
+     * @param resId Resource ID of a string to set as the subtitle
+     *
+     * @see #setSubtitle(CharSequence)
+     * @see #setCustomView(View)
+     */
+    public abstract void setSubtitle(int resId);
+
     /**
      * Set a custom view for this action mode. The custom view will take the place of
      * the title and subtitle. Useful for things like search boxes.
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index e457701c9d527..99dbe4ce6a442 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -421,6 +421,16 @@ public class ActionBarImpl extends ActionBar {
             mUpperContextView.setTitle(title);
         }
 
+        @Override
+        public void setTitle(int resId) {
+            setTitle(mActivity.getString(resId));
+        }
+
+        @Override
+        public void setSubtitle(int resId) {
+            setSubtitle(mActivity.getString(resId));
+        }
+
         @Override
         public CharSequence getTitle() {
             return mUpperContextView.getTitle();
diff --git a/core/java/com/android/internal/view/StandaloneActionMode.java b/core/java/com/android/internal/view/StandaloneActionMode.java
index 13eda1035fd6f..d8fd3642ab2f4 100644
--- a/core/java/com/android/internal/view/StandaloneActionMode.java
+++ b/core/java/com/android/internal/view/StandaloneActionMode.java
@@ -57,6 +57,16 @@ public class StandaloneActionMode extends ActionMode implements MenuBuilder.Call
         mContextView.setSubtitle(subtitle);
     }
 
+    @Override
+    public void setTitle(int resId) {
+        setTitle(mContext.getString(resId));
+    }
+
+    @Override
+    public void setSubtitle(int resId) {
+        setSubtitle(mContext.getString(resId));
+    }
+
     @Override
     public void setCustomView(View view) {
         mContextView.setCustomView(view);