Merge "Reflect framework dimen changes in editor" into lmp-mr1-dev
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index bada4cc..e3eff4e 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -23,7 +23,7 @@
<ImageView
android:id="@+id/kind_icon"
android:src="@drawable/ic_camera_alt_black_24dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="13dp"
android:contentDescription="@string/header_photo_entry"
style="@style/EditKindIconStyle" />
@@ -37,7 +37,7 @@
android:layout_height="72dip"
android:cropToPadding="true"
android:scaleType="centerCrop"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="15dp"
android:layout_marginStart="4dp"
android:contentDescription="@string/description_contact_photo"
android:layout_marginBottom="@dimen/editor_padding_below_photo"
@@ -59,14 +59,14 @@
This is 2dp less than the default touch target size.
3) This button will appear to be offset by the private
@android:dimen/button_inset_vertical_material amount. Therefore, in order to achieve
- 10dp of apparent top margin, we only need to apply 4dp. -->
+ 15dp of apparent top margin, we only need to apply 9dp. -->
<Button
android:id="@+id/change_button"
android:layout_width="wrap_content"
android:layout_height="46dp"
android:textSize="@dimen/editor_form_text_size"
android:textColor="@color/primary_text_color"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="9dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/change_photo" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1626ce9..a6afca6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,7 +51,7 @@
<!-- Top margin applied to mime-type icons inside the editor. This is needed to give the
appearance that the icons are top aligned with the text, since visible text doesn't
start at the very top of TextViews. -->
- <dimen name="editor_kind_icon_top_margin">9dp</dimen>
+ <dimen name="editor_kind_icon_top_margin">14dp</dimen>
<!-- RHS padding added to spinners in the editor. This separates the spinner text from the
spinner graphic since b/18194928 causes the spinner to always be on the RHS.
@@ -70,7 +70,7 @@
<!-- Padding below every editor view, such as LabeledEditorView. This value is chosen
to give 32dp of apparent padding between EditText's in the Raw Contact Editor. -->
- <dimen name="editor_padding_between_editor_views">20dp</dimen>
+ <dimen name="editor_padding_between_editor_views">15dp</dimen>
<!-- Padding below every readonly editor view. This value is chosen to give 32dp of apparent padding
between TextView's in the readonly Raw Contact Editor. -->
@@ -83,7 +83,7 @@
<!-- Padding below the photo editor. This value is larger than
editor_padding_between_editor_views, since ImageView's don't have space between the bottom
of their visual bottom, like an EditText does. -->
- <dimen name="editor_padding_below_photo">22dp</dimen>
+ <dimen name="editor_padding_below_photo">21dp</dimen>
<!-- Width of the Type-Label in the Editor -->
<dimen name="editor_type_label_width">150dip</dimen>