diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-09 17:12:44 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 17:12:44 -0700 |
commit | fba6d87b4a947353af610265e317b83053a7f1f1 (patch) | |
tree | e96df8fdca850d70e16b1361ae05dc94e4398a94 | |
parent | 52cb523e386cda894ef3076dd0ff4c36c7ced11f (diff) | |
parent | bcdf1be3081cc4ff5f438033e3300bb1f9494dd8 (diff) | |
download | android_packages_apps_Snap-fba6d87b4a947353af610265e317b83053a7f1f1.tar.gz android_packages_apps_Snap-fba6d87b4a947353af610265e317b83053a7f1f1.tar.bz2 android_packages_apps_Snap-fba6d87b4a947353af610265e317b83053a7f1f1.zip |
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
* commit '501bd1bff5189542612929b2428b7a69abc575a6':
Update design for grid/filmstrip switcher
-rw-r--r-- | src/com/android/gallery3d/app/GalleryActionBar.java | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java index 4b9ef53ce..1729c6433 100644 --- a/src/com/android/gallery3d/app/GalleryActionBar.java +++ b/src/com/android/gallery3d/app/GalleryActionBar.java @@ -26,7 +26,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; -import android.text.TextUtils.TruncateAt; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -35,6 +34,7 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ShareActionProvider; import android.widget.TextView; +import android.widget.TwoLineListItem; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; @@ -151,26 +151,27 @@ public class GalleryActionBar implements OnNavigationListener { return position; } - private View getView(CharSequence label, View convertView, - ViewGroup parent, boolean ellipsize) { + @Override + public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { - convertView = mInflater.inflate(R.layout.action_bar_text, + convertView = mInflater.inflate(R.layout.action_bar_two_line_text, parent, false); } - TextView view = (TextView) convertView; - view.setEllipsize(ellipsize ? TruncateAt.END : null); - view.setText(label); + TwoLineListItem view = (TwoLineListItem) convertView; + view.getText1().setText(mActionBar.getTitle()); + view.getText2().setText((CharSequence) getItem(position)); return convertView; } @Override - public View getView(int position, View convertView, ViewGroup parent) { - return getView(mActionBar.getTitle(), convertView, parent, true); - } - - @Override public View getDropDownView(int position, View convertView, ViewGroup parent) { - return getView((CharSequence) getItem(position), convertView, parent, false); + if (convertView == null) { + convertView = mInflater.inflate(R.layout.action_bar_text, + parent, false); + } + TextView view = (TextView) convertView; + view.setText((CharSequence) getItem(position)); + return convertView; } } |