merge heads

This commit is contained in:
Jimmy Shih
2012-04-11 10:11:53 -07:00
parent 0cd11c799d
commit a3e69df3ff
23 changed files with 679 additions and 562 deletions
+3 -9
View File
@@ -92,20 +92,14 @@ limitations under the License.
/>
</LinearLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<LinearLayout style="@style/BottomBar" >
<Button
android:id="@+id/track_edit_save"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"
/>
style="@style/BottomButton" />
<Button
android:id="@+id/track_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"
/>
<LinearLayout style="@style/ButtonSpacer"/>
style="@style/BottomButton" />
</LinearLayout>
</LinearLayout>