From 2c4b99fbe610c7ab0dcb67c92feddd9d2945e3fd Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 7 Oct 2013 11:39:07 -0700 Subject: [PATCH] Ellipsize titles in middle, otherwise end. Long document titles can include distinguishing details at the end of the title, so ellipsize in the middle. All other details ellipsize at the end. Bug: 11081420 Change-Id: I2c266ebc594d2ad383033b435acb8adb5fb823bc --- .../DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml | 8 ++++---- packages/DocumentsUI/res/layout/item_doc_grid.xml | 6 +++--- packages/DocumentsUI/res/layout/item_doc_list.xml | 8 ++++---- packages/DocumentsUI/res/layout/item_root.xml | 4 ++-- packages/DocumentsUI/res/layout/item_title.xml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml index 851061fe9b51f..adbb9da4323fb 100644 --- a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml +++ b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml @@ -64,7 +64,7 @@ android:layout_weight="0.5" android:layout_marginEnd="12dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="middle" android:textAlignment="viewStart" style="@style/TextAppearance.Medium" /> @@ -83,7 +83,7 @@ android:layout_weight="0.25" android:layout_marginEnd="12dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> @@ -95,7 +95,7 @@ android:layout_marginEnd="12dp" android:minWidth="70dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewEnd" style="@style/TextAppearance.Small" /> @@ -107,7 +107,7 @@ android:layout_marginEnd="12dp" android:minWidth="70dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewEnd" style="@style/TextAppearance.Small" /> diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml index bb5dce1306d73..3aef1cd3bca54 100644 --- a/packages/DocumentsUI/res/layout/item_doc_grid.xml +++ b/packages/DocumentsUI/res/layout/item_doc_grid.xml @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="middle" android:textAlignment="viewStart" style="@style/TextAppearance.Medium" /> @@ -97,7 +97,7 @@ android:layout_height="wrap_content" android:layout_weight="0.5" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> @@ -108,7 +108,7 @@ android:layout_weight="0.5" android:layout_marginStart="8dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> diff --git a/packages/DocumentsUI/res/layout/item_doc_list.xml b/packages/DocumentsUI/res/layout/item_doc_list.xml index 4c5b2e304f6ee..cab7c0d02d8cd 100644 --- a/packages/DocumentsUI/res/layout/item_doc_list.xml +++ b/packages/DocumentsUI/res/layout/item_doc_list.xml @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="middle" android:textAlignment="viewStart" style="@style/TextAppearance.Medium" /> @@ -97,7 +97,7 @@ android:layout_weight="0.25" android:minWidth="70dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> @@ -109,7 +109,7 @@ android:layout_marginStart="8dp" android:minWidth="70dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> @@ -120,7 +120,7 @@ android:layout_weight="0.5" android:layout_marginStart="8dp" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> diff --git a/packages/DocumentsUI/res/layout/item_root.xml b/packages/DocumentsUI/res/layout/item_root.xml index 9b52d85ca45e9..f17c261f73395 100644 --- a/packages/DocumentsUI/res/layout/item_root.xml +++ b/packages/DocumentsUI/res/layout/item_root.xml @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Medium" /> @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:textAlignment="viewStart" style="@style/TextAppearance.Small" /> diff --git a/packages/DocumentsUI/res/layout/item_title.xml b/packages/DocumentsUI/res/layout/item_title.xml index 58016f1fe962f..6e96fb5349974 100644 --- a/packages/DocumentsUI/res/layout/item_title.xml +++ b/packages/DocumentsUI/res/layout/item_title.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="middle" android:textAlignment="viewStart" style="@style/TextAppearance.Medium" />