Merge heads

2013-10-30 11:16:07 +08:00
parent 7823ca4eec
commit 7cc1f878b4
12 changed files with 172 additions and 99 deletions
@@ -46,7 +46,7 @@ limitations under the License.
          android:id="@+id/track_edit_activity_type"
          android:imeOptions="actionNext"
          android:layout_gravity="bottom"
-          android:layout_height="fill_parent"
+          android:layout_height="match_parent"
          android:layout_weight="1"
          android:layout_width="0dp"
          style="@style/EditCategory" />