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

Commit fa8950be authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev

parents bac0fc1f 06601e14

res/layout/device_admin_item.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
<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:minHeight="?android:attr/listPreferredItemHeight"

    android:orientation="horizontal"

    android:gravity="center_vertical" >
@@ -35,6 +37,7 @@ 
            android:layout_width="@android:dimen/app_icon_size"

            android:layout_height="@android:dimen/app_icon_size"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="8dip"

            android:contentDescription="@null" />



    </LinearLayout>

res/layout/device_admin_settings.xml

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
        <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" />