Make the contact picture exactly half the height as it is wide
Bug:5087954
Change-Id: Idb8a1bd61b4c8f95910d3c5c7255400d276af0d9
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0b263a4..2ca8512 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -4,9 +4,9 @@
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.
@@ -36,4 +36,87 @@
</attr>
</declare-styleable>
+ <declare-styleable name="InterpolatingLayout_Layout">
+ <attr name="layout_narrowParentWidth" format="dimension"/>
+ <attr name="layout_narrowWidth" format="dimension"/>
+ <attr name="layout_narrowMarginLeft" format="dimension"/>
+ <attr name="layout_narrowMarginRight" format="dimension"/>
+ <attr name="layout_narrowPaddingLeft" format="dimension"/>
+ <attr name="layout_narrowPaddingRight" format="dimension"/>
+ <attr name="layout_wideParentWidth" format="dimension"/>
+ <attr name="layout_wideWidth" format="dimension"/>
+ <attr name="layout_wideMarginLeft" format="dimension"/>
+ <attr name="layout_wideMarginRight" format="dimension"/>
+ <attr name="layout_widePaddingLeft" format="dimension"/>
+ <attr name="layout_widePaddingRight" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="ProportionalLayout">
+ <attr name="direction" format="string"/>
+ <attr name="ratio" format="float"/>
+ </declare-styleable>
+
+ <declare-styleable name="TransitionAnimationView">
+ <attr name="clipMarginLeft" format="dimension"/>
+ <attr name="clipMarginRight" format="dimension"/>
+ <attr name="clipMarginTop" format="dimension"/>
+ <attr name="clipMarginBottom" format="dimension"/>
+ <attr name="enterAnimation" format="reference"/>
+ <attr name="exitAnimation" format="reference"/>
+ <attr name="animationDuration" format="integer"/>
+ </declare-styleable>
+
+ <declare-styleable name="ContactBrowser">
+ <attr name="contact_filter_popup_width" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="ContactListItemView">
+ <attr name="list_item_height" format="dimension"/>
+ <attr name="list_section_header_height" format="dimension"/>
+ <attr name="activated_background" format="reference"/>
+ <attr name="section_header_background" format="reference"/>
+ <attr name="list_item_divider" format="reference"/>
+ <attr name="list_item_padding_top" format="dimension"/>
+ <attr name="list_item_padding_right" format="dimension"/>
+ <attr name="list_item_padding_bottom" format="dimension"/>
+ <attr name="list_item_padding_left" format="dimension"/>
+ <attr name="list_item_gap_between_image_and_text" format="dimension"/>
+ <attr name="list_item_gap_between_label_and_data" format="dimension"/>
+ <attr name="list_item_call_button_padding" format="dimension"/>
+ <attr name="list_item_vertical_divider_margin" format="dimension"/>
+ <attr name="list_item_presence_icon_margin" format="dimension"/>
+ <attr name="list_item_presence_icon_size" format="dimension"/>
+ <attr name="list_item_photo_size" format="dimension"/>
+ <attr name="list_item_profile_photo_size" format="dimension"/>
+ <attr name="list_item_prefix_highlight_color" format="color"/>
+ <attr name="list_item_header_text_indent" format="dimension" />
+ <attr name="list_item_header_text_color" format="color" />
+ <attr name="list_item_header_text_size" format="dimension" />
+ <attr name="list_item_header_height" format="dimension" />
+ <attr name="list_item_header_underline_height" format="dimension" />
+ <attr name="list_item_header_underline_color" format="color" />
+ </declare-styleable>
+
+ <declare-styleable name="CallDetailActivity">
+ <attr name="call_detail_transparent_background" format="color" />
+ <attr name="call_detail_contact_background_overlay_alpha" format="float" />
+ </declare-styleable>
+
+ <declare-styleable name="CallLog">
+ <attr name="call_log_primary_text_color" format="color" />
+ <attr name="call_log_primary_background_color" format="color" />
+ <attr name="call_log_secondary_text_color" format="color" />
+ <attr name="call_log_secondary_background_color" format="color" />
+ <attr name="call_log_header_color" format="color" />
+ </declare-styleable>
+
+ <declare-styleable name="VoicemailStatus">
+ <attr name="call_log_voicemail_status_height" format="dimension" />
+ <attr name="call_log_voicemail_status_background_color" format="color" />
+ <attr name="call_log_voicemail_status_text_color" format="color" />
+ </declare-styleable>
+
+ <declare-styleable name="Favorites">
+ <attr name="favorites_padding_bottom" format="dimension" />
+ </declare-styleable>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 45aa75e..604ea31 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -34,14 +34,6 @@
based on the source of the request -->
<dimen name="quick_contact_top_position">48dip</dimen>
- <!-- Width of the picture in the QuickContact popup. This can be -1 for the full width
- of the parent -->
- <dimen name="quick_contact_picture_width">-1px</dimen>
-
- <!-- Height of the picture in the QuickContact popup. This can be -1 for the full height
- of the parent -->
- <dimen name="quick_contact_picture_height">174dip</dimen>
-
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
<dimen name="editor_round_button_padding_left">2dip</dimen>
<dimen name="editor_round_button_padding_right">2dip</dimen>
@@ -93,9 +85,6 @@
<!-- Margin between the photo, the star, and text in the contact detail header view -->
<dimen name="detail_header_view_margin">8dip</dimen>
- <!-- Height of the tab carousel on the contact detail page -->
- <dimen name="detail_tab_carousel_height">150dip</dimen>
-
<!-- Height of the tab text label in the tab carousel on the contact detail page -->
<dimen name="detail_tab_carousel_tab_label_height">48dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 785c887..69f7428 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -115,60 +115,6 @@
<item name="android:windowExitAnimation">@anim/dummy_animation</item>
</style>
- <declare-styleable name="ContactBrowser">
- <attr name="contact_filter_popup_width" format="dimension"/>
- </declare-styleable>
-
- <declare-styleable name="ContactListItemView">
- <attr name="list_item_height" format="dimension"/>
- <attr name="list_section_header_height" format="dimension"/>
- <attr name="activated_background" format="reference"/>
- <attr name="section_header_background" format="reference"/>
- <attr name="list_item_divider" format="reference"/>
- <attr name="list_item_padding_top" format="dimension"/>
- <attr name="list_item_padding_right" format="dimension"/>
- <attr name="list_item_padding_bottom" format="dimension"/>
- <attr name="list_item_padding_left" format="dimension"/>
- <attr name="list_item_gap_between_image_and_text" format="dimension"/>
- <attr name="list_item_gap_between_label_and_data" format="dimension"/>
- <attr name="list_item_call_button_padding" format="dimension"/>
- <attr name="list_item_vertical_divider_margin" format="dimension"/>
- <attr name="list_item_presence_icon_margin" format="dimension"/>
- <attr name="list_item_presence_icon_size" format="dimension"/>
- <attr name="list_item_photo_size" format="dimension"/>
- <attr name="list_item_profile_photo_size" format="dimension"/>
- <attr name="list_item_prefix_highlight_color" format="color"/>
- <attr name="list_item_header_text_indent" format="dimension" />
- <attr name="list_item_header_text_color" format="color" />
- <attr name="list_item_header_text_size" format="dimension" />
- <attr name="list_item_header_height" format="dimension" />
- <attr name="list_item_header_underline_height" format="dimension" />
- <attr name="list_item_header_underline_color" format="color" />
- </declare-styleable>
-
- <declare-styleable name="CallDetailActivity">
- <attr name="call_detail_transparent_background" format="color" />
- <attr name="call_detail_contact_background_overlay_alpha" format="float" />
- </declare-styleable>
-
- <declare-styleable name="CallLog">
- <attr name="call_log_primary_text_color" format="color" />
- <attr name="call_log_primary_background_color" format="color" />
- <attr name="call_log_secondary_text_color" format="color" />
- <attr name="call_log_secondary_background_color" format="color" />
- <attr name="call_log_header_color" format="color" />
- </declare-styleable>
-
- <declare-styleable name="VoicemailStatus">
- <attr name="call_log_voicemail_status_height" format="dimension" />
- <attr name="call_log_voicemail_status_background_color" format="color" />
- <attr name="call_log_voicemail_status_text_color" format="color" />
- </declare-styleable>
-
- <declare-styleable name="Favorites">
- <attr name="favorites_padding_bottom" format="dimension" />
- </declare-styleable>
-
<style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
@@ -270,31 +216,6 @@
<item name="android:layout_height">match_parent</item>
</style>
- <declare-styleable name="InterpolatingLayout_Layout">
- <attr name="layout_narrowParentWidth" format="dimension"/>
- <attr name="layout_narrowWidth" format="dimension"/>
- <attr name="layout_narrowMarginLeft" format="dimension"/>
- <attr name="layout_narrowMarginRight" format="dimension"/>
- <attr name="layout_narrowPaddingLeft" format="dimension"/>
- <attr name="layout_narrowPaddingRight" format="dimension"/>
- <attr name="layout_wideParentWidth" format="dimension"/>
- <attr name="layout_wideWidth" format="dimension"/>
- <attr name="layout_wideMarginLeft" format="dimension"/>
- <attr name="layout_wideMarginRight" format="dimension"/>
- <attr name="layout_widePaddingLeft" format="dimension"/>
- <attr name="layout_widePaddingRight" format="dimension"/>
- </declare-styleable>
-
- <declare-styleable name="TransitionAnimationView">
- <attr name="clipMarginLeft" format="dimension"/>
- <attr name="clipMarginRight" format="dimension"/>
- <attr name="clipMarginTop" format="dimension"/>
- <attr name="clipMarginBottom" format="dimension"/>
- <attr name="enterAnimation" format="reference"/>
- <attr name="exitAnimation" format="reference"/>
- <attr name="animationDuration" format="integer"/>
- </declare-styleable>
-
<style name="DirectoryHeader" parent="PeopleTheme">
<item name="android:background">@drawable/directory_bg</item>
</style>