2
0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00

Add command line, fix typo, fix build with sdk13

This commit is contained in:
mittorn 2015-05-25 02:52:29 +07:00
parent 08f1b882c8
commit c9e93071c2
4 changed files with 9 additions and 9 deletions

View File

@ -5,8 +5,7 @@
<solid android:color="#805fd1e2"/>
<stroke
android:width="2dp"
android:color="@android:color/holo_blue_light" />
android:width="2dp" />
<padding
android:bottom="2dp"

View File

@ -493,7 +493,7 @@ public class ControlConfig implements Serializable{
else
infoTextView.setText("Press Button for: " + actionMontor.description);
infoTextView.setTextColor(ctx.getResources().getColor(android.R.color.holo_green_light));
infoTextView.setTextColor(ctx.getResources().getColor(0x01060014)); //holo_green_light
}
int[] axisTest = {
@ -555,7 +555,7 @@ public class ControlConfig implements Serializable{
if (Settings.DEBUG) Log.d(LOG,actionMontor.description + " = Analog (" + actionMontor.source + ")");
infoTextView.setText("Select Action");
infoTextView.setTextColor(ctx.getResources().getColor(android.R.color.holo_blue_light));
infoTextView.setTextColor(ctx.getResources().getColor(0x01060012)); //holo_blue_light
updated();
return true;
@ -583,7 +583,7 @@ public class ControlConfig implements Serializable{
actionMontor.sourceType = Type.BUTTON;
monitoring = false;
infoTextView.setText("CANCELED");
infoTextView.setTextColor(ctx.getResources().getColor(android.R.color.holo_red_light));
infoTextView.setTextColor(ctx.getResources().getColor(0x01060016)); //holo_red_light
updated();
return true;
@ -600,7 +600,8 @@ public class ControlConfig implements Serializable{
monitoring = false;
infoTextView.setText("Select Action");
infoTextView.setTextColor(ctx.getResources().getColor(android.R.color.holo_blue_light));
infoTextView.setTextColor(ctx.getResources().getColor(0x01060012)); //holo_blue_light
updated();
return true;

View File

@ -171,7 +171,7 @@ public class GamePadFragment extends Fragment{
info = (TextView)mainView.findViewById(R.id.gamepad_info_textview);
info.setText("Select Action");
info.setTextColor(getResources().getColor(android.R.color.holo_blue_light));
info.setTextColor(getResources().getColor(0x01060012)); //holo_blue_light
config.setTextView(getActivity(),info);

View File

@ -102,7 +102,7 @@ public class SDLActivity extends Activity {
protected String[] getLibraries() {
return new String[] {
"SDL2",
"touchcontrols"
"touchcontrols",
"xash"
};
}
@ -121,7 +121,7 @@ public class SDLActivity extends Activity {
* @return arguments for the native application.
*/
protected String[] getArguments() {
return new String[0];
return "-dev 3 -log -console".split(" ");
}
public static void initialize() {