diff options
| author | 2015-08-04 00:09:19 +0000 | |
|---|---|---|
| committer | 2015-08-04 00:09:19 +0000 | |
| commit | 9c5e50169cb553062fb5ac301379985d44c54a73 (patch) | |
| tree | a54368e67c077086cfcb0f2d737849f5a555a98f | |
| parent | 09c6f0265e9160b6c9ea6940a2d1a8a1118aa581 (diff) | |
| parent | 44adb33c7bda9638d207b0c1ec0abded59383cda (diff) | |
Merge "Align root icons with the action bar icon."
| -rw-r--r-- | packages/DocumentsUI/res/layout/item_root.xml | 3 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values-sw600dp/dimens.xml | 19 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/dimens.xml | 1 |
3 files changed, 22 insertions, 1 deletions
diff --git a/packages/DocumentsUI/res/layout/item_root.xml b/packages/DocumentsUI/res/layout/item_root.xml index bd8392366c28..90b1ff6e3c5c 100644 --- a/packages/DocumentsUI/res/layout/item_root.xml +++ b/packages/DocumentsUI/res/layout/item_root.xml @@ -28,7 +28,8 @@ <FrameLayout android:layout_width="@dimen/icon_size" android:layout_height="@dimen/icon_size" - android:layout_marginEnd="16dp" + android:layout_marginStart="@dimen/root_icon_margin" + android:layout_marginEnd="@dimen/root_icon_margin" android:duplicateParentState="true"> <ImageView diff --git a/packages/DocumentsUI/res/values-sw600dp/dimens.xml b/packages/DocumentsUI/res/values-sw600dp/dimens.xml new file mode 100644 index 000000000000..642ff7e9a500 --- /dev/null +++ b/packages/DocumentsUI/res/values-sw600dp/dimens.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <dimen name="root_icon_margin">8dp</dimen> +</resources> diff --git a/packages/DocumentsUI/res/values/dimens.xml b/packages/DocumentsUI/res/values/dimens.xml index fb793a28b150..f94a00ed74d0 100644 --- a/packages/DocumentsUI/res/values/dimens.xml +++ b/packages/DocumentsUI/res/values/dimens.xml @@ -17,6 +17,7 @@ <resources> <dimen name="icon_size">40dp</dimen> <dimen name="root_icon_size">24dp</dimen> + <dimen name="root_icon_margin">0dp</dimen> <dimen name="grid_width">152dp</dimen> <dimen name="grid_height">176dp</dimen> |