Add command line, fix typo, fix build with sdk13
This commit is contained in:
parent
08f1b882c8
commit
c9e93071c2
4 changed files with 9 additions and 9 deletions
|
@ -5,8 +5,7 @@
|
||||||
<solid android:color="#805fd1e2"/>
|
<solid android:color="#805fd1e2"/>
|
||||||
|
|
||||||
<stroke
|
<stroke
|
||||||
android:width="2dp"
|
android:width="2dp" />
|
||||||
android:color="@android:color/holo_blue_light" />
|
|
||||||
|
|
||||||
<padding
|
<padding
|
||||||
android:bottom="2dp"
|
android:bottom="2dp"
|
||||||
|
|
|
@ -493,7 +493,7 @@ public class ControlConfig implements Serializable{
|
||||||
else
|
else
|
||||||
infoTextView.setText("Press Button for: " + actionMontor.description);
|
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 = {
|
int[] axisTest = {
|
||||||
|
@ -555,7 +555,7 @@ public class ControlConfig implements Serializable{
|
||||||
if (Settings.DEBUG) Log.d(LOG,actionMontor.description + " = Analog (" + actionMontor.source + ")");
|
if (Settings.DEBUG) Log.d(LOG,actionMontor.description + " = Analog (" + actionMontor.source + ")");
|
||||||
|
|
||||||
infoTextView.setText("Select Action");
|
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();
|
updated();
|
||||||
return true;
|
return true;
|
||||||
|
@ -583,7 +583,7 @@ public class ControlConfig implements Serializable{
|
||||||
actionMontor.sourceType = Type.BUTTON;
|
actionMontor.sourceType = Type.BUTTON;
|
||||||
monitoring = false;
|
monitoring = false;
|
||||||
infoTextView.setText("CANCELED");
|
infoTextView.setText("CANCELED");
|
||||||
infoTextView.setTextColor(ctx.getResources().getColor(android.R.color.holo_red_light));
|
infoTextView.setTextColor(ctx.getResources().getColor(0x01060016)); //holo_red_light
|
||||||
|
|
||||||
updated();
|
updated();
|
||||||
return true;
|
return true;
|
||||||
|
@ -600,7 +600,8 @@ public class ControlConfig implements Serializable{
|
||||||
monitoring = false;
|
monitoring = false;
|
||||||
|
|
||||||
infoTextView.setText("Select Action");
|
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();
|
updated();
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -171,7 +171,7 @@ public class GamePadFragment extends Fragment{
|
||||||
|
|
||||||
info = (TextView)mainView.findViewById(R.id.gamepad_info_textview);
|
info = (TextView)mainView.findViewById(R.id.gamepad_info_textview);
|
||||||
info.setText("Select Action");
|
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);
|
config.setTextView(getActivity(),info);
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,7 @@ public class SDLActivity extends Activity {
|
||||||
protected String[] getLibraries() {
|
protected String[] getLibraries() {
|
||||||
return new String[] {
|
return new String[] {
|
||||||
"SDL2",
|
"SDL2",
|
||||||
"touchcontrols"
|
"touchcontrols",
|
||||||
"xash"
|
"xash"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ public class SDLActivity extends Activity {
|
||||||
* @return arguments for the native application.
|
* @return arguments for the native application.
|
||||||
*/
|
*/
|
||||||
protected String[] getArguments() {
|
protected String[] getArguments() {
|
||||||
return new String[0];
|
return "-dev 3 -log -console".split(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void initialize() {
|
public static void initialize() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue