merge from open-source master

[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 8da1d76..3243672 100644 (file)
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -29,50 +29,27 @@
         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">
-
-            <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>
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingRight="6dip"
+            android:paddingLeft="6dip"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip" >
 
-            <!-- 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>
+        <!-- Application snippet label, version and icon -->
+        <include
+            layout="@layout/manage_applications_item"
+            android:id="@+id/app_snippet"/>
 
+        <!-- Force stop and uninstall buttons -->
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/control_buttons_panel"/>
+        </LinearLayout>
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
@@ -193,37 +170,11 @@
                     android:maxLines="1" />
 
             </LinearLayout>
-            <!-- Manage space, Clear data/Uninstall buttons  -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-                <Button
-                    android:id="@+id/manage_space_button"
-                    android:text="@string/manage_space_text"
-                    android:visibility="invisible"
-                    android:layout_width="150dip"
-                    android:paddingLeft="6dip"
-                    android:layout_gravity="left"
-                    android:layout_weight="0.4"
-                    android:layout_height="wrap_content"/>
-                <!-- Spacer -->
-                <View
-                    android:id="@+id/buttons_spacer_left"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:visibility="gone" />
- 
-                <Button
-                    android:id="@+id/uninstall_button"
-                    android:layout_width="150dip"
-                    android:paddingRight="6dip"
-                    android:layout_gravity="right"
-                    android:layout_weight="0.4"
-                    android:layout_height="wrap_content"/>
-            </LinearLayout>
+            <!-- Clear data and install location buttons  -->
+            <include
+                layout="@layout/two_buttons_panel"
+                android:id="@+id/data_buttons_panel"/>
+
         </LinearLayout>
 
         <!-- Clear cache section -->
@@ -307,25 +258,6 @@
                 android:layout_height="wrap_content" />
         </RelativeLayout>
 
-        <!-- Other controls section -->
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/controls_label" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <Button android:id="@+id/force_stop_button"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:paddingTop="6dip"
-                android:layout_width="150dip"
-                android:text="@string/force_stop"
-                android:layout_height="wrap_content" />
-        </RelativeLayout>
-
         <!-- Permissions section -->
         <LinearLayout
             android:id="@+id/permissions_section"