PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update settings UI to support multiple device admins.

Browse Source
This commit is contained in:
Dianne Hackborn
2010-01-27 16:22:05 -08:00
parent 9e0135fd45
commit 61daf83ca8
6 changed files with 226 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/device_admin_add.xml
View File

@@ -35,10 +35,9 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@*android:drawable/title_bar_medium">
<TextView
<TextView android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/add_device_admin_msg"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
@@ -49,14 +48,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/active_icon"
<ImageView android:id="@+id/admin_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"/>
<TextView android:id="@+id/active_name"
<TextView android:id="@+id/admin_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -67,7 +66,7 @@
android:singleLine="true"
android:ellipsize="marquee" />
</LinearLayout>
<TextView android:id="@+id/active_warning"
<TextView android:id="@+id/admin_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dip" />
@@ -77,7 +76,7 @@
android:orientation="vertical"
android:paddingLeft="16dip"
android:paddingRight="12dip" />
<TextView android:id="@+id/active_description"
<TextView android:id="@+id/admin_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -97,11 +96,10 @@
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_weight="1" />
<Button android:id="@+id/add_button"
<Button android:id="@+id/action_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/add_device_admin" />
android:layout_weight="1" />
<View
android:layout_width="0dip"
android:layout_height="0dip"

56
res/layout/device_admin_item.xml
View File

@@ -21,27 +21,49 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:orientation="vertical"
android:paddingRight="6dip"
android:paddingLeft="6dip"
android:gravity="fill" >
<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"/>
<TextView android:id="@+id/name"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:orientation="horizontal">
<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"/>
<TextView android:id="@+id/name"
android:layout_width="0dp"
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:ellipsize="marquee"
android:layout_marginBottom="2dip" />
<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:layout_gravity="center_vertical"
android:focusable="false"
android:clickable="false" />
</LinearLayout>
<TextView android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="2dip" />
android:ellipsize="end" />
</LinearLayout>

124
res/layout/device_admin_settings.xml
View File

@@ -14,105 +14,41 @@
limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/active_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@*android:drawable/title_bar_medium">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/active_device_admin_msg"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:shadowColor="?android:attr/colorBackground"
android:shadowRadius="2" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/active_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"/>
<TextView android:id="@+id/active_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="2dip"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="marquee" />
</LinearLayout>
<TextView android:id="@+id/active_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="10dip" />
<LinearLayout style="@android:style/ButtonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<View
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_weight="1" />
<Button android:id="@+id/remove_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/remove_device_admin" />
<View
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/select_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@*android:drawable/title_bar_medium">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/select_device_admin_msg"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:shadowColor="?android:attr/colorBackground"
android:shadowRadius="2" />
</LinearLayout>
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@*android:drawable/title_bar_medium">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/select_device_admin_msg"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:shadowColor="?android:attr/colorBackground"
android:shadowRadius="2" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:paddingTop="10dip"
android:paddingBottom="10dip">
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="10dip"
android:paddingBottom="10dip"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true" />
</LinearLayout>
</FrameLayout>
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_device_admins"
android:textAppearance="?android:attr/textAppearanceLarge" />
</FrameLayout>
</LinearLayout>