Merge remote-tracking branch 'origin/dev' into qa_1.1.8_easy_mode

# Conflicts:
#	gradle.properties
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_16" />
     <gradient
-        android:angle="45"
+        android:angle="180"
         android:endColor="#E6E6E6"
         android:startColor="#DDDDDD" />
-    <corners android:radius="@dimen/dp_16" />
+
 </shape>

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_30" />
+    <gradient
+        android:angle="180"
+        android:endColor="#F5F5F5"
+        android:startColor="#F5F5F5" />
+</shape>

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_30" />
+    <solid android:color="#F5F5F5" />
+</shape>

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_carchatting_team_fragment_close_normal_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_carchatting_team_fragment_close_pressed_light" android:state_pressed="true" />
+</selector>

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_30" />
+    <gradient
+        android:angle="180"
+        android:endColor="#F5F5F5"
+        android:startColor="#FFFFFF" />
+</shape>

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_23" />
+    <solid android:color="#DADADA" />
+</shape>

skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_21"/>
+    <corners android:radius="@dimen/dp_22"/>
 
     <gradient
         android:startColor="#579EFF"