ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5970 from JosJuice/android-trailing-spaces 

Remove trailing spaces from Android files
This commit is contained in:
Anthony 2017-09-09 08:59:50 -07:00 committed by GitHub
parent ce670c1851 7fa20cb1be
commit 8f7c6286f4
5 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -206,7 +206,7 @@ public final class NativeLibrary
/**
* Handles button press events for a gamepad.
*
*
* @param Device The input descriptor of the gamepad.
* @param Button Key code identifying which button was pressed.
* @param Action Mask identifying which action is happening (button pressed down, or button released).
@ -217,7 +217,7 @@ public final class NativeLibrary
/**
* Handles gamepad movement events.
*
*
* @param Device The device ID of the gamepad.
* @param Axis The axis ID
* @param Value The value of the axis represented by the given ID.
@ -226,19 +226,19 @@ public final class NativeLibrary
/**
* Gets a value from a key in the given ini-based config file.
*
*
* @param configFile The ini-based config file to get the value from.
* @param Section The section key that the actual key is in.
* @param Key The key to get the value from.
* @param Default The value to return in the event the given key doesn't exist.
*
*
* @return the value stored at the key, or a default value if it doesn't exist.
*/
public static native String GetConfig(String configFile, String Section, String Key, String Default);
/**
* Sets a value to a key in the given ini config file.
*
*
* @param configFile The ini-based config file to add the value to.
* @param Section The section key for the ini key
* @param Key The actual ini key to set.
@ -248,18 +248,18 @@ public final class NativeLibrary
/**
* Gets the embedded banner within the given ISO/ROM.
*
*
* @param filename the file path to the ISO/ROM.
*
*
* @return an integer array containing the color data for the banner.
*/
public static native int[] GetBanner(String filename);
/**
* Gets the embedded title of the given ISO/ROM.
*
*
* @param filename The file path to the ISO/ROM.
*
*
* @return the embedded title of the ISO/ROM.
*/
public static native String GetTitle(String filename);
@ -276,7 +276,7 @@ public final class NativeLibrary
/**
* Gets the Dolphin version string.
*
*
* @return the Dolphin version string.
*/
public static native String GetVersionString();

18
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
View File

@ -50,11 +50,11 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
/**
* Resizes a {@link Bitmap} by a given scale factor
*
*
* @param context The current {@link Context}
* @param bitmap The {@link Bitmap} to scale.
* @param scale The scale factor for the bitmap.
*
*
* @return The scaled {@link Bitmap}
*/
public static Bitmap resizeBitmap(Context context, Bitmap bitmap, float scale)
@ -72,7 +72,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
/**
* Constructor
*
*
* @param context The current {@link Context}.
* @param attrs {@link AttributeSet} for parsing XML attributes.
*/
@ -589,7 +589,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
/**
* Initializes an InputOverlayDrawableButton, given by resId, with all of the
* parameters set for it to be properly shown on the InputOverlay.
* parameters set for it to be properly shown on the InputOverlay.
* <p>
* This works due to the way the X and Y coordinates are stored within
* the {@link SharedPreferences}.
@ -610,12 +610,12 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
* Technically no modifications should need to be performed on the returned
* InputOverlayDrawableButton. Simply add it to the HashSet of overlay items and wait
* for Android to call the onDraw method.
*
*
* @param context The current {@link Context}.
* @param defaultResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Default State).
* @param pressedResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Pressed State).
* @param buttonId Identifier for determining what type of button the initialized InputOverlayDrawableButton represents.
*
*
* @return An {@link InputOverlayDrawableButton} with the correct drawing bounds set.
*
*/
@ -773,14 +773,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
}
/**
* Initializes an {@link InputOverlayDrawableJoystick}
*
* Initializes an {@link InputOverlayDrawableJoystick}
*
* @param context The current {@link Context}
* @param resOuter Resource ID for the outer image of the joystick (the static image that shows the circular bounds).
* @param defaultResInner Resource ID for the default inner image of the joystick (the one you actually move around).
* @param pressedResInner Resource ID for the pressed inner image of the joystick.
* @param joystick Identifier for which joystick this is.
*
*
* @return the initialized {@link InputOverlayDrawableJoystick}.
*/
private static InputOverlayDrawableJoystick initializeOverlayJoystick(Context context, int resOuter, int defaultResInner, int pressedResInner, int joystick)

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
View File

@ -50,7 +50,7 @@ public final class InputOverlayDrawableButton
/**
* Gets this InputOverlayDrawableButton's button ID.
*
*
* @return this InputOverlayDrawableButton's button ID.
*/
public int getId()

42
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
View File

