Update design for grid/filmstrip switcher

Bug: 7317501
Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e

2 files changed, 47 insertions, 2 deletions

diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
new file mode 100644
index 000000000..37cb375d1
--- /dev/null
+++ b/res/layout/action_bar_two_line_text.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="18dp"
+    android:paddingRight="18dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:mode="twoLine"
+    android:gravity="center_vertical"
+>
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:gravity="top"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:minHeight="?attr/listPreferredItemHeightSmall"
+    />
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        android:minHeight="?attr/listPreferredItemHeightSmall"
+    />
+</TwoLineListItem>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61b45a28b..67ba40d7e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -459,10 +459,10 @@
     <string name="no_external_storage">No external storage available</string>
 
     <!-- Label for album filmstrip button -->
-    <string name="switch_photo_filmstrip">Filmstrip</string>
+    <string name="switch_photo_filmstrip">Filmstrip view</string>
 
     <!-- Label for album grid button -->
-    <string name="switch_photo_grid">Grid</string>
+    <string name="switch_photo_grid">Grid view</string>
 
     <!-- The tilte of a dialog showing trimming in progress. [CHAR LIMIT=20] -->
     <string name="trimming">Trimming</string>