mirror-github-bspeice/itcs4180
1
0
Fork 0
mirror of https://github.com/bspeice/itcs4180 synced 2025-11-03 18:00:37 -05:00
Code Issues Releases Wiki Activity

Switch the PhotoActivity to the MainActivity

Browse Source
This commit is contained in:
DjBushido
2014-03-18 20:36:22 -04:00
parent 0e90b852c9
commit c9941fd0e4
4 changed files with 168 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
HW4/res/layout/activity_main.xml
View File

@ -1,32 +1,28 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_async"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".MainActivity" >
<GridView
android:id="@+id/grid_async"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:columnWidth="90dp"
android:numColumns="@integer/column_count" />
<Button
android:id="@+id/btnThread"
android:layout_width="wrap_content"
android:id="@+id/btn_exit_async"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/btnAsync"
android:layout_alignParentTop="true"
android:layout_alignRight="@+id/btnAsync"
android:layout_marginTop="100dp"
android:onClick="onClick"
android:text="Generate Image Thread" />
android:layout_gravity="bottom"
android:text="@string/exit_button_text" />
<Button
android:id="@+id/btnAsync"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/btnThread"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:onClick="onClick"
android:text="Generate Image AsyncTask" />
</RelativeLayout>
</LinearLayout>

28
HW4/res/layout/activity_photo.xml
View File

@ -1,28 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_async"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".PhotoActivity" >
<GridView
android:id="@+id/grid_async"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:columnWidth="90dp"
android:numColumns="@integer/column_count" />
<Button
android:id="@+id/btn_exit_async"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:text="@string/exit_button_text" />
</LinearLayout>