Merge pull request #502 from fzurita/fix_warnings

Fix java warnings
mupen64plus-ae · Oct 30, 2015 · 6e2ac62 · 6e2ac62
2 parents c2058e1 + 4f3f8d3
commit 6e2ac62
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -28,6 +28,7 @@
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/appTheme"
+        android:supportsRtl="true"
         tools:ignore="UnusedAttribute" >
         <activity
             android:name="paulscode.android.mupen64plusae.SplashActivity"

diff --git a/src/paulscode/android/mupen64plusae/GalleryActivity.java b/src/paulscode/android/mupen64plusae/GalleryActivity.java
@@ -131,6 +131,7 @@ protected void onNewIntent( Intent intent )
         setIntent( intent );
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected void onCreate( Bundle savedInstanceState )
     {

diff --git a/src/paulscode/android/mupen64plusae/cheat/CheatPreference.java b/src/paulscode/android/mupen64plusae/cheat/CheatPreference.java
@@ -212,4 +212,9 @@ private void refreshWidgets()
             mCheckbox.setChecked( isCheatEnabled() );
         }
     }
+
+    public int getCheatIndex()
+    {
+        return mCheatIndex;
+    }
 }
diff --git a/src/paulscode/android/mupen64plusae/input/map/VisibleTouchMap.java b/src/paulscode/android/mupen64plusae/input/map/VisibleTouchMap.java
@@ -23,7 +23,6 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import paulscode.android.mupen64plusae.game.GameOverlay;
-import paulscode.android.mupen64plusae.input.AbstractController;
 import paulscode.android.mupen64plusae.persistent.ConfigFile;
 import paulscode.android.mupen64plusae.profile.Profile;
 import paulscode.android.mupen64plusae.util.Image;

diff --git a/src/paulscode/android/mupen64plusae/persistent/GlobalPrefsActivity.java b/src/paulscode/android/mupen64plusae/persistent/GlobalPrefsActivity.java
@@ -45,12 +45,10 @@ public class GlobalPrefsActivity extends AppCompatPreferenceActivity implements
     private static final String CATEGORY_LIBRARY = "categoryLibrary";
     private static final String CATEGORY_DISPLAY = "categoryDisplay";
     private static final String CATEGORY_AUDIO = "categoryAudio";
-    private static final String CATEGORY_TOUCHSCREEN = "categoryTouchscreen";
     private static final String CATEGORY_TOUCHPAD = "categoryTouchpad";
     private static final String CATEGORY_INPUT = "categoryInput";
     private static final String CATEGORY_DATA = "categoryData";
 
-    private static final String DISPLAY_ORIENTATION = "displayOrientation";
     private static final String DISPLAY_IMMERSIVE_MODE = "displayImmersiveMode";
     private static final String DISPLAY_FPS_REFRESH = "displayFpsRefresh";
     private static final String VIDEO_POLYGON_OFFSET = "videoPolygonOffset";
@@ -61,8 +59,6 @@ public class GlobalPrefsActivity extends AppCompatPreferenceActivity implements
     private static final String AUDIO_SLES_BUFFER_NBR = "audioSLESBufferNbr";
     private static final String AUDIO_SYNCHRONIZE = "audioSynchronize";
     private static final String AUDIO_SWAP_CHANNELS = "audioSwapChannels";
-    private static final String TOUCHSCREEN_FEEDBACK = "touchscreenFeedback";
-    private static final String TOUCHSCREEN_AUTO_HOLD = "touchscreenAutoHold";
     private static final String NAVIGATION_MODE = "navigationMode";
 
     private static final String ACTION_RELOAD_ASSETS = "actionReloadAssets";

diff --git a/src/paulscode/android/mupen64plusae/profile/EmulationProfileActivity.java b/src/paulscode/android/mupen64plusae/profile/EmulationProfileActivity.java
@@ -52,7 +52,6 @@ public class EmulationProfileActivity extends ProfileActivity
     private static final String GLIDEN64_MULTI_SAMPLING = "MultiSampling";
     private static final String GLIDEN64_ENABLE_LOD = "EnableLOD";
     private static final String GLIDEN64_ENABLE_SHADER_STORAGE = "EnableShaderStorage";
-    private static final String GLIDEN64_ENABLE_COPY_COLOR_TO_RDRAM = "EnableCopyColorToRDRAM";
     private static final String GLIDEN64_ENABLE_COPY_DEPTH_TO_RDRAM = "EnableCopyDepthToRDRAM";
     private static final String GLIDEN64_ENABLE_N64_DEPTH_COMPARE = "EnableN64DepthCompare";
     private static final String GLIDEN64_ENABLE_FB_EMULATION = "EnableFBEmulation";
@@ -64,7 +63,6 @@ public class EmulationProfileActivity extends ProfileActivity
     private static final String LIBRICE_SO = "libmupen64plus-video-rice.so";
     private static final String LIBGLN64_SO = "libmupen64plus-video-gln64.so";
     private static final String GLES20 = "-gles20";
-    private static final String GLES30 = "-gles30";
     private static final String GLES31 = "-gles31";
 
     // Preference menu items
@@ -147,7 +145,6 @@ protected void refreshViews()
         {
             mScreenRoot.addPreference( mCategoryGliden64 );
             boolean isGles20 = GLES20.equals( videoSubPlugin );
-            boolean isGles30 = GLES30.equals( videoSubPlugin );
             boolean isGles31 = GLES31.equals( videoSubPlugin );
             findPreference( GLIDEN64_MULTI_SAMPLING ).setEnabled( isGles31 );
             findPreference( GLIDEN64_ENABLE_LOD ).setEnabled( !isGles20 );

diff --git a/src/paulscode/android/mupen64plusae/task/ExtractCheatsTask.java b/src/paulscode/android/mupen64plusae/task/ExtractCheatsTask.java
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 
 import paulscode.android.mupen64plusae.cheat.CheatUtils;
-import paulscode.android.mupen64plusae.cheat.CheatFile.CheatSection;
 import paulscode.android.mupen64plusae.cheat.CheatUtils.Cheat;
 import android.content.Context;
 import android.os.AsyncTask;