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

Merge "Fix Security Settings padding"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-06-18 01:54:35 +00:00
committed by Android (Google) Code Review
parent caa25020e6 21ddce6969
commit 67b3840200
7 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/advanced_security_settings.xml
View File

@@ -18,21 +18,28 @@
<LinearLayout 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1"> android:layout_weight="1">
<ListView android:id="@android:id/list" <ListView android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:fastScrollEnabled="true" /> android:fastScrollEnabled="true" />
<TextView android:id="@android:id/empty" <TextView android:id="@android:id/empty"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_trust_agents" android:text="@string/no_trust_agents"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

14
res/layout/device_admin_item.xml
View File

@@ -22,24 +22,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="6dip"
android:paddingStart="6dip"
android:gravity="center_vertical" > android:gravity="center_vertical" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:minWidth="64dip"
android:gravity="center" android:gravity="center"
android:padding="8dip"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="@android:dimen/app_icon_size" android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:contentDescription="@null" android:contentDescription="@null" />
/>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
@@ -70,12 +67,11 @@
</RelativeLayout> </RelativeLayout>
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android" <CheckBox
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="16dip"
android:layout_marginStart="16dip" android:layout_marginStart="16dip"
android:focusable="false" android:focusable="false"
android:clickable="false" /> android:clickable="false" />

8
res/layout/device_admin_settings.xml
View File

@@ -18,20 +18,28 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1"> android:layout_weight="1">
<ListView android:id="@android:id/list" <ListView android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:fastScrollEnabled="true" /> android:fastScrollEnabled="true" />
<TextView android:id="@android:id/empty" <TextView android:id="@android:id/empty"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_device_admins" android:text="@string/no_device_admins"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

8
res/layout/ownerinfo.xml
View File

@@ -14,15 +14,17 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout 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="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="6dip"
android:paddingEnd="6dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" > android:scrollbars="vertical" >
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay"
android:fillViewport="true"> android:fillViewport="true">
<LinearLayout <LinearLayout

1
res/layout/trust_agent_item.xml
View File

@@ -78,7 +78,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingStart="15dip" android:paddingStart="15dip"
android:paddingEnd="?android:attr/scrollbarSize"
android:src="@drawable/ic_sysbar_quicksettings" android:src="@drawable/ic_sysbar_quicksettings"
android:contentDescription="@string/input_method_settings_button" android:contentDescription="@string/input_method_settings_button"
android:layout_gravity="center" android:layout_gravity="center"

23
res/layout/trusted_credential.xml
View File

@@ -18,22 +18,22 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:padding="15dip" android:paddingTop="15dip"
> android:paddingBottom="15dip">
<RelativeLayout <RelativeLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1">
>
<TextView <TextView
android:id="@+id/trusted_credential_subject_primary" android:id="@+id/trusted_credential_subject_primary"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium" />
/>
<TextView <TextView
android:id="@+id/trusted_credential_subject_secondary" android:id="@+id/trusted_credential_subject_secondary"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -41,9 +41,10 @@
android:layout_below="@id/trusted_credential_subject_primary" android:layout_below="@id/trusted_credential_subject_primary"
android:layout_alignStart="@id/trusted_credential_subject_primary" android:layout_alignStart="@id/trusted_credential_subject_primary"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
/>
</RelativeLayout> </RelativeLayout>
<!-- checkbox is invisible and not gone so that the height is consistent between tabs --> <!-- checkbox is invisible and not gone so that the height is consistent between tabs -->
<CheckBox <CheckBox
android:id="@+id/trusted_credential_status" android:id="@+id/trusted_credential_status"
@@ -52,6 +53,6 @@
android:visibility="invisible" android:visibility="invisible"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:layout_weight="0" android:layout_weight="0" />
/>
</LinearLayout> </LinearLayout>

58
res/layout/trusted_credentials.xml
View File

@@ -16,65 +16,77 @@
<TabHost <TabHost
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
android:padding="5dp"
>
<TabWidget <TabWidget
android:id="@android:id/tabs" android:id="@android:id/tabs"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
<FrameLayout <FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
android:padding="5dp"
>
<FrameLayout <FrameLayout
android:id="@+id/system_tab" android:id="@+id/system_tab"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
>
<ProgressBar <ProgressBar
android:id="@+id/system_progress" android:id="@+id/system_progress"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
/> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:visibility="gone" />
<ListView <ListView
android:id="@+id/system_list" android:id="@+id/system_list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:visibility="gone" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
android:visibility="gone">
</ListView> </ListView>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/user_tab" android:id="@+id/user_tab"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
>
<ProgressBar <ProgressBar
android:id="@+id/user_progress" android:id="@+id/user_progress"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
/> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:visibility="gone" />
<ListView <ListView
android:id="@+id/user_list" android:id="@+id/user_list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:visibility="gone" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
android:visibility="gone">
</ListView> </ListView>
</FrameLayout> </FrameLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</TabHost> </TabHost>