Improved mDNS response

This commit is contained in:
Andrew Hennessy
2013-11-04 14:19:09 -05:00
15 changed files with 1107 additions and 244 deletions

View File

@@ -7,7 +7,16 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".Connection" >
<Button
android:id="@+id/pairButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/statusButton"
android:layout_centerHorizontal="true"
android:text="Pair with PC"/>
<<<<<<< HEAD
<ListView
android:id="@+id/mDNSResultView"
android:layout_width="fill_parent"
@@ -15,5 +24,24 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" >
</ListView>
=======
<EditText
android:id="@+id/hostTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:ems="10"
android:hint="IP address of GeForce PC" />
<Button
android:id="@+id/statusButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/hostTextView"
android:layout_centerHorizontal="true"
android:text="Start Streaming Steam!" />
>>>>>>> d7062ac2e0b306c42144c84690a3735c5878e11d
</RelativeLayout>