From d9ed84375d41c53b139358328b9a4bda747eac74 Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Wed, 29 Oct 2014 15:29:17 +0000
Subject: [PATCH] Update text for apps installed for other users

This also refactors the layout to accommodate longer text

Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
---
 res/layout/manage_applications_item.xml | 13 +++++++++----
 res/values/strings.xml                  |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index e749859e2d4..5471aa923de 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -45,7 +45,7 @@
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textAlignment="viewStart" />
+        android:textAlignment="viewStart"/>
 
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_marginStart="8dip"
@@ -57,7 +57,8 @@
 
     <TextView
         android:id="@+id/app_size"
-        android:layout_width="0dip"
+        android:layout_column="1"
+        android:layout_row="1"
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
         android:textColor="?android:attr/textColorSecondary"
@@ -65,9 +66,13 @@
 
     <TextView
         android:id="@+id/app_disabled"
+        android:layout_width="0dip"
         android:layout_marginStart="8dip"
-        android:layout_gravity="top"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="?android:attr/textColorSecondary"
+        android:textAlignment="viewEnd"
+        android:singleLine="true"
+        android:ellipsize="marquee" />
 
 </GridLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f8721c395f2..592fc59fe7b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2936,8 +2936,8 @@
     <string name="filter_apps_onsdcard" product="default">On SD card</string>
     <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
     <string name="disabled">Disabled</string>
-    <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is not installed. -->
-    <string name="not_installed">Not installed</string>
+    <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. -->
+    <string name="not_installed">Not installed for this user</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
     <string name="no_applications">No apps.</string>
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->