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 #4373 from SeannyM/android-cleanup 

Android: Cleanup
This commit is contained in:
Markus Wick 2016-10-25 22:52:04 +02:00 committed by GitHub
parent 9e21ac8607 9eb0ab936f
commit f1dd0bda3b
65 changed files with 302 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/app/src/main/AndroidManifest.xml
View File

@ -64,10 +64,6 @@
android:name=".activities.EmulationActivity"
android:theme="@style/DolphinEmulationGamecube"/>
<activity
android:name=".activities.OverlayConfigActivity"
android:theme="@style/DolphinSettingsGamecube"/>
<service android:name=".services.AssetCopyService"/>

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
View File

@ -4,7 +4,6 @@ import android.app.Application;
import org.dolphinemu.dolphinemu.model.GameDatabase;
public class DolphinApplication extends Application
{
public static GameDatabase databaseHelper;

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

@ -6,7 +6,6 @@
package org.dolphinemu.dolphinemu;
import android.view.Surface;
import android.widget.Toast;
@ -289,16 +288,8 @@ public final class NativeLibrary
*/
public static native String GetVersionString();
/**
* Returns if the phone supports NEON or not
*
* @return true if it supports NEON, false otherwise.
*/
public static native boolean SupportsNEON();
/**
* Saves a screen capture of the game
*
*/
public static native void SaveScreenShot();
@ -361,21 +352,6 @@ public final class NativeLibrary
*/
public static native void WriteProfileResults();
/**
* @return If we have an alert
*/
public static native boolean HasAlertMsg();
/**
* @return The alert string
*/
public static native String GetAlertMsg();
/**
* Clears event in the JNI so we can continue onward
*/
public static native void ClearAlertMsg();
/** Native EGL functions not exposed by Java bindings **/
public static native void eglBindAPI(int api);

88
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -121,8 +121,7 @@ public final class EmulationActivity extends AppCompatActivity
getSupportActionBar().hide();
}
}
}
);
});
}
else
{
@ -408,7 +407,8 @@ public final class EmulationActivity extends AppCompatActivity
{
// Edit the placement of the controls
case R.id.menu_emulation_edit_layout:
EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager().findFragmentById(R.id.frame_emulation_fragment);
EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager()
.findFragmentById(R.id.frame_emulation_fragment);
if (emulationFragment.isConfiguringControls())
{
emulationFragment.stopConfiguringControls();
@ -434,13 +434,13 @@ public final class EmulationActivity extends AppCompatActivity
}
builder.setMultiChoiceItems(R.array.gcpadButtons, enabledButtons,
new DialogInterface.OnMultiChoiceClickListener()
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleGc" + indexSelected, isChecked);
}
});
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleGc" + indexSelected, isChecked);
}
});
}
else if (mPreferences.getInt("wiiController", 3) == 4)
{
@ -450,13 +450,13 @@ public final class EmulationActivity extends AppCompatActivity
}
builder.setMultiChoiceItems(R.array.classicButtons, enabledButtons,
new DialogInterface.OnMultiChoiceClickListener()
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleClassic" + indexSelected, isChecked);
}
});
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleClassic" + indexSelected, isChecked);
}
});
}
else
{
@ -468,25 +468,25 @@ public final class EmulationActivity extends AppCompatActivity
{
builder.setMultiChoiceItems(R.array.nunchukButtons, enabledButtons,
new DialogInterface.OnMultiChoiceClickListener()
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
}
});
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
}
});
}
else
{
builder.setMultiChoiceItems(R.array.wiimoteButtons, enabledButtons,
new DialogInterface.OnMultiChoiceClickListener()
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
}
});
{
@Override
public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
{
editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
}
});
}
}
builder.setNeutralButton(getString(R.string.emulation_toggle_all), new DialogInterface.OnClickListener()
@ -499,7 +499,7 @@ public final class EmulationActivity extends AppCompatActivity
emulationFragment.toggleInputOverlayVisibility();
}
});
builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialogInterface, int i)
@ -552,7 +552,7 @@ public final class EmulationActivity extends AppCompatActivity
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.emulation_control_scale);
builder.setView(view);
builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialogInterface, int i)
@ -580,17 +580,17 @@ public final class EmulationActivity extends AppCompatActivity
builder.setTitle(R.string.emulation_choose_controller);
builder.setSingleChoiceItems(R.array.controllersEntries, mPreferences.getInt("wiiController", 3),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int indexSelected)
{
editor.putInt("wiiController", indexSelected);
{
@Override
public void onClick(DialogInterface dialog, int indexSelected)
{
editor.putInt("wiiController", indexSelected);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
getResources().getStringArray(R.array.controllersValues)[indexSelected]);
}
});
builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
getResources().getStringArray(R.array.controllersValues)[indexSelected]);
}
});
builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialogInterface, int i)
@ -619,7 +619,7 @@ public final class EmulationActivity extends AppCompatActivity
NativeLibrary.SaveScreenShot();
return;
// Quicksave / Load
// Quick save / load
case R.id.menu_quicksave:
NativeLibrary.SaveState(9);
return;

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.adapters;
import android.app.Fragment;
import android.app.FragmentManager;
import android.content.Context;
@ -17,10 +16,11 @@ public class PlatformPagerAdapter extends FragmentPagerAdapter
{
private Context mContext;
private final static int[] TAB_ICONS = {
private final static int[] TAB_ICONS =
{
R.drawable.ic_gamecube,
R.drawable.ic_wii,
R.drawable.ic_folder// wiiware TODO Have an icon here.
R.drawable.ic_folder // WiiWare TODO Have an icon here.
};
public PlatformPagerAdapter(FragmentManager fm, Context context)

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.adapters;
import android.content.res.Resources;
import android.support.v17.leanback.widget.ImageCardView;
import android.support.v17.leanback.widget.Presenter;
@ -44,4 +43,4 @@ public final class SettingsRowPresenter extends Presenter
{
// no op
}
}
}

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.dialogs;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
@ -63,7 +62,7 @@ public final class GameDetailsDialog extends DialogFragment
FloatingActionButton buttonLaunch = (FloatingActionButton) contents.findViewById(R.id.button_launch);
int countryIndex = getArguments().getInt(ARGUMENT_GAME_COUNTRY);
String country = getResources().getStringArray(R.array.country_names)[countryIndex];
String country = getResources().getStringArray(R.array.countryNames)[countryIndex];
textTitle.setText(getArguments().getString(ARGUMENT_GAME_TITLE));
textDescription.setText(getArguments().getString(ARGUMENT_GAME_DESCRIPTION));

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
View File

