summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremancebo <emancebo@cyngn.com>2014-10-30 12:39:55 -0700
committeremancebo <emancebo@cyngn.com>2014-10-30 12:39:55 -0700
commitbb666f311cab31c146ba1d2092933e6de92de91f (patch)
treea810f0ad10d0bda94881c6b7d0beff484962abae
parent505a135d1e76a3f0f541e93dd94a52b0291bfd2d (diff)
downloadandroid_external_cyanogen_UICommon-bb666f311cab31c146ba1d2092933e6de92de91f.tar.gz
android_external_cyanogen_UICommon-bb666f311cab31c146ba1d2092933e6de92de91f.tar.bz2
android_external_cyanogen_UICommon-bb666f311cab31c146ba1d2092933e6de92de91f.zip
UICommon: add longer shadow for expanding card and fix shadow expansion in no-animate casecm-11.0
Change-Id: Ie1961384b3bf40a0a7508b2fd9f3f79fecb448af
-rw-r--r--res/drawable-hdpi/bg_contact_card.9.pngbin377 -> 261 bytes
-rw-r--r--res/drawable-mdpi/bg_contact_card.9.pngbin255 -> 186 bytes
-rw-r--r--res/drawable-xhdpi/bg_contact_card.9.pngbin448 -> 326 bytes
-rw-r--r--res/drawable-xxhdpi/bg_contact_card.9.pngbin601 -> 439 bytes
-rw-r--r--res/layout/expanding_card.xml6
-rw-r--r--src/com/cyngn/uicommon/view/ExpandingCard.java2
6 files changed, 5 insertions, 3 deletions
diff --git a/res/drawable-hdpi/bg_contact_card.9.png b/res/drawable-hdpi/bg_contact_card.9.png
index dc90e23..f576d06 100644
--- a/res/drawable-hdpi/bg_contact_card.9.png
+++ b/res/drawable-hdpi/bg_contact_card.9.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_contact_card.9.png b/res/drawable-mdpi/bg_contact_card.9.png
index f316b61..cb88809 100644
--- a/res/drawable-mdpi/bg_contact_card.9.png
+++ b/res/drawable-mdpi/bg_contact_card.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg_contact_card.9.png b/res/drawable-xhdpi/bg_contact_card.9.png
index aab782d..f3baad1 100644
--- a/res/drawable-xhdpi/bg_contact_card.9.png
+++ b/res/drawable-xhdpi/bg_contact_card.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/bg_contact_card.9.png b/res/drawable-xxhdpi/bg_contact_card.9.png
index 2fd9cbd..f06cb33 100644
--- a/res/drawable-xxhdpi/bg_contact_card.9.png
+++ b/res/drawable-xxhdpi/bg_contact_card.9.png
Binary files differ
diff --git a/res/layout/expanding_card.xml b/res/layout/expanding_card.xml
index 6e33885..8acda07 100644
--- a/res/layout/expanding_card.xml
+++ b/res/layout/expanding_card.xml
@@ -10,8 +10,8 @@
android:id="@+id/shadowView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="2dp"
- android:layout_marginBottom="4dp"
+ android:layout_marginTop="3dp"
+ android:layout_marginBottom="6dp"
android:background="@drawable/bg_contact_card"/>
<FrameLayout
@@ -32,4 +32,4 @@
android:layout_height="wrap_content"
android:background="@color/expanding_card_color"/>
</FrameLayout>
-</com.cyngn.uicommon.view.ExpandingCard> \ No newline at end of file
+</com.cyngn.uicommon.view.ExpandingCard>
diff --git a/src/com/cyngn/uicommon/view/ExpandingCard.java b/src/com/cyngn/uicommon/view/ExpandingCard.java
index c80cfa9..33a089f 100644
--- a/src/com/cyngn/uicommon/view/ExpandingCard.java
+++ b/src/com/cyngn/uicommon/view/ExpandingCard.java
@@ -109,6 +109,8 @@ public class ExpandingCard extends FrameLayout {
new TopMarginSetter().setMargin(mAuxView, bottom);
mMainView.setBackgroundColor(mColorSelected);
mAuxView.setBackgroundColor(mColorSelected);
+ new TopMarginSetter().setMargin(mShadowView, 0);
+ new BottomMarginSetter().setMargin(mShadowView, 0);
break;
}