summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-01 11:26:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-01 11:26:25 -0700
commit2064149e42d8d35132c7d22ef3c3e0a896e1eee0 (patch)
tree8100577292ae8cbec88b6f1c93f0b2d5bbbfd19b /res/layout
parentf75c6e20adbf9fb2fa904149992476dc776e2800 (diff)
parentc837756d732eb1cc2c26c2d111668ac22a5ff4c6 (diff)
downloadpackages_apps_Settings-2064149e42d8d35132c7d22ef3c3e0a896e1eee0.tar.gz
packages_apps_Settings-2064149e42d8d35132c7d22ef3c3e0a896e1eee0.tar.bz2
packages_apps_Settings-2064149e42d8d35132c7d22ef3c3e0a896e1eee0.zip
am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.
* commit 'c837756d732eb1cc2c26c2d111668ac22a5ff4c6': Implement new manage apps UI for compat mode.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/installed_app_details.xml40
-rwxr-xr-xres/layout/two_buttons_panel.xml2
2 files changed, 39 insertions, 3 deletions
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 0b68d4768..6392ee904 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -52,6 +52,7 @@
<TextView
style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_marginTop="8dip"
android:text="@string/storage_label" />
<LinearLayout
@@ -223,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"
@@ -265,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>
@@ -273,6 +275,7 @@
<!-- Prefered activities section -->
<TextView
style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_marginTop="8dip"
android:text="@string/auto_launch_label" />
<RelativeLayout
@@ -291,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"
@@ -304,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"
diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index d76855c0c..05ad35d51 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -39,7 +39,7 @@
android:id="@+id/buttons_spacer_left"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:visibility="gone"
+ android:visibility="invisible"
android:layout_weight="0.2" />
<Button
android:id="@+id/right_button"