@ -175,4 +175,4 @@ public final class MotionAlertDialog extends AlertDialog
dismiss();
}
}
}

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -18,7 +18,6 @@ import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.overlay.InputOverlay;
import org.dolphinemu.dolphinemu.utils.Log;
public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback
{
public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".emulation_fragment";
@ -36,7 +35,6 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
private boolean mEmulationStarted;
private boolean mEmulationRunning;
public static EmulationFragment newInstance(String path)
{
EmulationFragment fragment = new EmulationFragment();

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.model;
import org.dolphinemu.dolphinemu.NativeLibrary;
import java.io.File;

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.model;
public final class TvSettingsItem
{
private final int mItemId;

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.model.settings.view;
import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
import org.dolphinemu.dolphinemu.model.settings.Setting;

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.model.settings.view;
import org.dolphinemu.dolphinemu.model.settings.Setting;
public final class HeaderSetting extends SettingsItem

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.model.settings.view;
import org.dolphinemu.dolphinemu.model.settings.IntSetting;
import org.dolphinemu.dolphinemu.model.settings.Setting;

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

@ -33,7 +33,7 @@ import java.util.Set;
/**
* Draws the interactive input overlay on top of the
* {@link NativeGLSurfaceView} that is rendering emulation.
* {@link SurfaceView} that is rendering emulation.
*/
public final class InputOverlay extends SurfaceView implements OnTouchListener
{
@ -121,7 +121,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
{
if (isInEditMode())
{
return onTouchWhileEditing(v, event);
return onTouchWhileEditing(event);
}
int pointerIndex = event.getActionIndex();
@ -209,14 +209,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
return true;
}
public boolean onTouchWhileEditing(View v, MotionEvent event)
public boolean onTouchWhileEditing(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int)event.getX(pointerIndex);
int fingerPositionY = (int)event.getY(pointerIndex);
//Maybe combine Button and Joystick as subclasses of the same parent?
//Or maybe create an interface like IMoveableHUDControl?
// Maybe combine Button and Joystick as subclasses of the same parent?
// Or maybe create an interface like IMoveableHUDControl?
for (InputOverlayDrawableButton button : overlayButtons)
{
@ -229,13 +229,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
if (mButtonBeingConfigured == null && button.getBounds().contains(fingerPositionX, fingerPositionY))
{
mButtonBeingConfigured = button;
mButtonBeingConfigured.onConfigureTouch(v, event);
mButtonBeingConfigured.onConfigureTouch(event);
}
break;
case MotionEvent.ACTION_MOVE:
if (mButtonBeingConfigured != null)
{
mButtonBeingConfigured.onConfigureTouch(v, event);
mButtonBeingConfigured.onConfigureTouch(event);
invalidate();
return true;
}
@ -245,7 +245,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
case MotionEvent.ACTION_POINTER_UP:
if (mButtonBeingConfigured == button)
{
//Persist button position by saving new place.
// Persist button position by saving new place.
saveControlPosition(mButtonBeingConfigured.getId(), mButtonBeingConfigured.getBounds().left, mButtonBeingConfigured.getBounds().top);
mButtonBeingConfigured = null;
}
@ -264,13 +264,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
if (mButtonBeingConfigured == null && dpad.getBounds().contains(fingerPositionX, fingerPositionY))
{
mDpadBeingConfigured = dpad;
mDpadBeingConfigured.onConfigureTouch(v, event);
mDpadBeingConfigured.onConfigureTouch(event);
}
break;
case MotionEvent.ACTION_MOVE:
if (mDpadBeingConfigured != null)
{
mDpadBeingConfigured.onConfigureTouch(v, event);
mDpadBeingConfigured.onConfigureTouch(event);
invalidate();
return true;
}
@ -280,7 +280,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
case MotionEvent.ACTION_POINTER_UP:
if (mDpadBeingConfigured == dpad)
{
//Persist button position by saving new place.
// Persist button position by saving new place.
saveControlPosition(mDpadBeingConfigured.getId(0), mDpadBeingConfigured.getBounds().left, mDpadBeingConfigured.getBounds().top);
mDpadBeingConfigured = null;
}
@ -297,13 +297,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
if (mJoystickBeingConfigured == null && joystick.getBounds().contains(fingerPositionX, fingerPositionY))
{
mJoystickBeingConfigured = joystick;
mJoystickBeingConfigured.onConfigureTouch(v, event);
mJoystickBeingConfigured.onConfigureTouch(event);
}
break;
case MotionEvent.ACTION_MOVE:
if (mJoystickBeingConfigured != null)
{
mJoystickBeingConfigured.onConfigureTouch(v, event);
mJoystickBeingConfigured.onConfigureTouch(event);
invalidate();
}
break;
@ -638,8 +638,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
// These were set in the input overlay configuration menu.
int drawableX = (int) sPrefs.getFloat(buttonId+"-X", 0f);
int drawableY = (int) sPrefs.getFloat(buttonId+"-Y", 0f);
int drawableX = (int) sPrefs.getFloat(buttonId + "-X", 0f);
int drawableY = (int) sPrefs.getFloat(buttonId + "-Y", 0f);
// Intrinsic width and height of the InputOverlayDrawableButton.
// For any who may not know, intrinsic width/height
@ -649,7 +649,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// Now set the bounds for the InputOverlayDrawableButton.
// This will dictate where on the screen (and the what the size) the InputOverlayDrawableButton will be.
overlayDrawable.setBounds(drawableX, drawableY, drawableX+intrinWidth, drawableY+intrinHeight);
overlayDrawable.setBounds(drawableX, drawableY, drawableX + intrinWidth, drawableY + intrinHeight);
// Need to set the image's position
overlayDrawable.setPosition(drawableX, drawableY);
@ -660,12 +660,12 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
/**
* Initializes an {@link InputOverlayDrawableDpad}
*
* @param context The current {@link Context}.
* @param resId The resource ID of the {@link Drawable} to get the {@link Bitmap} of.
* @param buttonUp Identifier for the up button.
* @param context The current {@link Context}.
* @param resId The resource ID of the {@link Drawable} to get the {@link Bitmap} of.
* @param buttonUp Identifier for the up button.
* @param buttonDown Identifier for the down button.
* @param buttonLeft Identifier for the left button.
* @param buttonRight Identifier for the right button.
* @param buttonRight Identifier for the right button.
*
* @return the initialized {@link InputOverlayDrawableDpad}
*/
@ -705,8 +705,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// The X and Y coordinates of the InputOverlayDrawableDpad on the InputOverlay.
// These were set in the input overlay configuration menu.
int drawableX = (int) sPrefs.getFloat(buttonUp+"-X", 0f);
int drawableY = (int) sPrefs.getFloat(buttonUp+"-Y", 0f);
int drawableX = (int) sPrefs.getFloat(buttonUp + "-X", 0f);
int drawableY = (int) sPrefs.getFloat(buttonUp + "-Y", 0f);
// Intrinsic width and height of the InputOverlayDrawableDpad.
// For any who may not know, intrinsic width/height
@ -716,7 +716,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// Now set the bounds for the InputOverlayDrawableDpad.
// This will dictate where on the screen (and the what the size) the InputOverlayDrawableDpad will be.
overlayDrawable.setBounds(drawableX, drawableY, drawableX+intrinWidth, drawableY+intrinHeight);
overlayDrawable.setBounds(drawableX, drawableY, drawableX + intrinWidth, drawableY + intrinHeight);
// Need to set the image's position
overlayDrawable.setPosition(drawableX, drawableY);
@ -730,7 +730,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
* @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 resInner Resource ID for the inner image of the joystick (the one you actually move around).
* @param joystick Identifier for which joystick this is.
* @param joystick Identifier for which joystick this is.
*
* @return the initialized {@link InputOverlayDrawableJoystick}.
*/
@ -753,8 +753,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
// These were set in the input overlay configuration menu.
int drawableX = (int) sPrefs.getFloat(joystick+"-X", 0f);
int drawableY = (int) sPrefs.getFloat(joystick+"-Y", 0f);
int drawableX = (int) sPrefs.getFloat(joystick + "-X", 0f);
int drawableY = (int) sPrefs.getFloat(joystick + "-Y", 0f);
// Decide inner scale based on joystick ID
float innerScale;
@ -797,5 +797,4 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
{
return mIsInEditMode;
}
}

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

@ -47,7 +47,7 @@ public final class InputOverlayDrawableButton extends BitmapDrawable
return mButtonType;
}
public boolean onConfigureTouch(View v, MotionEvent event)
public boolean onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int)event.getX(pointerIndex);

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
View File

@ -29,10 +29,10 @@ public final class InputOverlayDrawableDpad extends BitmapDrawable
*
* @param res {@link Resources} instance.
* @param bitmap {@link Bitmap} to use with this Drawable.
* @param buttonUp Identifier for the up button.
* @param buttonUp Identifier for the up button.
* @param buttonDown Identifier for the down button.
* @param buttonLeft Identifier for the left button.
* @param buttonRight Identifier for the right button.
* @param buttonRight Identifier for the right button.
*/
public InputOverlayDrawableDpad(Resources res, Bitmap bitmap,
int buttonUp, int buttonDown,
@ -55,7 +55,7 @@ public final class InputOverlayDrawableDpad extends BitmapDrawable
return mButtonType[direction];
}
public boolean onConfigureTouch(View v, MotionEvent event)
public boolean onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int)event.getX(pointerIndex);

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

@ -120,7 +120,7 @@ public final class InputOverlayDrawableJoystick extends BitmapDrawable
}
}
public boolean onConfigureTouch(View v, MotionEvent event)
public boolean onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int)event.getX(pointerIndex);

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
View File

