From 2d4a7e7347cde241849b49fe153f5ebc01856d1b Mon Sep 17 00:00:00 2001
From: MaiKambayashi <mai.kambayashi@mixi.co.jp>
Date: Thu, 15 Sep 2016 17:40:08 +0900
Subject: [PATCH] [fix] Error:Attribute "orientation" has already been defined

---
 library/res/values/attrs.xml                        | 5 +----
 library/src/se/emilsjolander/flipview/FlipView.java | 2 +-
 sample/res/layout/activity_main.xml                 | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml
index a022bc7..48a176d 100644
--- a/library/res/values/attrs.xml
+++ b/library/res/values/attrs.xml
@@ -2,10 +2,7 @@
 <resources>
     
     <declare-styleable name="FlipView">
-        <attr name="orientation" format="enum">
-            <enum name="vertical" value="0"/>
-            <enum name="horizontal" value="1"/>
-        </attr>
+        <attr name="android:orientation" />
         <attr name="overFlipMode" format="enum">
             <enum name="glow" value="0"/>
             <enum name="rubber_band" value="1"/>
diff --git a/library/src/se/emilsjolander/flipview/FlipView.java b/library/src/se/emilsjolander/flipview/FlipView.java
index 2e872bc..89c6c93 100644
--- a/library/src/se/emilsjolander/flipview/FlipView.java
+++ b/library/src/se/emilsjolander/flipview/FlipView.java
@@ -167,7 +167,7 @@ public FlipView(Context context, AttributeSet attrs, int defStyle) {
 				R.styleable.FlipView);
 
 		// 0 is vertical, 1 is horizontal
-		mIsFlippingVertically = a.getInt(R.styleable.FlipView_orientation,
+		mIsFlippingVertically = a.getInt(R.styleable.FlipView_android_orientation,
 				VERTICAL_FLIP) == VERTICAL_FLIP;
 
 		setOverFlipMode(OverFlipMode.values()[a.getInt(
diff --git a/sample/res/layout/activity_main.xml b/sample/res/layout/activity_main.xml
index 65a6090..28a70cf 100644
--- a/sample/res/layout/activity_main.xml
+++ b/sample/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#ffffff"
-        flipview:orientation="vertical"
+        android:orientation="vertical"
         tools:context=".MainActivity" >
     </se.emilsjolander.flipview.FlipView>