more RTL changes

Change-Id: Ic4379b86818220b7ef27a51978538caec8b3be8d

5 files changed, 34 insertions, 33 deletions

diff --git a/Android.mk b/Android.mk
index 8dbd69c..330237f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-support-v4
+        android-support-v4 \
+        android-support-v7-cardview
 
 LOCAL_MODULE := android-opt-cards
 
diff --git a/res/layout/inner_base_main_cardwithlist.xml b/res/layout/inner_base_main_cardwithlist.xml
index caa7235..f762fa2 100644
--- a/res/layout/inner_base_main_cardwithlist.xml
+++ b/res/layout/inner_base_main_cardwithlist.xml
@@ -22,8 +22,8 @@
               xmlns:card="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_marginLeft="@dimen/card_base_cardwithlist_layout_leftmargin"
-              android:layout_marginRight="@dimen/card_base_cardwithlist_layout_rightmargin"
+              android:layout_marginStart="@dimen/card_base_cardwithlist_layout_startmargin"
+              android:layout_marginEnd="@dimen/card_base_cardwithlist_layout_endmargin"
               android:layout_height="wrap_content">
 
 
@@ -54,4 +54,4 @@
         android:visibility="gone"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/native_inner_base_main_cardwithlist.xml b/res/layout/native_inner_base_main_cardwithlist.xml
index 77bbbbd..d60dff6 100644
--- a/res/layout/native_inner_base_main_cardwithlist.xml
+++ b/res/layout/native_inner_base_main_cardwithlist.xml
@@ -22,8 +22,8 @@
               xmlns:card="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_marginLeft="@dimen/card_base_cardwithlist_layout_leftmargin"
-              android:layout_marginRight="@dimen/card_base_cardwithlist_layout_rightmargin"
+              android:layout_marginStart="@dimen/card_base_cardwithlist_layout_startmargin"
+              android:layout_marginEnd="@dimen/card_base_cardwithlist_layout_endmargin"
               android:layout_height="wrap_content">
 
 
@@ -54,4 +54,4 @@
         android:visibility="gone"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-v16/styles.xml b/res/values-v16/styles.xml
index 66eadac..77b4237 100644
--- a/res/values-v16/styles.xml
+++ b/res/values-v16/styles.xml
@@ -25,24 +25,24 @@
 
     <!--Style for simple title header inner view-->
     <style name="card.header_simple_title">
-        <item name="android:layout_gravity">left|center_vertical</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
         <item name="android:fontFamily">@string/card_font_fontFamily_header</item>
         <item name="android:textColor">@color/card_text_color_header</item>
         <item name="android:textSize">@dimen/card_header_simple_title_text_size</item>
-        <item name="android:layout_marginLeft">@dimen/card_header_simple_title_margin_left</item>
+        <item name="android:layout_marginStart">@dimen/card_header_simple_title_margin_start</item>
         <item name="android:layout_marginTop">@dimen/card_header_simple_title_margin_top</item>
-        <item name="android:layout_marginRight">@dimen/card_header_simple_title_margin_right</item>
+        <item name="android:layout_marginEnd">@dimen/card_header_simple_title_margin_end</item>
         <item name="android:layout_marginBottom">@dimen/card_header_simple_title_margin_bottom</item>
     </style>
 
     <style name="card.native.header_simple_title" >
-        <item name="android:layout_gravity">left|center_vertical</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
         <item name="android:textSize">@dimen/card_header_native_simple_title_text_size</item>
         <item name="android:textColor">@color/card_text_color_header</item>
         <item name="android:fontFamily">@string/card_native_font_fontFamily_header</item>
-        <item name="android:layout_marginLeft">@dimen/card_header_native_simple_title_margin_left</item>
+        <item name="android:layout_marginStart">@dimen/card_header_native_simple_title_margin_start</item>
         <item name="android:layout_marginTop">@dimen/card_header_native_simple_title_margin_top</item>
-        <item name="android:layout_marginRight">@dimen/card_header_native_simple_title_margin_right</item>
+        <item name="android:layout_marginEnd">@dimen/card_header_native_simple_title_margin_end</item>
         <item name="android:layout_marginBottom">@dimen/card_header_native_simple_title_margin_bottom</item>
     </style>
 
@@ -53,10 +53,10 @@
     <style name="card.base_simple_title">
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">@string/card_font_fontFamily_main_content</item>
-        <item name="android:layout_gravity">left|center_vertical</item>
-        <item name="android:layout_marginLeft">@dimen/card_main_simple_title_margin_left</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
+        <item name="android:layout_marginStart">@dimen/card_main_simple_title_margin_start</item>
         <item name="android:layout_marginTop">@dimen/card_main_simple_title_margin_top</item>
-        <item name="android:layout_marginRight">@dimen/card_main_simple_title_margin_right</item>
+        <item name="android:layout_marginEnd">@dimen/card_main_simple_title_margin_end</item>
         <item name="android:layout_marginBottom">@dimen/card_main_simple_title_margin_bottom</item>
     </style>
 
