diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-06 18:27:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 17:19:40 +0000 |
| commit | fa8950be33c777d0305775ee3a364300d454f91b (patch) | |
| tree | 2bfcadb219ed2fdbcfeb164587b387c6fa8828d5 /res | |
| parent | bac0fc1f6b448c41f9f3889cba2b93c718dc1788 (diff) | |
| parent | 06601e149e2ae3e9f2656008d481ecfb21900952 (diff) | |
| download | packages_apps_Settings-fa8950be33c777d0305775ee3a364300d454f91b.zip packages_apps_Settings-fa8950be33c777d0305775ee3a364300d454f91b.tar.gz packages_apps_Settings-fa8950be33c777d0305775ee3a364300d454f91b.tar.bz2 | |
Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/device_admin_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/device_admin_settings.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml index 102cc16..0420bb5 100644 --- a/res/layout/device_admin_item.xml +++ b/res/layout/device_admin_item.xml @@ -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> diff --git a/res/layout/device_admin_settings.xml b/res/layout/device_admin_settings.xml index b89f48b..1766138 100644 --- a/res/layout/device_admin_settings.xml +++ b/res/layout/device_admin_settings.xml @@ -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" /> |