moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-08 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into root

Browse Source 
Conflicts:
	AndroidManifest.xml
	libs/limelight-common.jar
	res/values/strings.xml
This commit is contained in:
Cameron Gutman
2014-10-17 13:55:45 -07:00
parent 8efe194682 b492ac43f8
commit a18aa51f5a
92 changed files with 417 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
gen/com/limelight/root/R.java
View File

@@ -18,9 +18,6 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
*/
public static final int buttonBarStyle=0x7f010000;
}
public static final class color {
public static final int black_overlay=0x7f040000;
}
public static final class dimen {
/** Default screen margins, per the Android Design guidelines.
@@ -28,40 +25,43 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
*/
public static final int activity_horizontal_margin=0x7f050000;
public static final int activity_vertical_margin=0x7f050001;
public static final int activity_horizontal_margin=0x7f040000;
public static final int activity_vertical_margin=0x7f040001;
}
public static final class drawable {
public static final int app_icon=0x7f020000;
public static final int ic_launcher=0x7f020001;
public static final int list_view_unselected=0x7f020002;
public static final int ouya_icon=0x7f020003;
public static final int atv_banner=0x7f020001;
public static final int ic_launcher=0x7f020002;
public static final int list_view_unselected=0x7f020003;
public static final int ouya_icon=0x7f020004;
}
public static final class id {
public static final int addPc=0x7f080001;
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=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 disableToasts=0x7f080014;
public static final int discoveryText=0x7f08000b;
public static final int enableSops=0x7f080016;
public static final int hardwareDec=0x7f080005;
public static final int hostTextView=0x7f080000;
public static final int manuallyAddPc=0x7f08000c;
public static final int pcListView=0x7f080008;
public static final int rowTextView=0x7f080017;
public static final int settingsButton=0x7f08000d;
public static final int softwareDec=0x7f080003;
public static final int streamConfigGroup=0x7f08000e;
public static final int stretchToFill=0x7f080015;
public static final int surfaceView=0x7f08000a;
public static final int addPc=0x7f070001;
public static final int advancedSettingsButton=0x7f070015;
public static final int advancedSettingsText=0x7f070002;
public static final int appListText=0x7f07000a;
public static final int autoDec=0x7f070005;
public static final int bitrateLabel=0x7f070007;
public static final int bitrateSeekBar=0x7f070008;
public static final int config1080p30Selected=0x7f070013;
public static final int config1080p60Selected=0x7f070014;
public static final int config720p30Selected=0x7f070011;
public static final int config720p60Selected=0x7f070012;
public static final int decoderConfigGroup=0x7f070003;
public static final int disableToasts=0x7f070016;
public static final int discoveryText=0x7f07000c;
public static final int enableSops=0x7f070018;
public static final int hardwareDec=0x7f070006;
public static final int hostTextView=0x7f070000;
public static final int manuallyAddPc=0x7f07000d;
public static final int pcListView=0x7f070009;
public static final int rowTextView=0x7f070019;
public static final int settingsButton=0x7f07000e;
public static final int softwareDec=0x7f070004;
public static final int streamConfigGroup=0x7f070010;
public static final int streamSettingsText=0x7f07000f;
public static final int stretchToFill=0x7f070017;
public static final int surfaceView=0x7f07000b;
}
public static final class layout {
public static final int activity_add_computer_manually=0x7f030000;
@@ -73,8 +73,34 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int simplerow=0x7f030006;
}
public static final class string {
public static final int app_name=0x7f060000;
public static final int title_activity_game=0x7f060001;
/** General strings
*/
public static final int app_name=0x7f050000;
/** Add computer manually activity
*/
public static final int button_add_pc=0x7f050005;
public static final int button_add_pc_manually=0x7f050004;
public static final int button_advanced_settings=0x7f050007;
public static final int button_stream_settings=0x7f050003;
public static final int check_disableToasts=0x7f05000e;
public static final int check_enableSops=0x7f05000d;
public static final int check_stretchToFill=0x7f05000c;
public static final int ip_hint=0x7f050001;
public static final int radio_1080p30=0x7f05000a;
public static final int radio_1080p60=0x7f05000b;
public static final int radio_720p30=0x7f050008;
public static final int radio_720p60=0x7f050009;
public static final int radio_autoSelect=0x7f050010;
public static final int radio_forceHardware=0x7f050011;
/** Advanced settings activity
*/
public static final int radio_forceSoftware=0x7f05000f;
/** PC view activity
*/
public static final int title_pc_view=0x7f050002;
/** Stream settings activity
*/
public static final int title_streaming_settings=0x7f050006;
}
public static final class style {
/**
@@ -89,27 +115,25 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
API 11 theme customizations can go here.
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
API 14 theme customizations can go here.
Base application theme for API 21+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 21+ devices.
API 21 theme customizations can go here.
*/
public static final int AppBaseTheme=0x7f070000;
public static final int AppBaseTheme=0x7f060000;
/** Application theme.
All customizations that are NOT specific to a particular API-level can go here.
*/
public static final int AppTheme=0x7f070001;
public static final int ButtonBar=0x7f070003;
public static final int ButtonBarButton=0x7f070004;
public static final int FullscreenActionBarStyle=0x7f070005;
public static final int FullscreenTheme=0x7f070002;
public static final int AppTheme=0x7f060001;
public static final int ButtonBar=0x7f060003;
public static final int ButtonBarButton=0x7f060004;
public static final int FullscreenTheme=0x7f060002;
}
public static final class styleable {
/**