Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -61,7 +61,7 @@ limitations under the License.
      android:layout_height="0dp"
      android:layout_weight="10"
      android:layout_width="match_parent"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
    <View
      android:layout_height="0dp"
      android:layout_weight="1"
@@ -30,7 +30,6 @@ limitations under the License.
    android:layout_weight="1.0"
    android:layout_width="0dp"
    android:text="@string/track_list_empty_message"
-    android:visibility="gone"
    style="@style/ListEmptyTextView" >
  </TextView>
 </LinearLayout>