Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
  latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/data/ComboAlbum.java b/src/com/android/gallery3d/data/ComboAlbum.java
index e100dc3e6..cadd9f8af 100644
--- a/src/com/android/gallery3d/data/ComboAlbum.java
+++ b/src/com/android/gallery3d/data/ComboAlbum.java
@@ -27,7 +27,7 @@ public class ComboAlbum extends MediaSet implements ContentListener {
     @SuppressWarnings("unused")
     private static final String TAG = "ComboAlbum";
     private final MediaSet[] mSets;
-    private final String mName;
+    private String mName;
 
     public ComboAlbum(Path path, MediaSet[] mediaSets, String name) {
         super(path, nextVersionNumber());
@@ -76,6 +76,10 @@ public class ComboAlbum extends MediaSet implements ContentListener {
         return mName;
     }
 
+    public void useNameOfChild(int i) {
+        if (i < mSets.length) mName = mSets[i].getName();
+    }
+
     @Override
     public long reload() {
         boolean changed = false;