Merge branch 'feature/v1.0.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.2

modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OrientedViewPager.java

@@ -1946,14 +1946,14 @@ public class OrientedViewPager extends ViewGroup {
                         Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
                     }
 
-                    if (dx != 0 && !isGutterDrag(mLastMotionX, dx) &&
-                            canScroll(this, false, (int) dx, (int) x, (int) y)) {
-                        // Nested view has scrollable area under this point. Let it be handled there.
-                        mLastMotionX = x;
-                        mLastMotionY = y;
-                        mIsUnableToDrag = true;
-                        return false;
-                    }
+                    //if (dx != 0 && !isGutterDrag(mLastMotionX, dx) &&
+                    //        canScroll(this, false, (int) dx, (int) x, (int) y)) {
+                    //    // Nested view has scrollable area under this point. Let it be handled there.
+                    //    mLastMotionX = x;
+                    //    mLastMotionY = y;
+                    //    mIsUnableToDrag = true;
+                    //    return false;
+                    //}
                     if (xDiff > mTouchSlop && xDiff * 0.5f > yDiff) {
                         if (DEBUG) Log.v(TAG, "Starting drag!");
                         mIsBeingDragged = true;

modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml

@@ -46,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_marginLeft="@dimen/dp_30"
             android:layout_marginRight="@dimen/dp_30"
-            android:layout_height="@dimen/dp_600"
+            android:layout_height="@dimen/cards_container_dp_600"
             android:clipToPadding="false"
             android:overScrollMode="never" />
 
@@ -62,7 +62,7 @@
             android:id="@+id/module_main_id_card_cover_up_bottom"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_26"
-            android:layout_marginTop="@dimen/dp_600"
+            android:layout_marginTop="@dimen/cards_container_dp_600"
             android:layout_marginLeft="@dimen/dp_64"
             android:layout_marginRight="@dimen/dp_64"
             android:background="@drawable/module_main_card_cover_up_bottom"

modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml

@@ -12,4 +12,7 @@
     <dimen name="module_main_card_card_shadow_height_div">10px</dimen>
     <dimen name="module_main_top_shadow_height">144px</dimen>
     <dimen name="module_main_card_cover_up_margin">352px</dimen>
+
+    <dimen name="cards_container_dp_600">320px</dimen>
+
 </resources>

modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml

@@ -12,4 +12,6 @@
     <dimen name="module_main_card_card_shadow_height_div">15px</dimen>
     <dimen name="module_main_top_shadow_height">270px</dimen>
     <dimen name="module_main_card_cover_up_margin">660px</dimen>
+    <dimen name="cards_container_dp_600">600px</dimen>
+
 </resources>