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 #1544 from lioncash/android 

Android: Misc Changes
This commit is contained in:
Lioncash 2014-11-15 02:57:59 -05:00
parent d8b673e864 7d8248e24f
commit e47bfc2788
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Android/AndroidManifest.xml
View File

@ -6,8 +6,8 @@
android:installLocation="auto">
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="19" />
android:minSdkVersion="17"
android:targetSdkVersion="21" />
<uses-feature android:glEsVersion="0x00020000" />
@ -19,7 +19,8 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:allowBackup="true">
android:allowBackup="true"
android:supportsRtl="true">
<activity
android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
android:label="@string/app_name"

4
Source/Android/res/layout/about_layout.xml
View File

@ -9,7 +9,7 @@
android:id="@+id/AboutItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:layout_marginStart="15dip"
android:layout_marginTop="6dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>
@ -18,7 +18,7 @@
android:id="@+id/AboutItemSubTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:layout_marginStart="15dip"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>

10
Source/Android/res/layout/folderbrowser_list_item.xml
View File

@ -14,7 +14,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="6dip"/>
android:layout_marginEnd="6dip"/>
<!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
<TextView tools:text="@string/file_size"
@ -24,9 +24,9 @@
android:textColor="#bbbbbb"
android:layout_toRightOf="@id/BrowserItemIcon"
android:layout_toEndOf="@id/BrowserItemIcon"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:singleLine="true"
android:ellipsize="marquee"
@ -45,8 +45,8 @@
android:singleLine="true"
android:ellipsize="end"
android:layout_toRightOf="@id/BrowserItemIcon"
android:layout_alignParentRight="true"
android:layout_toEndOf="@id/BrowserItemIcon"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_above="@id/BrowserItemSubTitle"
android:layout_alignWithParentIfMissing="true"

10
Source/Android/res/layout/gamelist_list_item.xml
View File

@ -14,7 +14,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="6dip"/>
android:layout_marginEnd="6dip"/>
<!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
<TextView tools:text="@string/file_size"
@ -24,9 +24,9 @@
android:textColor="#bbbbbb"
android:layout_toRightOf="@id/GameListItemIcon"
android:layout_toEndOf="@id/GameListItemIcon"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:singleLine="true"
android:ellipsize="marquee"
@ -45,8 +45,8 @@
android:singleLine="true"
android:ellipsize="end"
android:layout_toRightOf="@id/GameListItemIcon"
android:layout_alignParentRight="true"
android:layout_toEndOf="@id/GameListItemIcon"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_above="@id/GameListItemSubTitle"
android:layout_alignWithParentIfMissing="true"

2
Source/Android/res/layout/sidemenu.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:gravity="left"
android:gravity="start"
android:orientation="vertical" >
<TextView

5
Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -53,6 +53,11 @@ public final class NativeLibrary
public static final int PRESSED = 1;
}
private NativeLibrary()
{
// Disallows instantiation.
}
/**
* Default touchscreen device
*/

9
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
View File

@ -144,14 +144,7 @@ public final class FolderBrowser extends ListFragment
{
String isoPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
if (isoPath.equals(currentDir.getPath()))
{
pathNotPresent = false;
}
else
{
pathNotPresent = true;
}
pathNotPresent = !isoPath.equals(currentDir.getPath());
}
// User doesn't have this path in the config, so add it.

4
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
View File

@ -8,12 +8,8 @@ package org.dolphinemu.dolphinemu.gamelist;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import org.dolphinemu.dolphinemu.NativeLibrary;

5
Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
View File

@ -21,6 +21,11 @@ import android.preference.PreferenceManager;
*/
public final class UserPreferences
{
private UserPreferences()
{
// Disallows instantiation.
}
/**
* Loads the settings stored in the Dolphin ini config files to the shared preferences of this front-end.
*