summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-11-17 13:49:22 -0800
committerAdam Powell <adamp@google.com>2010-11-17 14:07:26 -0800
commit32555f347974711aac1f0c9acc0f06e8676d9362 (patch)
tree684d3d8f2df66eab7764bf4f72c2e9372f9532b8 /core/java/com
parentd348bb4feff72d047a1037537be2d334a00c380c (diff)
downloadframeworks_base-32555f347974711aac1f0c9acc0f06e8676d9362.zip
frameworks_base-32555f347974711aac1f0c9acc0f06e8676d9362.tar.gz
frameworks_base-32555f347974711aac1f0c9acc0f06e8676d9362.tar.bz2
Add resource ID variants of ActionBar tab setters
Bugs 3204153 and 2901235 Change-Id: Ib430f96da77f8e7647b22d190243a2fcd766d842
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ActionBarImpl.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 86523ac..20402a3 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -31,6 +31,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.view.ActionMode;
+import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -563,6 +564,11 @@ public class ActionBarImpl extends ActionBar {
}
@Override
+ public Tab setCustomView(int layoutResId) {
+ return setCustomView(LayoutInflater.from(mContext).inflate(layoutResId, null));
+ }
+
+ @Override
public Drawable getIcon() {
return mIcon;
}
@@ -588,12 +594,22 @@ public class ActionBarImpl extends ActionBar {
}
@Override
+ public Tab setIcon(int resId) {
+ return setIcon(mContext.getResources().getDrawable(resId));
+ }
+
+ @Override
public Tab setText(CharSequence text) {
mText = text;
return this;
}
@Override
+ public Tab setText(int resId) {
+ return setText(mContext.getResources().getText(resId));
+ }
+
+ @Override
public void select() {
selectTab(this);
}