@@ -65,10 +65,10 @@
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">@string/card_native_font_fontFamily_main_content</item>
         <item name="android:textSize">@dimen/card_main_content_native_simple_title_text_size</item>
-        <item name="android:layout_gravity">left|center_vertical</item>
-        <item name="android:layout_marginLeft">@dimen/card_main_native_simple_title_margin_left</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
+        <item name="android:layout_marginStart">@dimen/card_main_native_simple_title_margin_start</item>
         <item name="android:layout_marginTop">@dimen/card_main_native_simple_title_margin_top</item>
-        <item name="android:layout_marginRight">@dimen/card_header_native_simple_title_margin_right</item>
+        <item name="android:layout_marginEnd">@dimen/card_header_native_simple_title_margin_end</item>
         <item name="android:layout_marginBottom">@dimen/card_header_native_simple_title_margin_bottom</item>
     </style>
 
@@ -76,22 +76,22 @@
 
     <!--Style for simple title expand/collapse inner view-->
     <style name="card.expand_simple_title">
-        <item name="android:layout_gravity">left|center_vertical</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:fontFamily">@string/card_font_fontFamily_expand</item>
         <item name="android:textSize">@dimen/card_expand_simple_title_text_size</item>
-        <item name="android:paddingLeft">@dimen/card_expand_simple_title_paddingLeft</item>
-        <item name="android:paddingRight">@dimen/card_expand_simple_title_paddingRight</item>
+        <item name="android:paddingStart">@dimen/card_expand_simple_title_paddingStart</item>
+        <item name="android:paddingEnd">@dimen/card_expand_simple_title_paddingEnd</item>
         <item name="android:textColor">@color/card_expand_title_color</item>
     </style>
 
     <!--Style for simple title expand/collapse inner view-->
     <style name="card.native.expand_simple_title">
-        <item name="android:layout_gravity">left|center_vertical</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:textSize">@dimen/card_expand_native_simple_title_text_size</item>
-        <item name="android:paddingLeft">@dimen/card_expand_native_simple_title_padding_left</item>
-        <item name="android:paddingRight">@dimen/card_expand_native_simple_title_padding_right</item>
+        <item name="android:paddingStart">@dimen/card_expand_native_simple_title_padding_start</item>
+        <item name="android:paddingEnd">@dimen/card_expand_native_simple_title_padding_end</item>
         <item name="android:textColor">@color/card_expand_title_color</item>
         <item name="android:fontFamily">@string/card_native_font_fontFamily_expand</item>
     </style>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 233498e..c25edd8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -42,8 +42,8 @@
 
     <!-- Header -->
     <dimen name="card_header_default_padding">12dp</dimen>
-    <dimen name="card_header_native_default_paddingLeft">12dp</dimen>
-    <dimen name="card_header_native_default_paddingRight">12dp</dimen>
+    <dimen name="card_header_native_default_paddingStart">12dp</dimen>
+    <dimen name="card_header_native_default_paddingEnd">12dp</dimen>
     <dimen name="card_header_native_default_paddingTop">12dp</dimen>
     <dimen name="card_header_native_default_paddingBottom">0dp</dimen>
 
@@ -83,13 +83,13 @@
     <dimen name="card_content_outer_view_margin_bottom">0dp</dimen>
     <dimen name="card_content_outer_view_margin_end">0dp</dimen>
 
-    <dimen name="card_main_content_native_default_paddingLeft">12dp</dimen>
-    <dimen name="card_main_content_native_default_paddingRight">12dp</dimen>
+    <dimen name="card_main_content_native_default_paddingStart">12dp</dimen>
+    <dimen name="card_main_content_native_default_paddingEnd">12dp</dimen>
     <dimen name="card_main_content_native_default_paddingTop">12dp</dimen>
     <dimen name="card_main_content_native_default_paddingBottom">12dp</dimen>
 
-    <dimen name="card_main_content_native_cardwithlist_paddingLeft">0dp</dimen>
-    <dimen name="card_main_content_native_cardwithlist_paddingRight">0dp</dimen>
+    <dimen name="card_main_content_native_cardwithlist_paddingStart">0dp</dimen>
+    <dimen name="card_main_content_native_cardwithlist_paddingEnd">0dp</dimen>
     <dimen name="card_main_content_native_cardwithlist_paddingTop">12dp</dimen>
     <dimen name="card_main_content_native_cardwithlist_paddingBottom">12dp</dimen>
 
@@ -117,8 +117,8 @@
 
     <!-- Expand -->
     <dimen name="card_expand_layout_padding">2dp</dimen>
-    <dimen name="card_expand_simple_title_paddingLeft">10dp</dimen>
-    <dimen name="card_expand_simple_title_paddingRight">10dp</dimen>
+    <dimen name="card_expand_simple_title_paddingStart">10dp</dimen>
+    <dimen name="card_expand_simple_title_paddingEnd">10dp</dimen>
     <dimen name="card_expand_simple_title_text_size">14sp</dimen>
 
     <dimen name="card_expand_native_layout_padding_start">12dp</dimen>