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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 CYenk- diff --git a/res/layout/activity_app_view.xml b/res/layout/activity_app_view.xml index 7345bbe9..4380fab4 100644 --- a/res/layout/activity_app_view.xml +++ b/res/layout/activity_app_view.xml @@ -29,7 +29,7 @@ android:layout_centerHorizontal="true" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_alignParentTop="true" - android:paddingTop="10dp" + android:paddingTop="0dp" android:paddingBottom="10dp" android:text="Applications" /> 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" /> + +