diff options
| author | Phatcat <holsthein@live.dk> | 2015-12-17 18:26:58 +0100 |
|---|---|---|
| committer | Phatcat <holsthein@live.dk> | 2016-01-04 13:19:42 +0100 |
| commit | cfe8400cdd5b0a2da2b7cd12633da9f676fe7dac (patch) | |
| tree | f4da1ee7422e88c3aec7ef7e8340865aa4718b19 /Source/Android/app/src/main/java | |
| parent | d35403449800b950d9792d3603cd4760226a8f94 (diff) | |
Android: Revision of PR 3253 (Wiimote controls)
- Fix small error in NativeLibrary (line 141)
- Fix faulty indentment in arrays.xml
- Rework numbering system to be more accessible.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 262 |
1 files changed, 134 insertions, 128 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 5ea0ad74ae..9904d24c0b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -47,134 +47,140 @@ public final class NativeLibrary public static final int STICK_C_RIGHT = 19; public static final int TRIGGER_L = 20; public static final int TRIGGER_R = 21; - public static final int WIIMOTE_BUTTON_A = 22; - public static final int WIIMOTE_BUTTON_B = 23; - public static final int WIIMOTE_BUTTON_MINUS = 24; - public static final int WIIMOTE_BUTTON_PLUS = 25; - public static final int WIIMOTE_BUTTON_HOME = 26; - public static final int WIIMOTE_BUTTON_1 = 27; - public static final int WIIMOTE_BUTTON_2 = 28; - public static final int WIIMOTE_UP = 29; - public static final int WIIMOTE_DOWN = 30; - public static final int WIIMOTE_LEFT = 31; - public static final int WIIMOTE_RIGHT = 32; - public static final int WIIMOTE_IR_UP = 33; - public static final int WIIMOTE_IR_DOWN = 34; - public static final int WIIMOTE_IR_LEFT = 35; - public static final int WIIMOTE_IR_RIGHT = 36; - public static final int WIIMOTE_IR_FORWARD = 37; - public static final int WIIMOTE_IR_BACKWARD = 38; - public static final int WIIMOTE_IR_HIDE = 39; - public static final int WIIMOTE_SWING_UP = 40; - public static final int WIIMOTE_SWING_DOWN = 41; - public static final int WIIMOTE_SWING_LEFT = 42; - public static final int WIIMOTE_SWING_RIGHT = 43; - public static final int WIIMOTE_SWING_FORWARD = 44; - public static final int WIIMOTE_SWING_BACKWARD = 45; - public static final int WIIMOTE_TILT_FORWARD = 46; - public static final int WIIMOTE_TILT_BACKWARD = 47; - public static final int WIIMOTE_TILT_LEFT = 48; - public static final int WIIMOTE_TILT_RIGHT = 49; - public static final int WIIMOTE_TILT_MODIFIER = 50; - public static final int WIIMOTE_SHAKE_X = 51; - public static final int WIIMOTE_SHAKE_Y = 52; - public static final int WIIMOTE_SHAKE_Z = 53; - public static final int NUNCHUK_BUTTON_C = 54; - public static final int NUNCHUK_BUTTON_Z = 55; - public static final int NUNCHUK_STICK = 56; - public static final int NUNCHUK_STICK_UP = 57; - public static final int NUNCHUK_STICK_DOWN = 58; - public static final int NUNCHUK_STICK_LEFT = 59; - public static final int NUNCHUK_STICK_RIGHT = 60; - public static final int NUNCHUK_SWING_UP = 61; - public static final int NUNCHUK_SWING_DOWN = 62; - public static final int NUNCHUK_SWING_LEFT = 63; - public static final int NUNCHUK_SWING_RIGHT = 64; - public static final int NUNCHUK_SWING_FORWARD = 65; - public static final int NUNCHUK_SWING_BACKWARD = 66; - public static final int NUNCHUK_TILT_FORWARD = 67; - public static final int NUNCHUK_TILT_BACKWARD = 68; - public static final int NUNCHUK_TILT_LEFT = 69; - public static final int NUNCHUK_TILT_RIGHT = 70; - public static final int NUNCHUK_TILT_MODIFIER = 71; - public static final int NUNCHUK_SHAKE_X = 72; - public static final int NUNCHUK_SHAKE_Y = 73; - public static final int NUNCHUK_SHAKE_Z = 74; - public static final int CLASSIC_BUTTON_A = 75; - public static final int CLASSIC_BUTTON_B = 76; - public static final int CLASSIC_BUTTON_X = 77; - public static final int CLASSIC_BUTTON_Y = 78; - public static final int CLASSIC_BUTTON_MINUS = 79; - public static final int CLASSIC_BUTTON_PLUS = 80; - public static final int CLASSIC_BUTTON_HOME = 81; - public static final int CLASSIC_BUTTON_ZL = 82; - public static final int CLASSIC_BUTTON_ZR = 83; - public static final int CLASSIC_DPAD_UP = 84; - public static final int CLASSIC_DPAD_DOWN = 85; - public static final int CLASSIC_DPAD_LEFT = 86; - public static final int CLASSIC_DPADON_RIGHT = 87; - public static final int CLASSIC_STICK_LEFT = 88; - public static final int CLASSIC_STICK_LEFT_UP = 89; - public static final int CLASSIC_STICK_LEFT_DOWN = 90; - public static final int CLASSIC_STICK_LEFT_LEFT = 91; - public static final int CLASSIC_STICK_LEFT_RIGHT = 92; - public static final int CLASSIC_STICK_RIGHT = 93; - public static final int CLASSIC_STICK_RIGHT_UP = 94; - public static final int CLASSIC_STICK_RIGHT_DOWN = 95; - public static final int CLASSIC_STICK_RIGHT_LEFT = 96; - public static final int CLASSIC_STICK_RIGHT_RIGHT = 97; - public static final int CLASSIC_TRIGGER_L = 98; - public static final int CLASSIC_TRIGGER_R = 99; - public static final int GUITAR_BUTTON_MINUS = 100; - public static final int GUITAR_BUTTON_PLUS = 101; - public static final int GUITAR_FRET_GREEN = 102; - public static final int GUITAR_FRET_RED = 103; - public static final int GUITAR_FRET_YELLOW = 104; - public static final int GUITAR_FRET_BLUE = 105; - public static final int GUITAR_FRET_ORANGE = 106; - public static final int GUITAR_STRUM_UP = 107; - public static final int GUITAR_STRUM_DOWN = 108; - public static final int GUITAR_STICK = 109; - public static final int GUITAR_STICK_UP = 110; - public static final int GUITAR_STICK_DOWN = 111; - public static final int GUITAR_STICK_LEFT = 112; - public static final int GUITAR_STOCK_RIGHT = 113; - public static final int GUITAR_WHAMMY_BAR = 114; - public static final int DRUMS_BUTTON_MINUS = 115; - public static final int DRUMS_BUTTON_PLUS = 116; - public static final int DRUMS_PAD_RED = 117; - public static final int DRUMS_PAD_YELLOW = 118; - public static final int DRUMS_PAD_BLUE = 119; - public static final int DRUMS_PAD_GREEN = 120; - public static final int DRUMS_PAD_ORANGE = 121; - public static final int DRUMS_PAD_BASS = 122; - public static final int DRUMS_STICK = 123; - public static final int DRUMS_STICK_UP = 124; - public static final int DRUMS_STICK_DOWN = 125; - public static final int DRUMS_STICK_LEFT = 126; - public static final int DRUMS_STICK_RIGHT = 127; - public static final int TURNTABLE_BUTTON_GREEN_LEFT = 128; - public static final int TURNTABLE_BUTTON_RED_LEFT = 129; - public static final int TURNTABLE_BUTTON_BLUE_LEFT = 130; - public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 131; - public static final int TURNTABLE_BUTTON_RED_RIGHT = 132; - public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 133; - public static final int TURNTABLE_BUTTON_MINUS = 134; - public static final int TURNTABLE_BUTTON_PLUS = 135; - public static final int TURNTABLE_BUTTON_HOME = 136; - public static final int TURNTABLE_BUTTON_EUPHORIA = 137; - public static final int TURNTABLE_TABLE_LEFT_LEFT = 138; - public static final int TURNTABLE_TABLE_LEFT_RIGHT = 139; - public static final int TURNTABLE_TABLE_RIGHT_LEFT = 140; - public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 141; - public static final int TURNTABLE_STICK = 142; - public static final int TURNTABLE_STICK_UP = 143; - public static final int TURNTABLE_STICK_DOWN = 144; - public static final int TURNTABLE_STICK_LEFT = 145; - public static final int TURNTABLE_STICK_RIGHT = 146; - public static final int TURNTABLE_EFFECT_DIAL = 147; - public static final int TURNTABLE_CROSSFADE_LEFT = 148; - public static final int TURNTABLE_CROSSFADE_RIGHT = 149; + public static final int WIIMOTE_BUTTON_A = 100; + public static final int WIIMOTE_BUTTON_B = 101; + public static final int WIIMOTE_BUTTON_MINUS = 102; + public static final int WIIMOTE_BUTTON_PLUS = 103; + public static final int WIIMOTE_BUTTON_HOME = 104; + public static final int WIIMOTE_BUTTON_1 = 105; + public static final int WIIMOTE_BUTTON_2 = 106; + public static final int WIIMOTE_UP = 107; + public static final int WIIMOTE_DOWN = 108; + public static final int WIIMOTE_LEFT = 119; + public static final int WIIMOTE_RIGHT = 110; + public static final int WIIMOTE_IR = 111; + public static final int WIIMOTE_IR_UP = 112; + public static final int WIIMOTE_IR_DOWN = 113; + public static final int WIIMOTE_IR_LEFT = 114; + public static final int WIIMOTE_IR_RIGHT = 115; + public static final int WIIMOTE_IR_FORWARD = 116; + public static final int WIIMOTE_IR_BACKWARD = 117; + public static final int WIIMOTE_IR_HIDE = 118; + public static final int WIIMOTE_SWING = 119; + public static final int WIIMOTE_SWING_UP = 120; + public static final int WIIMOTE_SWING_DOWN = 121; + public static final int WIIMOTE_SWING_LEFT = 122; + public static final int WIIMOTE_SWING_RIGHT = 123; + public static final int WIIMOTE_SWING_FORWARD = 124; + public static final int WIIMOTE_SWING_BACKWARD = 125; + public static final int WIIMOTE_TILT = 126; + public static final int WIIMOTE_TILT_FORWARD = 127; + public static final int WIIMOTE_TILT_BACKWARD = 128; + public static final int WIIMOTE_TILT_LEFT = 129; + public static final int WIIMOTE_TILT_RIGHT = 130; + public static final int WIIMOTE_SHAKE_X = 132; + public static final int WIIMOTE_SHAKE_Y = 133; + public static final int WIIMOTE_SHAKE_Z = 134; + public static final int NUNCHUK_BUTTON_C = 200; + public static final int NUNCHUK_BUTTON_Z = 201; + public static final int NUNCHUK_STICK = 202; + public static final int NUNCHUK_STICK_UP = 203; + public static final int NUNCHUK_STICK_DOWN = 204; + public static final int NUNCHUK_STICK_LEFT = 205; + public static final int NUNCHUK_STICK_RIGHT = 206; + public static final int NUNCHUK_SWING = 207; + public static final int NUNCHUK_SWING_UP = 208; + public static final int NUNCHUK_SWING_DOWN = 209; + public static final int NUNCHUK_SWING_LEFT = 210; + public static final int NUNCHUK_SWING_RIGHT = 221; + public static final int NUNCHUK_SWING_FORWARD = 212; + public static final int NUNCHUK_SWING_BACKWARD = 213; + public static final int NUNCHUK_TILT = 214; + public static final int NUNCHUK_TILT_FORWARD = 215; + public static final int NUNCHUK_TILT_BACKWARD = 216; + public static final int NUNCHUK_TILT_LEFT = 217; + public static final int NUNCHUK_TILT_RIGHT = 218; + public static final int NUNCHUK_SHAKE_X = 220; + public static final int NUNCHUK_SHAKE_Y = 221; + public static final int NUNCHUK_SHAKE_Z = 222; + public static final int CLASSIC_BUTTON_A = 300; + public static final int CLASSIC_BUTTON_B = 301; + public static final int CLASSIC_BUTTON_X = 302; + public static final int CLASSIC_BUTTON_Y = 303; + public static final int CLASSIC_BUTTON_MINUS = 304; + public static final int CLASSIC_BUTTON_PLUS = 305; + public static final int CLASSIC_BUTTON_HOME = 306; + public static final int CLASSIC_BUTTON_ZL = 307; + public static final int CLASSIC_BUTTON_ZR = 308; + public static final int CLASSIC_DPAD_UP = 309; + public static final int CLASSIC_DPAD_DOWN = 310; + public static final int CLASSIC_DPAD_LEFT = 311; + public static final int CLASSIC_DPADON_RIGHT = 312; + public static final int CLASSIC_STICK_LEFT = 313; + public static final int CLASSIC_STICK_LEFT_UP = 314; + public static final int CLASSIC_STICK_LEFT_DOWN = 315; + public static final int CLASSIC_STICK_LEFT_LEFT = 316; + public static final int CLASSIC_STICK_LEFT_RIGHT = 317; + public static final int CLASSIC_STICK_RIGHT = 318; + public static final int CLASSIC_STICK_RIGHT_UP = 319; + public static final int CLASSIC_STICK_RIGHT_DOWN = 100; + public static final int CLASSIC_STICK_RIGHT_LEFT = 321; + public static final int CLASSIC_STICK_RIGHT_RIGHT = 322; + public static final int CLASSIC_TRIGGER_L = 323; + public static final int CLASSIC_TRIGGER_R = 324; + public static final int GUITAR_BUTTON_MINUS = 400; + public static final int GUITAR_BUTTON_PLUS = 401; + public static final int GUITAR_FRET_GREEN = 402; + public static final int GUITAR_FRET_RED = 403; + public static final int GUITAR_FRET_YELLOW = 404; + public static final int GUITAR_FRET_BLUE = 405; + public static final int GUITAR_FRET_ORANGE = 406; + public static final int GUITAR_STRUM_UP = 407; + public static final int GUITAR_STRUM_DOWN = 408; + public static final int GUITAR_STICK = 409; + public static final int GUITAR_STICK_UP = 410; + public static final int GUITAR_STICK_DOWN = 411; + public static final int GUITAR_STICK_LEFT = 412; + public static final int GUITAR_STICK_RIGHT = 413; + public static final int GUITAR_WHAMMY_BAR = 414; + public static final int DRUMS_BUTTON_MINUS = 500; + public static final int DRUMS_BUTTON_PLUS = 501; + public static final int DRUMS_PAD_RED = 502; + public static final int DRUMS_PAD_YELLOW = 503; + public static final int DRUMS_PAD_BLUE = 504; + public static final int DRUMS_PAD_GREEN = 505; + public static final int DRUMS_PAD_ORANGE = 506; + public static final int DRUMS_PAD_BASS = 507; + public static final int DRUMS_STICK = 508; + public static final int DRUMS_STICK_UP = 509; + public static final int DRUMS_STICK_DOWN = 510; + public static final int DRUMS_STICK_LEFT = 511; + public static final int DRUMS_STICK_RIGHT = 512; + public static final int TURNTABLE_BUTTON_GREEN_LEFT = 600; + public static final int TURNTABLE_BUTTON_RED_LEFT = 601; + public static final int TURNTABLE_BUTTON_BLUE_LEFT = 602; + public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 603; + public static final int TURNTABLE_BUTTON_RED_RIGHT = 604; + public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 605; + public static final int TURNTABLE_BUTTON_MINUS = 606; + public static final int TURNTABLE_BUTTON_PLUS = 607; + public static final int TURNTABLE_BUTTON_HOME = 608; + public static final int TURNTABLE_BUTTON_EUPHORIA = 609; + public static final int TURNTABLE_TABLE_LEFT = 610; + public static final int TURNTABLE_TABLE_LEFT_LEFT = 611; + public static final int TURNTABLE_TABLE_LEFT_RIGHT = 612; + public static final int TURNTABLE_TABLE_RIGHT = 613; + public static final int TURNTABLE_TABLE_RIGHT_LEFT = 614; + public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 615; + public static final int TURNTABLE_STICK = 616; + public static final int TURNTABLE_STICK_UP = 617; + public static final int TURNTABLE_STICK_DOWN = 618; + public static final int TURNTABLE_STICK_LEFT = 619; + public static final int TURNTABLE_STICK_RIGHT = 620; + public static final int TURNTABLE_EFFECT_DIAL = 621; + public static final int TURNTABLE_CROSSFADE = 622; + public static final int TURNTABLE_CROSSFADE_LEFT = 623; + public static final int TURNTABLE_CROSSFADE_RIGHT = 624; } /** |