am 40ac45eb: Get rid of arrows in candidate view

Merge commit '40ac45ebdcd71940394dda00371d4847f7db0f26' into gingerbread-plus-aosp

* commit '40ac45ebdcd71940394dda00371d4847f7db0f26':
  Get rid of arrows in candidate view

7 files changed, 2 insertions, 45 deletions

diff --git a/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
deleted file mode 100755
index e375f262f..000000000
--- a/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
+++ /dev/null
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
deleted file mode 100755
index d38ae7562..000000000
--- a/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
+++ /dev/null
diff --git a/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
deleted file mode 100755
index 1a03c52e6..000000000
--- a/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
+++ /dev/null
diff --git a/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
deleted file mode 100644
index e54c5b099..000000000
--- a/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
+++ /dev/null
diff --git a/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
deleted file mode 100644
index a9adef2ba..000000000
--- a/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
+++ /dev/null
diff --git a/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
deleted file mode 100644
index 639a28711..000000000
--- a/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
+++ /dev/null
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml
index 068c17e56..478e20ba1 100755
--- a/java/res/layout/candidates.xml
+++ b/java/res/layout/candidates.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.latin.CandidateViewContainer
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -26,27 +26,6 @@
         android:background="@drawable/keyboard_suggest_strip"
         >
 
-    <LinearLayout
-            android:id="@+id/candidate_left_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-        <ImageButton
-            android:id="@+id/candidate_left"
-            android:background="@drawable/ic_suggest_scroll_background"
-            android:src="@drawable/ic_suggest_strip_scroll_left_arrow" 
-            android:layout_width="36dp"
-            android:layout_height="match_parent"
-            android:clickable="true"
-            />
-        
-        <ImageView
-            android:src="@drawable/keyboard_suggest_strip_divider"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            />
-    </LinearLayout>
-    
     <com.android.inputmethod.latin.CandidateView
         android:id="@+id/candidates"
         android:layout_width="wrap_content"
@@ -54,26 +33,4 @@
         android:layout_weight="1"
         />
         
-    <LinearLayout
-            android:id="@+id/candidate_right_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:clickable="true"
-            android:orientation="horizontal">
-        <ImageView
-            android:src="@drawable/keyboard_suggest_strip_divider"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            />
-        
-        <ImageButton
-            android:id="@+id/candidate_right"
-            android:background="@drawable/ic_suggest_scroll_background"
-            android:src="@drawable/ic_suggest_strip_scroll_right_arrow" 
-            android:layout_width="36dp"
-            android:layout_height="match_parent"
-            android:clickable="true"
-            />
-    </LinearLayout>        
-    
-</com.android.inputmethod.latin.CandidateViewContainer>
+</LinearLayout>