@ -154,4 +154,4 @@ public final class DividerItemDecoration extends RecyclerView.ItemDecoration
"DividerItemDecoration can only be used with a LinearLayoutManager.");
}
}
}
}

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.main;
import android.database.Cursor;
/**

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
View File

@ -250,7 +250,7 @@ public final class TvMainActivity extends Activity implements MainView
R.string.grid_menu_refresh));
// Create a header for this row.
HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings));
HeaderItem header = new HeaderItem(R.string.preferences_settings, getString(R.string.preferences_settings));
return new ListRow(header, rowItems);
}

17
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesPresenter.java
View File

@ -48,15 +48,14 @@ public final class PlatformGamesPresenter
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Action1<Cursor>()
{
@Override
public void call(Cursor games)
{
Log.debug("[PlatformGamesPresenter] " + mPlatform + ": Load finished, swapping cursor...");
{
@Override
public void call(Cursor games)
{
Log.debug("[PlatformGamesPresenter] " + mPlatform + ": Load finished, swapping cursor...");
mView.showGames(games);
}
}
);
mView.showGames(games);
}
});
}
}

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.platform;
import android.database.Cursor;
/**

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.settings;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.Intent;

68
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.settings;
import android.os.Bundle;
import org.dolphinemu.dolphinemu.BuildConfig;
@ -58,23 +57,23 @@ public final class SettingsActivityPresenter
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Action1<HashMap<String, SettingSection>>()
{
@Override
public void call(HashMap<String, SettingSection> settingsBySection)
{
mSettingsBySection = settingsBySection;
mView.onSettingsFileLoaded(settingsBySection);
}
},
new Action1<Throwable>()
{
@Override
public void call(Throwable throwable)
{
Log.error("[SettingsActivityPresenter] Error reading file " + filename + ".ini: "+ throwable.getMessage());
mView.onSettingsFileNotFound();
}
});
{
@Override
public void call(HashMap<String, SettingSection> settingsBySection)
{
mSettingsBySection = settingsBySection;
mView.onSettingsFileLoaded(settingsBySection);
}
},
new Action1<Throwable>()
{
@Override
public void call(Throwable throwable)
{
Log.error("[SettingsActivityPresenter] Error reading file " + filename + ".ini: "+ throwable.getMessage());
mView.onSettingsFileNotFound();
}
});
}
else
{
@ -100,23 +99,22 @@ public final class SettingsActivityPresenter
SettingsFile.saveFile(mFileName, mSettingsBySection)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
new Action1<Boolean>()
{
@Override
public void call(Boolean aBoolean)
{
mView.showToastMessage("Saved successfully to " + mFileName + ".ini");
}
},
new Action1<Throwable>()
{
@Override
public void call(Throwable throwable)
{
mView.showToastMessage("Error saving " + mFileName + ".ini: " + throwable.getMessage());
}
});
.subscribe(new Action1<Boolean>()
{
@Override
public void call(Boolean aBoolean)
{
mView.showToastMessage("Saved successfully to " + mFileName + ".ini");
}
},
new Action1<Throwable>()
{
@Override
public void call(Throwable throwable)
{
mView.showToastMessage("Error saving " + mFileName + ".ini: " + throwable.getMessage());
}
});
}
}

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java
View File

@ -158,8 +158,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
builder.setTitle(item.getNameId());
builder.setView(view);
builder.setPositiveButton(R.string.dialog_seekbar_pos, this);
builder.setNegativeButton(R.string.dialog_seekbar_neg, this);
builder.setPositiveButton(R.string.ok, this);
builder.setNegativeButton(R.string.cancel, this);
mDialog = builder.show();
mTextSliderValue = (TextView) view.findViewById(R.id.text_value);

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java
View File

@ -160,7 +160,7 @@ public final class SettingsFragmentPresenter
}
// TODO Set default value for cpuCore based on arch.
sl.add(new SingleChoiceSetting(SettingsFile.KEY_CPU_CORE, SettingsFile.SECTION_CORE, R.string.cpu_core, 0, R.array.string_emu_cores, R.array.int_emu_cores, 4, cpuCore));
sl.add(new SingleChoiceSetting(SettingsFile.KEY_CPU_CORE, SettingsFile.SECTION_CORE, R.string.cpu_core, 0, R.array.emuCoresEntries, R.array.emuCoresValues, 4, cpuCore));
sl.add(new CheckBoxSetting(SettingsFile.KEY_DUAL_CORE, SettingsFile.SECTION_CORE, R.string.dual_core, R.string.dual_core_descrip, true, dualCore));
sl.add(new CheckBoxSetting(SettingsFile.KEY_OVERCLOCK_ENABLE, SettingsFile.SECTION_CORE, R.string.overclock_enable, R.string.overclock_enable_description, false, overclockEnable));
sl.add(new SliderSetting(SettingsFile.KEY_OVERCLOCK_PERCENT, SettingsFile.SECTION_CORE, R.string.overclock_title, 0, 400, "%", 100, overclock));

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.settings.viewholder;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.ui.settings.viewholder;
import android.view.View;
import android.widget.TextView;

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
View File

@ -61,6 +61,4 @@ public final class InputBindingPreference extends EditTextPreference
String summary = super.getSummary().toString();
return String.format(summary, getText());
}
}

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.utils;
import android.app.Activity;
import android.app.PendingIntent;
import android.content.Intent;
import android.hardware.usb.UsbConfiguration;
@ -15,7 +14,6 @@ import org.dolphinemu.dolphinemu.services.USBPermService;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
public class Java_WiimoteAdapter

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.utils;
import org.dolphinemu.dolphinemu.BuildConfig;
/**

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
View File

@ -66,9 +66,7 @@ public final class SettingsFile
public static final String KEY_SKIP_EFB = "EFBAccessEnable";
public static final String KEY_IGNORE_FORMAT = "EFBEmulateFormatChanges";
public static final String KEY_EFB_COPY = "EFBCopyEnable";
public static final String KEY_EFB_TEXTURE = "EFBToTextureEnable";
public static final String KEY_EFB_CACHE = "EFBCopyCacheEnable";
public static final String KEY_TEXCACHE_ACCURACY = "SafeTextureCacheColorSamples";
public static final String KEY_XFB = "UseXFB";
public static final String KEY_XFB_REAL = "UseRealXFB";

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
View File

@ -1,6 +1,5 @@
package org.dolphinemu.dolphinemu.viewholders;
import android.support.v17.leanback.widget.ImageCardView;
import android.support.v17.leanback.widget.Presenter;
import android.view.View;

9
Source/Android/app/src/main/res/anim/button_elevation.xml → Source/Android/app/src/main/res/animator/button_elevation.xml
View File

@ -1,5 +1,6 @@
<!-- res/anim/button_elevation.xml -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<objectAnimator
android:propertyName="translationZ"
@ -8,6 +9,7 @@
android:valueTo="@dimen/elevation_high"
android:valueType="floatType"/>
</item>
<item>
<objectAnimator
android:propertyName="translationZ"
@ -16,4 +18,5 @@
android:valueTo="@dimen/elevation_low"
android:valueType="floatType"/>
</item>
</selector>
</set>

3
Source/Android/app/src/main/res/animator/menu_slide_in.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:propertyName="translationX"
android:valueType="floatType"
@ -7,6 +8,7 @@
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
<objectAnimator
android:propertyName="alpha"
android:valueType="floatType"
@ -14,4 +16,5 @@
android:valueTo="1"
android:interpolator="@android:interpolator/accelerate_quad"
android:duration="300"/>
</set>

27
Source/Android/app/src/main/res/animator/menu_slide_out.xml
View File

@ -1,18 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This animation is used ONLY when a submenu is replaced. -->
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="1280"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="1280"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
</set>

1
Source/Android/app/src/main/res/animator/settings_enter.xml
View File

@ -24,4 +24,5 @@
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="100.0"
android:valueTo="0"/>
</set>

1
Source/Android/app/src/main/res/animator/settings_exit.xml
View File

@ -24,4 +24,5 @@
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0"
android:valueTo="-100.0"/>
</set>

1
Source/Android/app/src/main/res/animator/settings_pop_enter.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
android:interpolator="@android:interpolator/decelerate_cubic"

1
Source/Android/app/src/main/res/animator/setttings_pop_exit.xml
View File

@ -23,4 +23,5 @@
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0.0"
android:valueTo="100"/>
</set>

3
Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
View File

@ -11,4 +11,5 @@
android:layout_width="match_parent"
android:focusable="false"
android:focusableInTouchMode="false"/>
</FrameLayout>
</FrameLayout>

2
Source/Android/app/src/main/res/layout/activity_add_directory.xml
View File

@ -14,7 +14,6 @@
android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
android:elevation="6dp"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/list_files"
android:layout_width="match_parent"
@ -25,5 +24,4 @@
android:elevation="4dp"
android:background="@android:color/white"/>
</LinearLayout>

3
Source/Android/app/src/main/res/layout/activity_emulation.xml
View File

@ -1,8 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/frame_content"
>
android:id="@+id/frame_content">
<FrameLayout
android:id="@+id/frame_emulation_fragment"

2
Source/Android/app/src/main/res/layout/activity_main.xml
View File

@ -26,7 +26,6 @@
app:tabMode="fixed"
app:tabGravity="fill"/>
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
@ -45,4 +44,5 @@
app:rippleColor="?android:colorPrimaryDark"
app:layout_anchor="@+id/pager_platforms"
app:layout_anchorGravity="bottom|right|end"/>
</android.support.design.widget.CoordinatorLayout>

3
Source/Android/app/src/main/res/layout/activity_tv_main.xml
View File

@ -7,7 +7,6 @@
android:name="android.support.v17.leanback.app.BrowseFragment"
android:id="@+id/fragment_game_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent"/>
</FrameLayout>

4
Source/Android/app/src/main/res/layout/card_game.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -8,8 +7,7 @@
android:transitionName="card_game"
android:focusable="true"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
>
android:foreground="?android:attr/selectableItemBackground">
<LinearLayout
android:layout_width="match_parent"

14
Source/Android/app/src/main/res/layout/dialog_game_details.xml
View File

@ -20,8 +20,7 @@
android:layout_marginTop="24dp"
tools:src="@drawable/placeholder_banner"
app:civ_border_color="?android:colorAccent"
app:civ_border_width="2dp"
/>
app:civ_border_width="2dp"/>
<ImageView
android:id="@+id/image_game_screen"
@ -59,8 +58,7 @@
android:layout_alignStart="@+id/text_game_title"
android:layout_below="@+id/text_game_title"
android:layout_marginTop="8dp"
tools:text="Zany rhythm action!"
/>
tools:text="Zany rhythm action!"/>
<View
android:id="@+id/divider"
@ -70,7 +68,6 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/text_company"
android:layout_marginTop="16dp"
android:background="#1F000000"/>
<ImageView
@ -122,13 +119,12 @@
android:layout_alignEnd="@+id/text_game_title"
android:layout_marginBottom="-28dp"
android:src="@drawable/ic_play"
android:stateListAnimator="@anim/button_elevation"
android:stateListAnimator="@animator/button_elevation"
app:rippleColor="?android:colorPrimaryDark"
app:borderWidth="0dp"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
/>
app:pressedTranslationZ="12dp"/>
</RelativeLayout>
</FrameLayout>

4
Source/Android/app/src/main/res/layout/fragment_grid.xml
View File

@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/grid_games"
@ -12,4 +11,5 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
tools:listitem="@layout/card_game"/>
</FrameLayout>

18
Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
View File

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dolphin_blue_dark"
tools:layout_width="250dp"
>
tools:layout_width="250dp">
<TextView
android:id="@+id/text_game_title"
@ -20,8 +19,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
>
android:layout_weight="1">
<LinearLayout
android:id="@+id/layout_options"
@ -31,7 +29,7 @@
<Button
android:id="@+id/menu_take_screenshot"
android:text="@string/overlay_screenshot"
android:text="@string/emulation_screenshot"
style="@style/InGameMenuOption"/>
<Button
@ -46,17 +44,17 @@
<Button
android:id="@+id/menu_emulation_save_root"
android:text="@string/overlay_savestate"
android:text="@string/emulation_savestate"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_root"
android:text="@string/overlay_loadstate"
android:text="@string/emulation_loadstate"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_ingame_settings"
android:text="@string/settings"
android:text="@string/preferences_settings"
style="@style/InGameMenuOption"/>
<Button
@ -66,9 +64,11 @@
<Button
android:id="@+id/menu_exit"
android:text="@string/overlay_exit_emulation"
android:text="@string/emulation_exit"
style="@style/InGameMenuOption"/>
</LinearLayout>
</ScrollView>
</LinearLayout>

13
Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
View File

@ -14,23 +14,20 @@
<include
android:id="@+id/list_item_controller_one"
layout="@layout/list_item_setting"
/>
layout="@layout/list_item_setting"/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
layout="@layout/list_item_setting"/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
layout="@layout/list_item_setting"/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
layout="@layout/list_item_setting"/>
</LinearLayout>
</org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout>

4
Source/Android/app/src/main/res/layout/fragment_settings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/list_settings"

35
Source/Android/app/src/main/res/layout/fragment_state_load.xml
View File

@ -3,8 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#af000000"
android:orientation="vertical"
>
android:orientation="vertical">
<GridLayout
android:id="@+id/grid_state_slots"
@ -18,48 +17,44 @@
android:id="@+id/menu_emulation_load_1"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot1"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot1"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_2"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot2"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot2"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_3"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot3"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot3"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_4"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot4"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot4"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_5"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot5"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot5"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_6"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot6"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot6"
style="@style/InGameMenuOption"/>
</GridLayout>
</FrameLayout>

35
Source/Android/app/src/main/res/layout/fragment_state_save.xml
View File

@ -3,8 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#af000000"
android:orientation="vertical"
>
android:orientation="vertical">
<GridLayout
android:id="@+id/grid_state_slots"
@ -18,48 +17,44 @@
android:id="@+id/menu_emulation_save_1"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot1"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot1"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_2"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot2"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot2"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_3"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot3"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot3"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_4"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot4"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot4"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_5"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot5"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot5"
style="@style/InGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_6"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/overlay_slot6"
style="@style/InGameMenuOption"
/>
android:text="@string/emulation_slot6"
style="@style/InGameMenuOption"/>
</GridLayout>
</FrameLayout>

2
Source/Android/app/src/main/res/menu/menu_add_directory.xml
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- TODO Please give me an icon! -->
<item
android:id="@+id/menu_up_one_level"
android:title="@string/add_directory_up_one_level"
app:showAsAction="ifRoom|withText"/>
</menu>

35
Source/Android/app/src/main/res/menu/menu_emulation.xml
View File

@ -6,47 +6,45 @@
android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot"
android:title="@string/overlay_screenshot"/>
android:title="@string/emulation_screenshot"/>
<item
android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"
/>
android:title="@string/emulation_quicksave"/>
<item
android:id="@+id/menu_quickload"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"
/>
android:title="@string/emulation_quickload"/>
<!-- Save State Slots -->
<item
android:id="@+id/menu_emulation_save_root"
android:showAsAction="never"
android:title="@string/overlay_savestate">
android:title="@string/emulation_savestate">
<menu>
<item
android:id="@+id/menu_emulation_save_1"
android:title="@string/overlay_slot1"/>
android:title="@string/emulation_slot1"/>
<item
android:id="@+id/menu_emulation_save_2"
android:title="@string/overlay_slot2"/>
android:title="@string/emulation_slot2"/>
<item
android:id="@+id/menu_emulation_save_3"
android:title="@string/overlay_slot3"/>
android:title="@string/emulation_slot3"/>
<item
android:id="@+id/menu_emulation_save_4"
android:title="@string/overlay_slot4"/>
android:title="@string/emulation_slot4"/>
<item
android:id="@+id/menu_emulation_save_5"
android:title="@string/overlay_slot5"/>
android:title="@string/emulation_slot5"/>
</menu>
</item>
@ -54,27 +52,27 @@
<item
android:id="@+id/menu_emulation_load_root"
android:showAsAction="never"
android:title="@string/overlay_loadstate">
android:title="@string/emulation_loadstate">
<menu>
<item
android:id="@+id/menu_emulation_load_1"
android:title="@string/overlay_slot1"/>
android:title="@string/emulation_slot1"/>
<item
android:id="@+id/menu_emulation_load_2"
android:title="@string/overlay_slot2"/>
android:title="@string/emulation_slot2"/>
<item
android:id="@+id/menu_emulation_load_3"
android:title="@string/overlay_slot3"/>
android:title="@string/emulation_slot3"/>
<item
android:id="@+id/menu_emulation_load_4"
android:title="@string/overlay_slot4"/>
android:title="@string/emulation_slot4"/>
<item
android:id="@+id/menu_emulation_load_5"
android:title="@string/overlay_slot5"/>
android:title="@string/emulation_slot5"/>
</menu>
</item>
@ -96,4 +94,5 @@
android:title="@string/emulation_control_scale"/>
</menu>
</item>
</menu>
</menu>

35
Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
View File

@ -6,47 +6,45 @@
android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot"
android:title="@string/overlay_screenshot"/>
android:title="@string/emulation_screenshot"/>
<item
android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"
/>
android:title="@string/emulation_quicksave"/>
<item
android:id="@+id/menu_quickload"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"
/>
android:title="@string/emulation_quickload"/>
<!-- Save State Slots -->
<item
android:id="@+id/menu_emulation_save_root"
android:showAsAction="never"
android:title="@string/overlay_savestate">
android:title="@string/emulation_savestate">
<menu>
<item
android:id="@+id/menu_emulation_save_1"
android:title="@string/overlay_slot1"/>
android:title="@string/emulation_slot1"/>
<item
android:id="@+id/menu_emulation_save_2"
android:title="@string/overlay_slot2"/>
android:title="@string/emulation_slot2"/>
<item
android:id="@+id/menu_emulation_save_3"
android:title="@string/overlay_slot3"/>
android:title="@string/emulation_slot3"/>
<item
android:id="@+id/menu_emulation_save_4"
android:title="@string/overlay_slot4"/>
android:title="@string/emulation_slot4"/>
<item
android:id="@+id/menu_emulation_save_5"
android:title="@string/overlay_slot5"/>
android:title="@string/emulation_slot5"/>
</menu>
</item>
@ -54,27 +52,27 @@
<item
android:id="@+id/menu_emulation_load_root"
android:showAsAction="never"
android:title="@string/overlay_loadstate">
android:title="@string/emulation_loadstate">
<menu>
<item
android:id="@+id/menu_emulation_load_1"
android:title="@string/overlay_slot1"/>
android:title="@string/emulation_slot1"/>
<item
android:id="@+id/menu_emulation_load_2"
android:title="@string/overlay_slot2"/>
android:title="@string/emulation_slot2"/>
<item
android:id="@+id/menu_emulation_load_3"
android:title="@string/overlay_slot3"/>
android:title="@string/emulation_slot3"/>
<item
android:id="@+id/menu_emulation_load_4"
android:title="@string/overlay_slot4"/>
android:title="@string/emulation_slot4"/>
<item
android:id="@+id/menu_emulation_load_5"
android:title="@string/overlay_slot5"/>
android:title="@string/emulation_slot5"/>
</menu>
</item>
@ -100,4 +98,5 @@
android:title="@string/emulation_choose_controller"/>
</menu>
</item>
</menu>
</menu>

5
Source/Android/app/src/main/res/menu/menu_game_grid.xml
View File

@ -1,26 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_settings_core"
android:title="@string/grid_menu_core_settings"
android:icon="@drawable/ic_settings_core"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_settings_video"
android:title="@string/grid_menu_video_settings"
android:icon="@drawable/ic_settings_graphics"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_settings_gcpad"
android:title="@string/grid_menu_gcpad_settings"
android:icon="@drawable/ic_settings_gcpad"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_settings_wiimote"
android:title="@string/grid_menu_wiimote_settings"
android:icon="@drawable/ic_settings_wiimote"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_refresh"
android:title="@string/grid_menu_refresh"

1
Source/Android/app/src/main/res/menu/menu_settings.xml
View File

@ -7,4 +7,5 @@
android:title="@string/preferences_exit_no_save"
android:icon="@drawable/ic_cancel"
app:showAsAction="ifRoom"/>
</menu>

208
Source/Android/app/src/main/res/values-ja/strings.xml
View File

@ -1,208 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Title of the app -->
<string name="app_name">Dolphin Emulator</string>
<!-- Navigation-related Strings -->
<string name="drawer_open">ナビゲーションウィンドウを開く</string>
<string name="drawer_close">ナビゲーションウィンドウを閉じる</string>
<!-- About Fragment -->
<string name="build_revision">ビルドのバージョン</string>
<string name="supports_gles3">サポートのOpenGL ES 3</string>
<string name="supports_neon">サポートのNEON</string>
<string name="general">一般</string>
<string name="cpu">CPU</string>
<string name="gles_two">GLES 2</string>
<string name="gles_three">GLES 3</string>
<string name="desktop_gl">OpenGL</string>
<!-- About Menu - CPU Info -->
<string name="cpu_abi_one">CPU ABI 1</string>
<string name="cpu_abi_two">CPU ABI 2</string>
<string name="cpu_info">CPU情報</string>
<string name="cpu_type">CPUタイプ</string>
<string name="cpu_features">CPUの命令セットと機能</string>
<string name="num_cores">CPUコア</string>
<string name="cpu_implementer">CPUの実装</string>
<string name="cpu_hardware">ハードウェア</string>
<string name="unknown_part_num">不明 (%1$d)。 我々はそれを文書化することができますので、この番号を報告してください。 </string>
<!-- Folder Browser -->
<string name="current_dir">現在のディレクトリ： %1$s</string>
<string name="parent_directory">親ディレクトリ</string>
<string name="file_size">ファイルサイズ: %1$s</string>
<!-- Game List Activity -->
<string name="clear_game_list">クリア</string>
<string name="clear_game_list_confirm">ゲームリストからすべての項目を削除しますか？</string>
<string name="game_list">ゲームリスト</string>
<string name="browse_folder">フォルダの参照</string>
<string name="settings">設定</string>
<string name="about">について</string>
<string name="file_size_gib">ファイルサイズ: %.2f GiB</string>
<string name="file_size_mib">ファイルサイズ: %.2f MiB</string>
<!-- Game List Activity - Device Compatibility AlertDialog -->
<string name="device_compat_warning">デバイスの互換性の警告</string>
<string name="device_compat_warning_msg">この電話は、NEON拡張をサポートしていません。 おそらくDolphinを実行することはできません。\nあなたはとにかくそれを実行してみますか？</string>
<string name="device_gles3compat_warning_msg">デバイスはOpenGLES3のビデオドライバのバグがあります。\nあなたはとにかくそれを使用してみたいのですか？</string>
<!-- Game List Fragment -->
<string name="file_clicked">クリックされたファイル： %1$s</string>
<!-- Emulation Window Overlay -->
<string name="enable_input_overlay">入力オーバーレイを有効</string>
<string name="disable_input_overlay">入力オーバーレイを無効</string>
<string name="overlay_screenshot">スクリーンショットを撮る</string>
<string name="overlay_savestate">ステートセーブ</string>
<string name="overlay_loadstate">ステートロード</string>
<string name="overlay_exit_emulation">終了</string>
<string name="overlay_exit_emulation_confirm">このゲームを終了してもよろしいですか？</string>
<string name="overlay_slot1">スロット 1</string>
<string name="overlay_slot2">スロット 2</string>
<string name="overlay_slot3">スロット 3</string>
<string name="overlay_slot4">スロット 4</string>
<string name="overlay_slot5">スロット 5</string>
<!-- Input Config Fragment -->
<string name="input_settings">入力</string>
<string name="input_overlay">入力オーバーレイ</string>
<string name="input_overlay_desc">画面上の入力のオーバーレイを設定し。</string>
<string name="input_overlay_layout">入力オーバーレイレイアウト</string>
<string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
<string name="controls_size">コントロールのサイズを調整し</string>
<string name="controller_0">コントローラ1</string>
<string name="controller_1">コントローラ2</string>
<string name="controller_2">コントローラ3</string>
<string name="controller_3">コントローラ4</string>
<string name="enable_controller">コントローラを有効</string>
<string name="wiimote_0">Wiiリモコン1</string>
<string name="wiimote_1">Wiiリモコン2</string>
<string name="wiimote_2">Wiiリモコン3</string>
<string name="wiimote_3">Wiiリモコン4</string>
<string name="enable_wiimote">Wiiリモコンを有効</string>
<string name="input_binding">入力バインディング</string>
<string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
<!-- GameCube buttons (May be shared with Wiimote stuff too) -->
<string name="button_a">Aボタン</string>
<string name="button_b">Bボタン</string>
<string name="button_start">スタートボタン</string>
<string name="button_x">Xボタン</string>
<string name="button_y">Yボタン</string>
<string name="button_z">Zボタン</string>
<string name="dpad_up">十字キー: ↑</string>
<string name="dpad_down">十字キー: ↓</string>
<string name="dpad_left">十字キー: ←</string>
<string name="dpad_right">十字キー: →</string>
<string name="main_stick_up">コントロールスティック: ↑</string>
<string name="main_stick_down">コントロールスティック: ↓</string>
<string name="main_stick_left">コントロールスティック: ←</string>
<string name="main_stick_right">コントロールスティック: →</string>
<string name="c_stick_up">Cスティック: ↑</string>
<string name="c_stick_down">Cスティック: ↓</string>
<string name="c_stick_left">Cスティック: ←</string>
<string name="c_stick_right">Cスティック: →</string>
<string name="trigger_left">Lトリガー</string>
<string name="trigger_right">Rトリガー</string>
<!-- Wiimote (+ extension) only buttons -->
<string name="button_one">ボタン1</string>
<string name="button_two">ボタン2</string>
<string name="button_plus">ボタン+</string>
<string name="button_minus">ボタン-</string>
<string name="button_home">ホームボタン</string>
<string name="ir_up">IR ↑</string>
<string name="ir_down">IR ↓</string>
<string name="ir_left">IR ←</string>
<string name="ir_right">IR →</string>
<string name="ir_forward">IR前方</string>
<string name="ir_backward">IR後方</string>
<string name="swing_up">スイング ↑</string>
<string name="swing_down">スイング ↓</string>
<string name="swing_left">スイング ←</string>
<string name="swing_right">スイング →</string>
<string name="tilt_forward">前方を傾</string>
<string name="tilt_backward">後方を傾</string>
<string name="tilt_left">左を傾</string>
<string name="tilt_right">右を傾</string>
<string name="shake_x">Xを振る</string>
<string name="shake_y">Yを振る</string>
<string name="shake_z">Zを振る</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>
<string name="jit64_recompiler">JIT64 Recompiler</string>
<string name="jitil_recompiler">JITIL Recompiler</string>
<string name="jit_arm_recompiler">JIT ARM Recompiler</string>
<string name="jit_arm64_recompiler">JIT ARM64 Recompiler</string>
<string name="cpu_settings">CPU</string>
<string name="cpu_core">CPUコア</string>
<string name="cpu_core_desc">%s</string>
<string name="dual_core">デュアルコア</string>
<string name="dual_core_descrip">処理のための2つのCPUコアを使用して。速度が向上します。</string>
<string name="fastmem">Fastmem</string>
<string name="fastmem_desc">メモリアクセスのために潜在的に危険な最適化を使用して。</string>
<!-- Video Preference Fragment -->
<string name="video_settings">ビデオ</string>
<string name="software_renderer">Software Renderer</string>
<string name="opengl_es3">OpenGL ES</string>
<string name="opengl">OpenGL</string>
<string name="video_backend">ビデオレンダラ</string>
<string name="video_backend_desc">%s</string>
<string name="show_fps">FPSを表示</string>
<string name="show_fps_descrip">エミュレーション速度の指標として、画面左上に毎秒レンダリングされた フレーム数を表示します。</string>
<string name="enhancements">画質向上の設定</string>
<string name="internal_resolution">内部解像度の変更</string>
<string name="internal_resolution_descrip">内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上します。 しかし、ゲームによっては非常に重くなったり描画バグの原因となります。 【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描画バグは発生しにくくなります。 また一般的に内部解像度が低いほど、動作速度は向上します。</string>
<string name="FSAA">フルシーンアンチエイリアシング</string>
<string name="FSAA_descrip">3Dグラフィックスをラスタライズによって生じるエイリアシングの量が減少。 レンダリングされた画像はあまりギザギザになります。 抽選でエミュレーション速度を下げます。問題を引き起こす可能性があります。</string>
<string name="anisotropic_filtering">異方性フィルタリング</string>
<string name="anisotropic_filtering_descrip">異方性フィルタリングを適用します。 奥行きのあるテクスチャをより精細に描画することが出来ます。 特定のゲームでは描画バグの原因になることがあります。</string>
<string name="postprocessing_shader">ポストプロセッシングシェーダー</string>
<string name="postprocessing_shader_descrip">フレーム終了後の後処理効果を適用する。</string>
<string name="scaled_efb_copy">Scaled EFB Copy</string>
<string name="scaled_efb_copy_descrip">テクスチャエフェクトを表示するために作成されたテクスチャの品質を著しく向上させます。 特に高解像度出力時に効果が大きく出ます。 動作速度は少々低下し、まれに描画バグの原因にもなることもあります。</string>
<string name="per_pixel_lighting">Per-Pixel Lighting</string>
<string name="per_pixel_lighting_descrip">ピクセル単位での光源処理を行います。 GPUの性能にもよりますが、数パーセント程度、動作速度が低下します。 このオプションは通常安全ですが、時に描画バグを引き起こすこともあります</string>
<string name="force_texture_filtering">Force Texture Filtering</string>
<string name="force_texture_filtering_descrip">ゲーム側でフィルタ無効を明示している場面でも、強制的にフィルタリングを行います。 特に高解像度出力時にテクスチャが綺麗になりますが、いくつかのゲームで描画バグを引き起こします。</string>
<string name="disable_fog">霧を無効</string>
<string name="disable_fog_descrip">フォグ処理を無効化します。これにより遠景の高精細化が期待できます。いくつかのタイトルではフォグ処理に頼った画面効果が正しく表示 されなくなります。</string>
<string name="hacks">高速化(Hacks)</string>
<string name="embedded_frame_buffer">内蔵フレームバッファ</string>
<string name="skip_efb_access">CPUからEFBアクセスをスキップ</string>
<string name="skip_efb_access_descrip">EFBへの読み取り/書き込みにCPUから作られたすべての要求を無視。</string>
<string name="ignore_format_changes">フォーマットの変更を無視</string>
<string name="ignore_format_changes_descrip">EFB形式への変更を無視。</string>
<string name="efb_copy_method">EFBコピー方法</string>
<string name="efb_copy_method_descrip">EFBコピーをエミュレート方法を決定。</string>
<string name="efb_copy_texture">テクスチャ</string>
<string name="efb_copy_ram_uncached">RAM (キャッシュない)</string>
<string name="efb_copy_ram_cached">RAM (キャッシュ)</string>
<string name="texture_cache">テクスチャキャッシュ</string>
<string name="texture_cache_accuracy">テクスチャキャッシュ確度</string>
<string name="texture_cache_accuracy_descrip">この選択をSafe設定しておくと、RAMからのテクスチャ更新に 失敗しにくなります。</string>
<string name="texture_cache_accuracy_low">低</string>
<string name="texture_cache_accuracy_medium">平</string>
<string name="texture_cache_accuracy_high">高</string>
<string name="external_frame_buffer">外部フレームバッファ</string>
<string name="external_frame_buffer_descrip">XFBをエミュレート方法を決定。</string>
<string name="external_frame_buffer_virtual">バーチャル</string>
<string name="external_frame_buffer_real">実機</string>
<string name="disable_destination_alpha">Disable Destination Alpha</string>
<string name="disable_destination_alpha_descrip">多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ 。</string>
<string name="fast_depth_calculation">高速奥行き計算</string>
<string name="fast_depth_calculation_descrip">深度値を計算するために精度の低いアルゴリズムを使用します。</string>
<!-- Miscellaneous -->
<string name="yes">はい</string>
<string name="no">いいえ</string>
<string name="cancel">キャンセル</string>
<string name="disabled">無効</string>
<string name="other">その他</string>
</resources>

39
Source/Android/app/src/main/res/values/arrays.xml
View File

@ -2,15 +2,16 @@
<!-- All lists for ListPreference keys/values are placed here -->
<resources>
<!-- New UI CPU Core selection - Default -->
<string-array name="string_emu_cores" translatable="false">
<item>@string/interpreter</item>
<item>@string/cached_interpreter</item>
<item>@string/jit_arm64_recompiler</item>
<!--<item>@string/jit64_recompiler</item>
<item>@string/jitil_recompiler</item>-->
<string-array name="emuCoresEntries" translatable="false">
<item>Interpreter</item>
<item>Cached Interpreter</item>
<item>JIT ARM64 Recompiler</item>
<!--<item>JIT64 Recompiler</item>
<item>JITIL Recompiler</item>-->
</string-array>
<integer-array name="int_emu_cores" translatable="false">
<integer-array name="emuCoresValues" translatable="false">
<item>0</item>
<item>5</item>
<item>4</item>
@ -33,15 +34,7 @@
</integer-array>
<!-- Wii Remote extensions -->
<string-array name="wiimoteExtEntries" translatable="false">
<item>"None"</item>
<item>"Nunchuk"</item>
<item>"Classic"</item>
<item>"Guitar"</item>
<item>"Drums"</item>
<item>"Turntable"</item>
</string-array>
<string-array name="wiimoteExtValues" translatable="false">
<string-array name="wiimoteExtensions" translatable="false">
<item>None</item>
<item>Nunchuk</item>
<item>Classic</item>
@ -52,9 +45,9 @@
<!-- Texture Cache Accuracy Preference -->
<string-array name="textureCacheAccuracyEntries" translatable="false">
<item>@string/texture_cache_accuracy_low</item>
<item>@string/texture_cache_accuracy_medium</item>
<item>@string/texture_cache_accuracy_high</item>
<item>Low</item>
<item>Medium</item>
<item>High</item>
</string-array>
<integer-array name="textureCacheAccuracyValues" translatable="false">
<item>128</item>
@ -64,9 +57,9 @@
<!-- External Frame Buffer Preference -->
<string-array name="externalFrameBufferEntries" translatable="false">
<item>@string/disabled</item>
<item>@string/external_frame_buffer_virtual</item>
<item>@string/external_frame_buffer_real</item>
<item>Disabled</item>
<item>Virtual</item>
<item>Real</item>
</string-array>
<integer-array name="externalFrameBufferValues" translatable="false">
<item>0</item>
@ -152,7 +145,7 @@
<item>3</item>
</integer-array>
<string-array name="country_names">
<string-array name="countryNames">
<item>Europe</item>
<item>Japan</item>
<item>USA</item>

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="dolphin_blue">#2196f3</color>
<color name="dolphin_blue_dark">#1976d2</color>
@ -10,4 +11,5 @@
<color name="circle_grey">#bdbdbd</color>
<color name="tv_card_unselected">#444444</color>
</resources>

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

@ -4,81 +4,6 @@
<!-- Title of the app -->
<string name="app_name">Dolphin Emulator</string>
<!-- Navigation-related Strings -->
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>
<!-- About Fragment -->
<string name="build_revision">Build Revision</string>
<string name="supports_gles3">Supports OpenGL ES 3</string>
<string name="supports_neon">Supports NEON</string>
<string name="general">General</string>
<string name="cpu">CPU</string>
<string name="gles_two">GLES 2</string>
<string name="gles_three">GLES 3</string>
<string name="desktop_gl">OpenGL</string>
<!-- About Menu - CPU Info -->
<string name="cpu_abi_one">CPU ABI 1</string>
<string name="cpu_abi_two">CPU ABI 2</string>
<string name="cpu_info">CPU Info</string>
<string name="cpu_type">CPU Type</string>
<string name="cpu_features">CPU Features</string>
<string name="num_cores">Number of Cores</string>
<string name="cpu_implementer">CPU Implementer</string>
<string name="cpu_hardware">Hardware</string>
<string name="unknown_part_num">Unknown (%1$d). Please report this number so it can be documented!</string>
<!-- Folder Browser -->
<string name="current_dir">Current Dir: %1$s</string>
<string name="parent_directory">Parent Directory</string>
<string name="file_size">File Size: %1$s</string>
<!-- Game List Activity -->
<string name="clear_game_list">Clear game list</string>
<string name="clear_game_list_confirm">Do you want to clear the game list?</string>
<string name="game_list">Game List</string>
<string name="browse_folder">Browse Folder</string>
<string name="settings">Settings</string>
<string name="about">About</string>
<string name="file_size_gib">File Size: %.2f GiB</string>
<string name="file_size_mib">File Size: %.2f MiB</string>
<!-- Game List Activity - Device Compatibility AlertDialog -->
<string name="device_compat_warning">Device Compatibility Warning</string>
<string name="device_compat_warning_msg">Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?</string>
<string name="device_gles3compat_warning_msg">Your device has known buggy video drivers for OpenGL ES 3.\nDo you want to try anyway?</string>
<!-- Game List Fragment -->
<string name="file_clicked">File clicked: %1$s</string>
<!-- Emulation Overlay -->
<string name="enable_input_overlay">Enable Input Overlay</string>
<string name="disable_input_overlay">Disable Input Overlay</string>
<string name="overlay_screenshot">Take Screenshot</string>
<string name="overlay_savestate">Save State</string>
<string name="overlay_loadstate">Load State</string>
<string name="overlay_exit_emulation">Exit</string>
<string name="overlay_exit_emulation_confirm">Are you sure you wish to exit this game?</string>
<string name="overlay_slot1">Slot 1</string>
<string name="overlay_slot2">Slot 2</string>
<string name="overlay_slot3">Slot 3</string>
<string name="overlay_slot4">Slot 4</string>
<string name="overlay_slot5">Slot 5</string>
<string name="overlay_slot6">Slot 6</string>
<!-- Input Config Fragment -->
<string name="input_settings">Input</string>
<string name="input_overlay">Input Overlay</string>
<string name="input_overlay_desc">Configure the onscreen input overlay.</string>
<string name="input_overlay_layout">Input Overlay Layout</string>
<string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
<string name="controls_size">Adjust the control size</string>
<string name="controller_bindings">Controller Bindings</string>
<string name="controller_gc">GameCube Controllers</string>
<string name="controller_wii">Wii Controllers (Wiimotes)</string>
<!-- WARNING Do not move these controller entries AT ALL COSTS! They are indexed with ints, and an assumption
is made that they are placed together so that we can access them sequentially in a loop. -->
<string name="controller_0">GameCube Controller 1</string>
@ -93,7 +18,7 @@
<string name="controller_main">Main Stick Navigation</string>
<string name="controller_c">C-Stick Navigation</string>
<string name="controller_trig">Analog Triggers</string>
<string name="modifier_range">Modifier Range</string>
<string name="modifier_range">Modifier Range</string>
<string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
<string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
@ -170,7 +95,7 @@
<string name="tilt_backward">Tilt Backward</string>
<string name="tilt_left">Tilt Left</string>
<string name="tilt_right">Tilt Right</string>
<string name="tilt_modifier">Tilt Modifier</string>
<string name="tilt_modifier">Tilt Modifier</string>
<string name="shake_x">Shake X</string>
<string name="shake_y">Shake Y</string>
<string name="shake_z">Shake Z</string>
@ -234,19 +159,10 @@
<string name="turntable_crossfade_right">Crossfade Right</string>
<!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string>
<string name="cached_interpreter">Cached Interpreter</string>
<string name="jit64_recompiler">JIT64 Recompiler</string>
<string name="jitil_recompiler">JITIL Recompiler</string>
<string name="jit_arm_recompiler">JIT ARM Recompiler</string>
<string name="jit_arm64_recompiler">JIT ARM64 Recompiler</string>
<string name="cpu_settings">CPU</string>
<string name="cpu_core">CPU Core</string>
<string name="cpu_core_desc">%s</string>
<string name="dual_core">Dual Core</string>
<string name="dual_core_descrip">Split workload to two CPU cores instead of one. Increases speed.</string>
<string name="fastmem">Fastmem</string>
<string name="fastmem_desc">Uses potentially unsafe optimizations for memory access.</string>
<string name="overclock_enable">Override Emulated CPU Clock Speed</string>
<string name="overclock_enable_description">Higher values can make variable-framerate games run at a higher framerate, requiring a powerful device. Lower values make games run at a lower framerate, increasing emulation speed, but reducing the emulated console\'s performance.</string>
<string name="overclock_title">Emulated CPU Clock Speed</string>
@ -258,10 +174,6 @@
<!-- Video Preference Fragment -->
<string name="video_settings">Video</string>
<string name="software_renderer">Software Renderer</string>
<string name="opengl_es3">OpenGL ES</string>
<string name="opengl">OpenGL</string>
<string name="video_backend">Video Backend</string>
<string name="video_backend_descrip">Select the API used for graphics rendering.</string>
<string name="show_fps">Show FPS</string>
@ -306,13 +218,8 @@
<string name="texture_cache">Texture Cache</string>
<string name="texture_cache_accuracy">Texture Cache Accuracy</string>
<string name="texture_cache_accuracy_descrip">The safer the selection, the less likely the emulator will be missing any texture updates from RAM.</string>
<string name="texture_cache_accuracy_low">Low</string>
<string name="texture_cache_accuracy_medium">Medium</string>
<string name="texture_cache_accuracy_high">High</string>
<string name="external_frame_buffer">External Frame Buffer</string>
<string name="external_frame_buffer_descrip">Determines how the XFB will be emulated.</string>
<string name="external_frame_buffer_virtual">Virtual</string>
<string name="external_frame_buffer_real">Real</string>
<string name="disable_destination_alpha">Disable Destination Alpha</string>
<string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
<string name="fast_depth_calculation">Fast Depth Calculation</string>
@ -323,14 +230,11 @@
<!-- Miscellaneous -->
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>
<string name="disabled">Disabled</string>
<string name="other">Other</string>
<!-- New UI Strings -->
<string name="title_new_ui">Dolphin New UI</string>
<!-- Game Grid Screen-->
<string name="grid_menu_core_settings">CPU Settings</string>
<string name="grid_menu_video_settings">Video Settings</string>
@ -346,15 +250,19 @@
<!-- Preferences Screen -->
<string name="preferences_exit_no_save">Exit Without Saving</string>
<string name="preferences_settings">Settings</string>
<string name="preferences_cpu">CPU Settings</string>
<string name="preferences_input">Input Settings</string>
<string name="preferences_extensions">Extension Bindings</string>
<string name="preferences_video">Video Settings</string>
<string name="emulation_title">Emulation Activity</string>
<string name="dialog_seekbar_pos">OK</string>
<string name="dialog_seekbar_neg">Cancel</string>
<!-- Emulation Menu -->
<string name="emulation_screenshot">Take Screenshot</string>
<string name="emulation_savestate">Save State</string>
<string name="emulation_loadstate">Load State</string>
<string name="emulation_exit">Exit</string>
<string name="emulation_slot1">Slot 1</string>
<string name="emulation_slot2">Slot 2</string>
<string name="emulation_slot3">Slot 3</string>
<string name="emulation_slot4">Slot 4</string>
<string name="emulation_slot5">Slot 5</string>
<string name="emulation_slot6">Slot 6</string>
<string name="emulation_quicksave">Quick Save</string>
<string name="emulation_quickload">Quick Load</string>
<string name="emulation_refresh_wiimotes">Refresh Wiimotes</string>

29
Source/Android/app/src/main/res/values/styles.xml
View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- inherit from the material theme -->
<!-- Inherit from the material theme -->
<style name="DolphinBase" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Main theme colors -->
<!-- your app branding color for the app bar -->
<!-- Branding color for the app bar -->
<item name="colorPrimary">@color/dolphin_blue</item>
<!-- darker variant for the status bar and contextual app bars -->
<!-- Darker variant for the status bar and contextual app bars -->
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<!--enable window content transitions-->
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
@ -22,9 +23,9 @@
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Inherit from the Base Dolphin Theme-->
<!-- Inherit from the Base Dolphin Theme -->
<style name="DolphinWii" parent="DolphinBase">
<!-- theme UI controls like checkboxes and text fields -->
<!-- Theme UI controls like checkboxes and text fields -->
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
@ -36,7 +37,7 @@
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<!-- Inherit from the Base Dolphin Settings Theme-->
<!-- Inherit from the Base Dolphin Settings Theme -->
<style name="DolphinSettingsWii" parent="DolphinSettingsBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
@ -46,7 +47,7 @@
</style>
<style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
<!-- theme UI controls like checkboxes and text fields -->
<!-- Theme UI controls like checkboxes and text fields -->
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
</style>
@ -56,7 +57,7 @@
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Inherit from the Base Dolphin Dialog Theme-->
<!-- Inherit from the Base Dolphin Dialog Theme -->
<style name="DolphinDialogWii" parent="DolphinDialogBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
@ -76,13 +77,13 @@
<item name="android:windowBackground">@android:color/black</item>
<!--enable window content transitions-->
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
</style>
<!-- Inherit from the Base Dolphin Emulation Theme-->
<!-- Inherit from the Base Dolphin Emulation Theme -->
<style name="DolphinEmulationWii" parent="DolphinEmulationBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
@ -102,13 +103,13 @@
<item name="android:windowBackground">@android:color/black</item>
<!--enable window content transitions-->
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
</style>
<!-- Inherit from the Base Dolphin Emulation Theme-->
<!-- Inherit from the Base Dolphin Emulation Theme -->
<style name="DolphinEmulationTvWii" parent="DolphinEmulationTvBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
@ -131,7 +132,7 @@
<item name="colorPrimary">@color/dolphin_blue</item>
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<!--enable window content transitions-->
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>

8
Source/Android/jni/MainAndroid.cpp
View File

@ -429,8 +429,6 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetPlatform(
jstring jFilename);
JNIEXPORT jstring JNICALL
Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, jobject obj);
JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv* env,
jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env,
jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv* env,
@ -585,12 +583,6 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersio
return env->NewStringUTF(scm_rev_str.c_str());
}
JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv* env,
jobject obj)
{
return cpu_info.bASIMD;
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env,
jobject obj)
{