commit bae6e6fddb97f90cb1d71e748d5507f694356135
author The Android Open Source Project <initial-contribution@android.com> Fri Feb 05 14:11:42 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 05 14:11:42 2010 -0800
tree e040480b6f414874813b1bcbb4653c7003f8fef4
parent 6ac94e9eb27717b1e282298172ebabb524de7058
parent 7643a1fcce0798ff46f485759f4527e5c8067ba7

am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair

Merge commit '7643a1fcce0798ff46f485759f4527e5c8067ba7'

* commit '7643a1fcce0798ff46f485759f4527e5c8067ba7':
  android-2.1_r1 snapshot

Android.mk

diff --git a/Android.mk b/Android.mk
index 64224ae..99ad14d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,6 +2,8 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_MODULE_TAGS := optional
+
 LOCAL_SRC_FILES := \
          $(call all-subdir-java-files)
 

res/layout/candidates_container.xml

diff --git a/res/layout/candidates_container.xml b/res/layout/candidates_container.xml
index eda7e28..3a0c71b 100644
--- a/res/layout/candidates_container.xml
+++ b/res/layout/candidates_container.xml
@@ -23,7 +23,7 @@
   <ImageButton android:id="@+id/arrow_left_btn"
     android:background="@drawable/arrow_bg"
     android:src="@drawable/arrow_left"
-    android:layout_height="fill_parent"
+    android:layout_height="match_parent"
     android:layout_width="30dip"
     android:clickable="true"
     android:layout_alignParentLeft="true"/>
@@ -32,22 +32,22 @@
     android:background="@drawable/arrow_bg"
     android:src="@drawable/arrow_right"
     android:layout_width="30dip"
-    android:layout_height="fill_parent"
+    android:layout_height="match_parent"
     android:clickable="true"
     android:layout_alignParentRight="true"/>
 
   <ViewFlipper android:id="@+id/candidate_flipper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:layout_toLeftOf="@id/arrow_right_btn"
     android:layout_toRightOf="@id/arrow_left_btn">
     <view class="com.android.inputmethod.pinyin.CandidateView"
         android:id="@+id/candidate_view1"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
     <view class="com.android.inputmethod.pinyin.CandidateView"
         android:id="@+id/candidate_view2"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
   </ViewFlipper>
 </com.android.inputmethod.pinyin.CandidatesContainer>