diff options
author | Amith Yamasani <yamasani@google.com> | 2011-01-24 16:02:11 -0800 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2011-01-24 16:24:55 -0800 |
commit | a1d01841664131eca201acfaf747f1f187de10f6 (patch) | |
tree | 981992084d4395ab9e3cc3c2bce3d98df55b78ec /res/layout/device_admin_item.xml | |
parent | 22c060ebd14bd92c67bd97f53d67bb06f0a215de (diff) | |
download | packages_apps_settings-a1d01841664131eca201acfaf747f1f187de10f6.zip packages_apps_settings-a1d01841664131eca201acfaf747f1f187de10f6.tar.gz packages_apps_settings-a1d01841664131eca201acfaf747f1f187de10f6.tar.bz2 |
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
Bug: 3376986
Convert the DeviceAdminSettings screen to a fragment, remove fat titlebar.
Convert the DeviceAdminAdd screen to layout nicely in the new holo DialogWhenLarge
style.
Change-Id: I20a9d16aed135a2178969dfff807075b0b79237c
Diffstat (limited to 'res/layout/device_admin_item.xml')
-rw-r--r-- | res/layout/device_admin_item.xml | 73 |
1 files changed, 43 insertions, 30 deletions
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml index 49cbc61..fe9e45a 100644 --- a/res/layout/device_admin_item.xml +++ b/res/layout/device_admin_item.xml @@ -21,49 +21,62 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="vertical" + android:orientation="horizontal" android:paddingRight="6dip" android:paddingLeft="6dip" - android:gravity="fill" > + android:gravity="center_vertical" > <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="64dip" + android:gravity="center" + android:padding="8dip" android:orientation="horizontal"> - - <ImageView android:id="@+id/icon" + <ImageView + android:id="@+id/icon" android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" - android:layout_marginLeft="5dip" - android:layout_marginRight="11dip" android:layout_gravity="center_vertical" - android:scaleType="fitCenter"/> - + /> + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:layout_marginBottom="8dip" + android:layout_weight="1"> + <TextView android:id="@+id/name" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" android:ellipsize="marquee" - android:layout_marginBottom="2dip" /> - - <CheckBox xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/checkbox" + android:layout_alignParentTop="true" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:focusable="false" - android:clickable="false" /> - </LinearLayout> - - <TextView android:id="@+id/description" - android:layout_width="match_parent" + android:layout_marginTop="4dip" + android:layout_below="@id/name" + android:layout_alignLeft="@id/name" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="4" /> + + </RelativeLayout> + + <CheckBox xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/checkbox" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - android:ellipsize="end" /> - + android:layout_gravity="center_vertical" + android:layout_marginRight="16dip" + android:layout_marginLeft="16dip" + android:focusable="false" + android:clickable="false" /> + </LinearLayout> |