From ddf9284ece6fadace125e6e02b9b7cddc85038a0 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 30 Jun 2014 01:14:46 -0700 Subject: [PATCH 1/9] Add a Quit Steam button --- gen/com/limelight/R.java | 29 +++++++------ res/layout/activity_connection.xml | 49 ++++++++++++--------- src/com/limelight/Connection.java | 70 +++++++++++++++++++++++++++++- 3 files changed, 113 insertions(+), 35 deletions(-) diff --git a/gen/com/limelight/R.java b/gen/com/limelight/R.java index 45009940..c29d1047 100644 --- a/gen/com/limelight/R.java +++ b/gen/com/limelight/R.java @@ -37,21 +37,22 @@ or to a theme attribute in the form "?[package:][type:]na public static final int ouya_icon=0x7f020002; } public static final class id { - public static final int autoDec=0x7f080006; - public static final int bitrateLabel=0x7f08000c; - public static final int bitrateSeekBar=0x7f08000d; - public static final int config1080p30Selected=0x7f08000a; - public static final int config1080p60Selected=0x7f08000b; - public static final int config720p30Selected=0x7f080008; - public static final int config720p60Selected=0x7f080009; - public static final int decoderConfigGroup=0x7f080003; - public static final int hardwareDec=0x7f080007; + public static final int autoDec=0x7f080004; + public static final int bitrateLabel=0x7f08000b; + public static final int bitrateSeekBar=0x7f08000c; + public static final int config1080p30Selected=0x7f080009; + public static final int config1080p60Selected=0x7f08000a; + public static final int config720p30Selected=0x7f080007; + public static final int config720p60Selected=0x7f080008; + public static final int decoderConfigGroup=0x7f080001; + public static final int hardwareDec=0x7f080005; public static final int hostTextView=0x7f080000; - public static final int pairButton=0x7f080002; - public static final int softwareDec=0x7f080005; - public static final int statusButton=0x7f080001; - public static final int streamConfigGroup=0x7f080004; - public static final int surfaceView=0x7f08000e; + public static final int pairButton=0x7f080006; + public static final int quitButton=0x7f08000e; + public static final int softwareDec=0x7f080003; + public static final int statusButton=0x7f08000d; + public static final int streamConfigGroup=0x7f080002; + public static final int surfaceView=0x7f08000f; } public static final class layout { public static final int activity_connection=0x7f030000; diff --git a/res/layout/activity_connection.xml b/res/layout/activity_connection.xml index f9d4120c..8ce33e8d 100644 --- a/res/layout/activity_connection.xml +++ b/res/layout/activity_connection.xml @@ -24,26 +24,6 @@ android:inputType="textNoSuggestions" android:hint="IP address of GeForce PC" /> - - - + +