Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21ddce69 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix Security Settings padding

- for OwnerInfo / Trust Agent / Trusted Credentials / Device Admin
- fix also scrollbars position
- also layout code formatting

See bug: #15384992 Setting Dashboard - padding updates

Change-Id: Ib840c6dea62d7cead671b2ca8744502a7ecb435a
parent 0106a2ef
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -18,21 +18,28 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:orientation="vertical">

    <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="0px"
            android:layout_weight="1">

        <ListView android:id="@android:id/list"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:drawSelectorOnTop="false"
                android:fastScrollEnabled="true" />

        <TextView android:id="@android:id/empty"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:gravity="center"
                android:text="@string/no_trust_agents"
                android:textAppearance="?android:attr/textAppearanceMedium" />

    </FrameLayout>

</LinearLayout>
+5 −9
Original line number Diff line number Diff line
@@ -22,24 +22,21 @@
    android:layout_height="wrap_content"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:orientation="horizontal"
    android:paddingEnd="6dip"
    android:paddingStart="6dip"
    android:gravity="center_vertical" >

    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:minWidth="64dip"
        android:layout_height="wrap_content"
        android:gravity="center"
        android:padding="8dip"
        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_gravity="center_vertical"
            android:contentDescription="@null"
            />
            android:contentDescription="@null" />

    </LinearLayout>

    <RelativeLayout
@@ -70,12 +67,11 @@

    </RelativeLayout>

    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
    <CheckBox
        android:id="@+id/checkbox"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:layout_marginEnd="16dip"
        android:layout_marginStart="16dip"
        android:focusable="false"
        android:clickable="false" />
+8 −0
Original line number Diff line number Diff line
@@ -18,20 +18,28 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="0px"
            android:layout_weight="1">

        <ListView android:id="@android:id/list"
                android:layout_width="match_parent" 
                android:layout_height="match_parent"
                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                android:scrollbarStyle="outsideOverlay"
                android:drawSelectorOnTop="false"
                android:fastScrollEnabled="true" />

        <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/textAppearanceMedium" />

    </FrameLayout>

</LinearLayout>
+5 −3
Original line number Diff line number Diff line
@@ -14,15 +14,17 @@
     limitations under the License.
-->
<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:paddingStart="6dip"
    android:paddingEnd="6dip"
    android:layout_width="match_parent" android:layout_height="wrap_content"
    android:scrollbars="vertical" >

    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:scrollbarStyle="outsideOverlay"
        android:fillViewport="true">

        <LinearLayout
+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@
            android:layout_width="wrap_content"
            android:layout_height="fill_parent"
            android:paddingStart="15dip"
            android:paddingEnd="?android:attr/scrollbarSize"
            android:src="@drawable/ic_sysbar_quicksettings"
            android:contentDescription="@string/input_method_settings_button"
            android:layout_gravity="center"
Loading