-->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout
android:id="@+id/all_details"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:paddingRight="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:orientation="vertical">
+
+ <!-- App snippet with buttons -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:orientation="vertical"
+ android:paddingRight="6dip"
+ android:paddingLeft="6dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip" >
+
+ <!-- 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"
android:text="@string/storage_label" />
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:orientation="vertical">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
</LinearLayout>
<LinearLayout
android:id="@+id/info_size"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
android:maxLines="1" />
</LinearLayout>
- <!-- Manage space, Clear data/Uninstall buttons -->
- <LinearLayout
- android:layout_width="fill_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 -->
<RelativeLayout
android:id="@+id/cache_panel"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/cache_header"
android:text="@string/cache_header_label" />
<LinearLayout
android:id="@+id/cache_size"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
android:text="@string/auto_launch_label" />
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<TextView android:id="@+id/auto_launch"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_alignParentLeft="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingRight="6dip"
android:layout_centerHorizontal="true"
android:layout_width="150dip"
android:text="@string/clear_activities"
- android:layout_height="wrap_content" />
- </RelativeLayout>
-
- <!-- Other controls section -->
- <TextView
- style="?android:attr/listSeparatorTextViewStyle"
- android:text="@string/controls_label" />
-
- <RelativeLayout
- android:layout_width="fill_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:layout_width="150dip"
- android:text="@string/force_stop"
android:layout_height="wrap_content" />
</RelativeLayout>
<!-- Permissions section -->
<LinearLayout
android:id="@+id/permissions_section"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
style="?android:attr/listSeparatorTextViewStyle"
android:paddingTop="6dip"
android:paddingLeft="6dip"
android:paddingBottom="6dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/security_settings_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"/>
</LinearLayout>
</LinearLayout>