From 887dd9aa2196dde83ad00dfe02b8a3dc8197ff90 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 21 Jul 2014 23:58:20 -0700 Subject: [PATCH] Add GFE settings optimization checkbox. Move Add PC button to the main screen. --- AndroidManifest.xml | 2 +- gen/com/limelight/R.java | 21 ++++++------ libs/limelight-common.jar | Bin 410676 -> 410807 bytes res/layout/activity_app_view.xml | 2 +- res/layout/activity_pc_view.xml | 12 +++++-- res/layout/activity_stream_settings.xml | 18 +++++----- src/com/limelight/AppView.java | 43 +++++++++++++++++++++--- src/com/limelight/Game.java | 8 +++-- src/com/limelight/PcView.java | 13 +++++-- src/com/limelight/StreamSettings.java | 21 ++++++------ 10 files changed, 99 insertions(+), 41 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5099010a..ebe56267 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -59,7 +59,7 @@ android:label="Add Computer Manually" > + android:value="com.limelight.PcView" /> ?[package:][type:]na } public static final class id { public static final int addPc=0x7f080001; - public static final int advancedSettingsButton=0x7f080012; + public static final int advancedSettingsButton=0x7f080013; public static final int appListText=0x7f080009; public static final int autoDec=0x7f080004; public static final int bitrateLabel=0x7f080006; public static final int bitrateSeekBar=0x7f080007; - public static final int config1080p30Selected=0x7f080010; - public static final int config1080p60Selected=0x7f080011; - public static final int config720p30Selected=0x7f08000e; - public static final int config720p60Selected=0x7f08000f; + public static final int config1080p30Selected=0x7f080011; + public static final int config1080p60Selected=0x7f080012; + public static final int config720p30Selected=0x7f08000f; + public static final int config720p60Selected=0x7f080010; public static final int decoderConfigGroup=0x7f080002; public static final int discoveryText=0x7f08000b; + public static final int enableSops=0x7f080014; public static final int hardwareDec=0x7f080005; public static final int hostTextView=0x7f080000; - public static final int manuallyAddPc=0x7f080014; + public static final int manuallyAddPc=0x7f08000c; public static final int pcListView=0x7f080008; - public static final int rowTextView=0x7f080015; - public static final int settingsButton=0x7f08000c; + public static final int rowTextView=0x7f080016; + public static final int settingsButton=0x7f08000d; public static final int softwareDec=0x7f080003; - public static final int streamConfigGroup=0x7f08000d; - public static final int stretchToFill=0x7f080013; + public static final int streamConfigGroup=0x7f08000e; + public static final int stretchToFill=0x7f080015; public static final int surfaceView=0x7f08000a; } public static final class layout { diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar index 92d351574d85cb62db935c480ffd1b345222942f..07665864fb20e61978c535ac4eb99864e99abddb 100644 GIT binary patch delta 17918 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 diff --git a/res/layout/activity_pc_view.xml b/res/layout/activity_pc_view.xml index b7e68289..d4ac8c3f 100644 --- a/res/layout/activity_pc_view.xml +++ b/res/layout/activity_pc_view.xml @@ -29,8 +29,8 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_below="@+id/settingsButton" - android:paddingTop="20dp" + android:layout_below="@+id/manuallyAddPc" + android:paddingTop="10dp" android:paddingBottom="10dp" android:text="Discovered PC List" /> @@ -41,5 +41,13 @@ android:layout_centerHorizontal="true" android:layout_alignParentTop="true" android:text="Streaming Settings" /> + +