am c6e44c1d: am b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad

[android-x86/packages-apps-Gallery2.git] / res / layout / action_bar_two_line_text.xml

diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
index aeb9907..92a4af9 100644 (file)
--- a/res/layout/action_bar_two_line_text.xml
+++ b/res/layout/action_bar_two_line_text.xml
@@ -14,32 +14,29 @@
      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="wrap_content"
-    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="wrap_content"
-        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="wrap_content"
-        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
+        style="@style/ActionBarTwoLineItem"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:duplicateParentState="false"
+        android:layout_alignParentLeft="true"
+        android:layout_width="wrap_content" >
+        <TextView
+            android:id="@android:id/text1"
+            style="@style/ActionBarTwoLinePrimary"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@android:id/text2"
+            style="@style/ActionBarTwoLineSecondary"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:layout_marginRight="4dp"
+            android:layout_below="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+</TwoLineListItem>