summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErica Chang <echang@cyngn.com>2016-03-08 15:11:52 -0800
committerRichard MacGregor <rmacgregor@cyngn.com>2016-03-25 11:42:20 -0700
commit1d2d16a146413697e67b8d01ba035d680fabccaf (patch)
treedb543ac657375bb560db96dd233234dde6193c1a
parent0bda716a5afd58f63c846c72663b5b3a17897c4e (diff)
downloadandroid_packages_apps_ContactsCommon-1d2d16a146413697e67b8d01ba035d680fabccaf.tar.gz
android_packages_apps_ContactsCommon-1d2d16a146413697e67b8d01ba035d680fabccaf.tar.bz2
android_packages_apps_ContactsCommon-1d2d16a146413697e67b8d01ba035d680fabccaf.zip
Contacts: corrected login icon dimens
Change-Id: I671c5b21b7780aab22ae1dc4f3fbcf1247be4903
-rw-r--r--res/layout/plugin_contact_list_content.xml3
-rw-r--r--res/values/cm_dimens.xml9
-rw-r--r--res/values/dimens.xml9
3 files changed, 11 insertions, 10 deletions
diff --git a/res/layout/plugin_contact_list_content.xml b/res/layout/plugin_contact_list_content.xml
index 74445dd1..b4e7933d 100644
--- a/res/layout/plugin_contact_list_content.xml
+++ b/res/layout/plugin_contact_list_content.xml
@@ -65,7 +65,8 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/plugin_login_icon"
- android:layout_width="@dimen/plugin_login_icon_width"
+ android:maxWidth="@dimen/plugin_login_icon_max_width"
+ android:layout_width="wrap_content"
android:layout_height="@dimen/plugin_login_icon_height"
android:layout_above="@+id/plugin_login_msg"
android:layout_marginBottom="@dimen/plugin_login_icon_margin_bottom"
diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml
index e812e2c2..fddb5dff 100644
--- a/res/values/cm_dimens.xml
+++ b/res/values/cm_dimens.xml
@@ -5,4 +5,13 @@
<dimen name="block_contact_dialog_secondary_text_size">14sp</dimen>
<dimen name="call_provider_bottom_padding">20dp</dimen>
+
+ <!-- Dimensions for plugin login screen -->
+ <dimen name="plugin_login_icon_max_width">360dp</dimen>
+ <dimen name="plugin_login_icon_height">60dp</dimen>
+ <dimen name="plugin_login_icon_margin_bottom">17dp</dimen>
+ <dimen name="plugin_login_msg_width">196dp</dimen>
+ <dimen name="plugin_login_msg_text_size">14sp</dimen>
+ <dimen name="plugin_login_button_margin_top">40dp</dimen>
+ <dimen name="plugin_login_button_title_size">14sp</dimen>
</resources> \ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7429d7e6..8d612ff1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -161,13 +161,4 @@
<dimen name="call_subject_dialog_secondary_text_size">14sp</dimen>
<!-- Row padding for call subject history items. -->
<dimen name="call_subject_history_item_padding">15dp</dimen>
-
- <!-- Dimensions for plugin login screen -->
- <dimen name="plugin_login_icon_width">134dp</dimen>
- <dimen name="plugin_login_icon_height">59dp</dimen>
- <dimen name="plugin_login_icon_margin_bottom">17dp</dimen>
- <dimen name="plugin_login_msg_width">196dp</dimen>
- <dimen name="plugin_login_msg_text_size">14sp</dimen>
- <dimen name="plugin_login_button_margin_top">40dp</dimen>
- <dimen name="plugin_login_button_title_size">14sp</dimen>
</resources>