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

Realign with cherry-pick and fix formatting

This commit is contained in:
TwistedUmbrella 2018-04-02 05:10:16 -04:00
parent c9be03bc5e
commit 29ce6bd71a
6 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/android-studio/app/src/main/java/com/reicast/emulator/AboutFragment.java
View File

@ -219,9 +219,9 @@ public class AboutFragment extends Fragment {
HttpURLConnection conn = (HttpURLConnection) new URL(urlString).openConnection();
conn.setRequestMethod("GET");
conn.setDoInput(true);
int responseCode = conn.getResponseCode();
if (responseCode != HttpsURLConnection.HTTP_OK) {
int responseCode = conn.getResponseCode();
if (responseCode == HttpsURLConnection.HTTP_OK) {
InputStream is = new BufferedInputStream(conn.getInputStream());
ByteArrayOutputStream result = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];

5
shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java
View File

@ -467,9 +467,8 @@ public class FileBrowser extends Fragment {
((TextView) childview.findViewById(R.id.item_name)).setText(file.getName());
((ImageView) childview.findViewById(R.id.item_icon))
.setImageResource(file == null ? R.drawable.config
: file.isDirectory() ? R.drawable.open_folder
: R.drawable.disk_unknown);
.setImageResource(file == null ? R.drawable.config : file.isDirectory()
? R.drawable.open_folder : R.drawable.disk_unknown);
childview.setTag(file);

9
shell/android-studio/app/src/main/java/com/reicast/emulator/MainActivity.java
View File

@ -247,7 +247,8 @@ public class MainActivity extends AppCompatActivity implements
public void onGameSelected(Uri uri) {
if (Config.readOutput("uname -a").equals(getString(R.string.error_kernel))) {
MainActivity.showToastMessage(MainActivity.this, getString(R.string.unsupported), R.drawable.ic_notification, Toast.LENGTH_SHORT);
MainActivity.showToastMessage(MainActivity.this, getString(R.string.unsupported),
R.drawable.ic_notification, Toast.LENGTH_SHORT);
}
String msg = null;
if (!isBiosExisting(MainActivity.this))
@ -258,7 +259,8 @@ public class MainActivity extends AppCompatActivity implements
if (msg != null) {
launchBIOSdetection();
} else {
Config.nativeact = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getBoolean(Config.pref_nativeact, Config.nativeact);
Config.nativeact = PreferenceManager.getDefaultSharedPreferences(
getApplicationContext()).getBoolean(Config.pref_nativeact, Config.nativeact);
if (Config.nativeact) {
startActivity(new Intent("com.reicast.EMULATOR", uri, getApplicationContext(),
GL2JNINative.class));
@ -301,7 +303,8 @@ public class MainActivity extends AppCompatActivity implements
builder.setNegativeButton(R.string.gdrive,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Toast.makeText(MainActivity.this, R.string.require_bios, Toast.LENGTH_SHORT).show();
Toast.makeText(MainActivity.this,
R.string.require_bios, Toast.LENGTH_SHORT).show();
}
});
builder.create();

1
shell/android-studio/app/src/main/java/com/reicast/emulator/debug/UploadLogs.java
View File

@ -108,7 +108,6 @@ public class UploadLogs extends AsyncTask<String, Integer, Object> {
os.close();
int responseCode = conn.getResponseCode();
if (responseCode != HttpsURLConnection.HTTP_OK) {
String header = conn.getHeaderField("Location");
if (header != null && header.length() != 0) {

13
shell/android-studio/app/src/main/res/layout/mainuilayout_fragment.xml
View File

@ -1,16 +1,10 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<!-- The main content view -->
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<!-- The main content view -->
<LinearLayout
android:id="@+id/root_list"
android:layout_width="match_parent"
@ -59,6 +53,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</FrameLayout>
</android.support.v4.widget.DrawerLayout>
</FrameLayout>

2
shell/android-studio/app/src/main/res/values-de/strings.xml
View File

@ -87,7 +87,7 @@
<string name="moga_connect">MOGA verbunden!</string>
<string name="about_text">reicast ist ein Dreamcast-Emulator</string>
<string name="revision_text">Version: %1$s</string>
<string name="revision_text">Version: %1$s [%2$s]</string>
<string-array name="controllers">
<item>Controller A</item>