summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-24 19:04:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-24 19:04:28 +0000
commit1cbbec00ab574729c7bc547d250690b26a81057f (patch)
tree7a865048cc7dffb3709d9385a6d1e69e96b29f80 /res
parent5006bf1de7a8add85f9a24706041757f9c93bb01 (diff)
parentb01459997ed4d0232855e4dbc080bd1238e1256d (diff)
downloadpackages_apps_Settings-1cbbec00ab574729c7bc547d250690b26a81057f.zip
packages_apps_Settings-1cbbec00ab574729c7bc547d250690b26a81057f.tar.gz
packages_apps_Settings-1cbbec00ab574729c7bc547d250690b26a81057f.tar.bz2
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/app_item.xml23
1 files changed, 15 insertions, 8 deletions
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
index 26f2b1e..c5a73af 100644
--- a/res/layout/app_item.xml
+++ b/res/layout/app_item.xml
@@ -14,12 +14,13 @@
limitations under the License.
-->
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
+ android:gravity="top"
android:columnCount="3">
<ImageView
@@ -28,15 +29,14 @@
android:layout_height="@dimen/app_icon_size"
android:layout_gravity="center"
android:scaleType="fitXY"
- android:layout_rowSpan="3"
android:layout_marginEnd="16dip"
android:contentDescription="@null" />
<TextView
android:id="@android:id/title"
- android:layout_width="0dip"
- android:layout_gravity="fill_horizontal"
- android:layout_marginTop="2dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@android:id/icon"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
@@ -45,8 +45,12 @@
<TextView
android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@android:id/title"
+ android:layout_alignParentEnd="true"
android:layout_marginStart="6dip"
- android:layout_marginTop="2dip"
+ android:gravity="end"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
@@ -54,8 +58,11 @@
<FrameLayout
android:id="@android:id/widget_frame"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_columnSpan="2"
+ android:layout_toEndOf="@android:id/icon"
+ android:layout_below="@android:id/title"
+ android:layout_alignParentEnd="true"
android:layout_gravity="fill_horizontal|top" />
-</GridLayout>
+</RelativeLayout>