Implement new manage apps UI for compat mode.

[android-x86/packages-apps-Settings.git] / res / layout / installed_app_details.xml

diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 423e3c1..6392ee9 100644 (file)
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -25,60 +25,34 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingRight="6dip"
-        android:paddingTop="5dip"
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
-        <!-- App snippet -->
-        <RelativeLayout
+        <!-- App snippet with buttons -->
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingRight="6dip"
+            android:paddingLeft="6dip"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip" >
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_alignParentLeft="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip" >
-                <!-- application name -->
-                <TextView android:id="@+id/app_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textStyle="bold"
-                    android:singleLine="true"
-                    android:ellipsize="marquee"
-                    android:layout_marginBottom="2dip" />
-                <!-- application version -->
-                <TextView android:id="@+id/app_version"
-                    android:layout_marginTop="-4dip"
-                    android:layout_gravity="center_vertical"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
+        <!-- Application snippet label, version and icon -->
+        <include
+            layout="@layout/manage_applications_item"
+            android:id="@+id/app_snippet"/>
 
-            <!-- application icon -->
-            <ImageView android:id="@+id/app_icon"
-                android:layout_width="@android:dimen/app_icon_size"
-                android:layout_height="@android:dimen/app_icon_size"
-                android:layout_alignParentRight="true"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingRight="6dip"
-                android:scaleType="fitCenter" />
-        </RelativeLayout>
         <!-- Force stop and uninstall buttons -->
         <include
             layout="@layout/two_buttons_panel"
             android:id="@+id/control_buttons_panel"/>
+        </LinearLayout>
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
             android:text="@string/storage_label" />
 
         <LinearLayout
@@ -159,6 +133,7 @@
                     android:maxLines="1" />
 
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/info_size"
                 android:layout_width="match_parent"
@@ -196,6 +171,44 @@
                     android:maxLines="1" />
 
             </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/external_size_prefix"
+                    android:text="@string/external_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip"
+                    android:paddingLeft="6dip"/>
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginRight="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center" />
+                <TextView
+                    android:id="@+id/external_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:paddingRight="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+
+            </LinearLayout>
+
             <!-- Clear data and install location buttons  -->
             <include
                 layout="@layout/two_buttons_panel"
@@ -211,6 +224,7 @@
             <TextView
                 android:id="@+id/cache_header"
                 style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
                 android:text="@string/cache_header_label" />
             <LinearLayout
                 android:id="@+id/cache_size"
@@ -253,7 +267,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/cache_size"
                 android:layout_centerHorizontal="true"
-                android:layout_width="150dip"
+                android:layout_width="200dip"
                 android:text="@string/clear_cache_btn_text"
                 android:layout_height="wrap_content" />
         </RelativeLayout>
@@ -261,6 +275,7 @@
         <!-- Prefered activities section -->
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
             android:text="@string/auto_launch_label" />
 
         <RelativeLayout 
@@ -279,11 +294,43 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/auto_launch"
                 android:layout_centerHorizontal="true"
-                android:layout_width="150dip"
+                android:layout_width="200dip"
                 android:text="@string/clear_activities"
                 android:layout_height="wrap_content" />
         </RelativeLayout>
 
+        <!-- Screen compatibility section -->
+        <LinearLayout android:id="@+id/screen_compatibility_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/screen_compatibility_label" />
+
+            <TextView android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_alignParentLeft="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="6dip"
+                android:paddingRight="6dip"
+                android:paddingLeft="6dip"
+                android:text="@string/screen_compatibility_text"/>
+            <CheckBox android:id="@+id/ask_compatibility_cb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dip"
+                android:layout_gravity="left"
+                android:text="@string/ask_compatibility" />
+            <CheckBox android:id="@+id/enable_compatibility_cb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dip"
+                android:layout_gravity="left"
+                android:text="@string/enable_compatibility" />
+        </LinearLayout>
+
         <!-- Permissions section -->
         <LinearLayout
             android:id="@+id/permissions_section"
@@ -292,6 +339,7 @@
             android:orientation="vertical">
             <TextView
                 style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
                 android:text="@string/permissions_label" />
             <TextView
                 android:text="@string/security_settings_desc"