@ -19,7 +19,7 @@ import javax.microedition.khronos.opengles.GL10;
/**
* Utility class that abstracts all the stuff about
* EGL initialization out of the way if all that is
* EGL initialization out of the way if all that is
* wanted is to query the underlying GL API for information.
*/
public final class EGLHelper
@ -52,7 +52,7 @@ public final class EGLHelper
* Initializes the underlying {@link EGLSurface} with a width and height of 1.
* This is useful if all you need to use this class for is to query information
* from specific API contexts.
*
*
* @param renderableType Bitmask indicating which types of client API contexts
* the framebuffer config must support.
*/
@ -63,9 +63,9 @@ public final class EGLHelper
/**
* Constructor
*
*
* @param width Width of the underlying {@link EGLSurface}.
* @param height Height of the underlying {@link EGLSurface}.
* @param height Height of the underlying {@link EGLSurface}.
* @param renderableType Bitmask indicating which types of client API contexts
* the framebuffer config must support.
*/
@ -101,7 +101,7 @@ public final class EGLHelper
/**
* Releases all resources associated with this helper.
* <p>
* This should be called whenever this helper is no longer needed.
* This should be called whenever this helper is no longer needed.
*/
public void closeHelper()
{
@ -115,7 +115,7 @@ public final class EGLHelper
* Index 1: Version <br/>
* Index 2: Renderer <br/>
* Index 3: Extensions <br/>
*
*
* @return information retrieved through EGL.
*/
public String[] getEGLInfo()
@ -130,7 +130,7 @@ public final class EGLHelper
/**
* Whether or not this device supports OpenGL.
*
*
* @return true if this device supports OpenGL; false otherwise.
*/
public boolean supportsOpenGL()
@ -142,7 +142,7 @@ public final class EGLHelper
* Whether or not this device supports OpenGL ES 2.
* <br/>
* Note that if this returns true, then OpenGL ES 1 is also supported.
*
*
* @return true if this device supports OpenGL ES 2; false otherwise.
*/
public boolean supportsGLES2()
@ -154,7 +154,7 @@ public final class EGLHelper
* Whether or not this device supports OpenGL ES 3.
* <br/>
* Note that if this returns true, then OpenGL ES 1 and 2 are also supported.
*
*
* @return true if this device supports OpenGL ES 3; false otherwise.
*/
public boolean supportsGLES3()
@ -164,7 +164,7 @@ public final class EGLHelper
/**
* Gets the underlying {@link EGL10} instance.
*
*
* @return the underlying {@link EGL10} instance.
*/
public EGL10 getEGL()
@ -174,7 +174,7 @@ public final class EGLHelper
/**
* Gets the underlying {@link GL10} instance.
*
*
* @return the underlying {@link GL10} instance.
*/
public GL10 getGL()
@ -184,7 +184,7 @@ public final class EGLHelper
/**
* Gets the underlying {@link EGLDisplay}.
*
*
* @return the underlying {@link EGLDisplay}
*/
public EGLDisplay getDisplay()
@ -194,7 +194,7 @@ public final class EGLHelper
/**
* Gets all supported framebuffer configurations for this device.
*
*
* @return all supported framebuffer configurations for this device.
*/
public EGLConfig[] getConfigs()
@ -204,7 +204,7 @@ public final class EGLHelper
/**
* Gets the underlying {@link EGLContext}.
*
*
* @return the underlying {@link EGLContext}.
*/
public EGLContext getContext()
@ -214,7 +214,7 @@ public final class EGLHelper
/**
* Gets the underlying {@link EGLSurface}.
*
*
* @return the underlying {@link EGLSurface}.
*/
public EGLSurface getSurface()
@ -319,9 +319,9 @@ public final class EGLHelper
* <li>GL_RENDERER - Name of the renderer</li>
* <li>GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language </li>
* </ul>
*
*
* @param glEnum A symbolic constant within {@link GL10}.
*
*
* @return the string information represented by {@code glEnum}.
*/
public String glGetString(int glEnum)
@ -340,10 +340,10 @@ public final class EGLHelper
* <li>GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language </li>
* <li>GL_EXTENSIONS - Extension string supported by the implementation at {@code index}.</li>
* </ul>
*
*
* @param glEnum A symbolic GL constant
* @param index The index of the string to return.
*
*
* @return the string information represented by {@code glEnum} and {@code index}.
*/
public String glGetStringi(int glEnum, int index)
@ -376,9 +376,9 @@ public final class EGLHelper
/**
* Simplified call to {@link GL10#glGetIntegerv(int, int[], int)
*
*
* @param glEnum A symbolic GL constant.
*
*
* @return the integer information represented by {@code glEnum}.
*/
public int glGetInteger(int glEnum)

2
Source/Android/app/src/main/res/values/strings.xml
View File

@ -230,7 +230,7 @@
<string name="emulation_control_scale">Adjust Scale</string>
<string name="emulation_choose_controller">Choose Controller</string>
<string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>
<!-- GC Adapter Menu-->
<string name="gc_adapter_rumble">Enable Vibration</string>
<string name="gc_adapter_rumble_description">Enable the vibration function for this GameCube controller.</string>