[Android] Format all Java files to be consistent.
This commit is contained in:
parent
f09cafb2be
commit
7c99b0650b
|
@ -21,8 +21,8 @@ import org.dolphinemu.dolphinemu.settings.UserPreferences;
|
||||||
|
|
||||||
public final class DolphinEmulator<MainActivity> extends Activity
|
public final class DolphinEmulator<MainActivity> extends Activity
|
||||||
{
|
{
|
||||||
static private NativeGLSurfaceView GLview = null;
|
private static NativeGLSurfaceView GLview = null;
|
||||||
static private boolean Running = false;
|
private static boolean Running = false;
|
||||||
|
|
||||||
private float screenWidth;
|
private float screenWidth;
|
||||||
private float screenHeight;
|
private float screenHeight;
|
||||||
|
|
|
@ -6,9 +6,9 @@ import android.view.SurfaceView;
|
||||||
|
|
||||||
public final class NativeGLSurfaceView extends SurfaceView
|
public final class NativeGLSurfaceView extends SurfaceView
|
||||||
{
|
{
|
||||||
static private Thread myRun;
|
private static Thread myRun;
|
||||||
static private boolean Running = false;
|
private static boolean Running = false;
|
||||||
static private boolean Created = false;
|
private static boolean Created = false;
|
||||||
|
|
||||||
public NativeGLSurfaceView(Context context)
|
public NativeGLSurfaceView(Context context)
|
||||||
{
|
{
|
||||||
|
@ -23,7 +23,8 @@ public final class NativeGLSurfaceView extends SurfaceView
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
getHolder().addCallback(new SurfaceHolder.Callback() {
|
getHolder().addCallback(new SurfaceHolder.Callback()
|
||||||
|
{
|
||||||
public void surfaceCreated(SurfaceHolder holder)
|
public void surfaceCreated(SurfaceHolder holder)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
|
@ -82,7 +82,6 @@ public final class FolderBrowserAdapter extends ArrayAdapter<FolderBrowserItem>
|
||||||
iconView.setImageResource(R.drawable.ic_menu_file);
|
iconView.setImageResource(R.drawable.ic_menu_file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ public final class FolderBrowserItem implements Comparable<FolderBrowserItem>
|
||||||
/**
|
/**
|
||||||
* Constructor. Initializes a FolderBrowserItem with an empty subtitle.
|
* Constructor. Initializes a FolderBrowserItem with an empty subtitle.
|
||||||
*
|
*
|
||||||
* @param ctx Context this FolderBrowserItem is being used in.
|
|
||||||
* @param name The name of the file/folder represented by this item.
|
* @param name The name of the file/folder represented by this item.
|
||||||
* @param path The path of the file/folder represented by this item.
|
* @param path The path of the file/folder represented by this item.
|
||||||
* @param isValid Whether or not this item represents a file type that can be handled.
|
* @param isValid Whether or not this item represents a file type that can be handled.
|
||||||
|
|
|
@ -271,5 +271,4 @@ public final class GameListActivity extends Activity
|
||||||
|
|
||||||
return super.dispatchKeyEvent(event);
|
return super.dispatchKeyEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,6 @@ public final class GameListItem implements Comparable<GameListItem>
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,6 +51,7 @@ public final class InputConfigFragment extends Fragment
|
||||||
return fakeid;
|
return fakeid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
|
||||||
{
|
{
|
||||||
|
@ -116,7 +117,7 @@ public final class InputConfigFragment extends Fragment
|
||||||
// Called from GameListActivity
|
// Called from GameListActivity
|
||||||
public boolean onMotionEvent(MotionEvent event)
|
public boolean onMotionEvent(MotionEvent event)
|
||||||
{
|
{
|
||||||
if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0))
|
if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
InputDevice input = event.getDevice();
|
InputDevice input = event.getDevice();
|
||||||
|
|
|
@ -41,7 +41,7 @@ public final class InputConfigItem implements Comparable<InputConfigItem>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor that creates an InputConfigItem
|
* Constructor that creates an InputConfigItem
|
||||||
* that has a default binding of "None"
|
* that has a default binding of "None".
|
||||||
*
|
*
|
||||||
* @param name Name of the input config item.
|
* @param name Name of the input config item.
|
||||||
* @param config Name of the key in the configuration file that this control modifies.
|
* @param config Name of the key in the configuration file that this control modifies.
|
||||||
|
@ -72,7 +72,7 @@ public final class InputConfigItem implements Comparable<InputConfigItem>
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the currently set binding of this InputConfigItem
|
* Gets the currently set binding of this InputConfigItem.
|
||||||
*
|
*
|
||||||
* @return the currently set binding of this InputConfigItem
|
* @return the currently set binding of this InputConfigItem
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
package org.dolphinemu.dolphinemu.settings;
|
package org.dolphinemu.dolphinemu.settings;
|
||||||
|
|
||||||
import org.dolphinemu.dolphinemu.R;
|
import org.dolphinemu.dolphinemu.R;
|
||||||
|
import org.dolphinemu.dolphinemu.inputconfig.InputConfigFragment;
|
||||||
|
|
||||||
import android.app.ActionBar;
|
import android.app.ActionBar;
|
||||||
import android.app.ActionBar.Tab;
|
import android.app.ActionBar.Tab;
|
||||||
|
@ -72,8 +73,8 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
||||||
// the TabListener interface, as the callback (listener) for when
|
// the TabListener interface, as the callback (listener) for when
|
||||||
// this tab is selected.
|
// this tab is selected.
|
||||||
actionBar.addTab(actionBar.newTab().setText(R.string.cpu_settings).setTabListener(this));
|
actionBar.addTab(actionBar.newTab().setText(R.string.cpu_settings).setTabListener(this));
|
||||||
|
actionBar.addTab(actionBar.newTab().setText("Input Settings").setTabListener(this));
|
||||||
actionBar.addTab(actionBar.newTab().setText(R.string.video_settings).setTabListener(this));
|
actionBar.addTab(actionBar.newTab().setText(R.string.video_settings).setTabListener(this));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onTabReselected(Tab arg0, FragmentTransaction arg1)
|
public void onTabReselected(Tab arg0, FragmentTransaction arg1)
|
||||||
|
@ -96,9 +97,8 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
||||||
* A {@link FragmentPagerAdapter} that returns a fragment corresponding to one of the
|
* A {@link FragmentPagerAdapter} that returns a fragment corresponding to one of the
|
||||||
* sections/tabs/pages.
|
* sections/tabs/pages.
|
||||||
*/
|
*/
|
||||||
public class SectionsPagerAdapter extends FragmentPagerAdapter
|
public final class SectionsPagerAdapter extends FragmentPagerAdapter
|
||||||
{
|
{
|
||||||
|
|
||||||
public SectionsPagerAdapter(FragmentManager fm)
|
public SectionsPagerAdapter(FragmentManager fm)
|
||||||
{
|
{
|
||||||
super(fm);
|
super(fm);
|
||||||
|
@ -113,6 +113,9 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
||||||
return new CPUSettingsFragment();
|
return new CPUSettingsFragment();
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
|
return new InputConfigFragment();
|
||||||
|
|
||||||
|
case 2:
|
||||||
return new VideoSettingsFragment();
|
return new VideoSettingsFragment();
|
||||||
|
|
||||||
default: // Should never happen.
|
default: // Should never happen.
|
||||||
|
@ -124,7 +127,7 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
||||||
public int getCount()
|
public int getCount()
|
||||||
{
|
{
|
||||||
// Show total pages.
|
// Show total pages.
|
||||||
return 2;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -136,6 +139,9 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
||||||
return getString(R.string.cpu_settings).toUpperCase();
|
return getString(R.string.cpu_settings).toUpperCase();
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
|
return "Input Settings";//getString(R.string)
|
||||||
|
|
||||||
|
case 2:
|
||||||
return getString(R.string.video_settings).toUpperCase();
|
return getString(R.string.video_settings).toUpperCase();
|
||||||
|
|
||||||
default: // Should never happen.
|
default: // Should never happen.
|
||||||
|
|
|
@ -27,7 +27,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
|
||||||
{
|
{
|
||||||
private Activity m_activity;
|
private Activity m_activity;
|
||||||
|
|
||||||
static public class VersionCheck
|
public static class VersionCheck
|
||||||
{
|
{
|
||||||
EGL10 mEGL;
|
EGL10 mEGL;
|
||||||
EGLDisplay mEGLDisplay;
|
EGLDisplay mEGLDisplay;
|
||||||
|
@ -107,7 +107,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static public boolean SupportsGLES3()
|
public static boolean SupportsGLES3()
|
||||||
{
|
{
|
||||||
VersionCheck mbuffer = new VersionCheck();
|
VersionCheck mbuffer = new VersionCheck();
|
||||||
String m_GLVersion = mbuffer.getVersion();
|
String m_GLVersion = mbuffer.getVersion();
|
||||||
|
|
Loading…
Reference in New Issue