From b86a2c92e682695062957224f07dbd9d0142b1a9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 15 Dec 2013 01:33:17 +0100 Subject: [PATCH] (Android) Make common RetroActivityCommon that both RetroActivityFuture and RetroActivityPast extend from --- .../browser/RetroActivityCommon.java | 77 ++++++++++++++++++ .../browser/RetroActivityFuture.java | 74 +---------------- .../retroarch/browser/RetroActivityPast.java | 80 +------------------ 3 files changed, 80 insertions(+), 151 deletions(-) create mode 100644 android/phoenix/src/com/retroarch/browser/RetroActivityCommon.java diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivityCommon.java b/android/phoenix/src/com/retroarch/browser/RetroActivityCommon.java new file mode 100644 index 0000000000..791f33fea9 --- /dev/null +++ b/android/phoenix/src/com/retroarch/browser/RetroActivityCommon.java @@ -0,0 +1,77 @@ +package com.retroarch.browser; + +import com.retroarch.browser.mainmenu.MainMenuActivity; +import com.retroarch.browser.preferences.util.UserPreferences; + +import android.app.NativeActivity; +import android.content.Intent; +import android.util.Log; + +public class RetroActivityCommon extends NativeActivity { + private Intent pendingIntent = null; + @Override + public void onDestroy() + { + UserPreferences.readbackConfigFile(this); + } + + @Override + public void onLowMemory() + { + } + + @Override + public void onTrimMemory(int level) + { + } + + @Override + public void onNewIntent(Intent intent) + { + Log.i("RetroActivity", "onNewIntent invoked."); + super.onNewIntent(intent); + setIntent(intent); + pendingIntent = intent; + } + + public String getPendingIntentFullPath() + { + return pendingIntent.getStringExtra("ROM"); + } + + public String getPendingIntentLibretroPath() + { + return pendingIntent.getStringExtra("LIBRETRO"); + } + + public String getPendingIntentConfigPath() + { + return pendingIntent.getStringExtra("CONFIGFILE"); + } + + public String getPendingIntentIME() + { + return pendingIntent.getStringExtra("IME"); + } + + public boolean hasPendingIntent() + { + if (pendingIntent == null) + return false; + return true; + } + + public void clearPendingIntent() + { + pendingIntent = null; + } + + @Override + public void onBackPressed() + { + Log.i("RetroActivity", "onBackKeyPressed"); + Intent retro = new Intent(this, MainMenuActivity.class); + retro.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(retro); + } +} diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivityFuture.java b/android/phoenix/src/com/retroarch/browser/RetroActivityFuture.java index 3ad03c6b10..da5665f460 100644 --- a/android/phoenix/src/com/retroarch/browser/RetroActivityFuture.java +++ b/android/phoenix/src/com/retroarch/browser/RetroActivityFuture.java @@ -2,12 +2,7 @@ package com.retroarch.browser; import java.io.IOException; -import com.retroarch.browser.mainmenu.MainMenuActivity; -import com.retroarch.browser.preferences.util.UserPreferences; - import android.annotation.SuppressLint; -import android.app.NativeActivity; -import android.content.Intent; import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture.OnFrameAvailableListener; import android.hardware.Camera; @@ -17,13 +12,12 @@ import android.util.Log; //For Android 3.0 and up @SuppressLint("NewApi") -public final class RetroActivityFuture extends NativeActivity +public final class RetroActivityFuture extends RetroActivityCommon { private Camera mCamera; private long lastTimestamp = 0; private SurfaceTexture texture; private boolean updateSurface = true; - private Intent pendingIntent = null; public void onCameraStart() { @@ -96,69 +90,5 @@ public final class RetroActivityFuture extends NativeActivity mCamera.setPreviewTexture(texture); } - @Override - public void onDestroy() - { - UserPreferences.readbackConfigFile(this); - } - - @Override - public void onLowMemory() - { - } - - @Override - public void onTrimMemory(int level) - { - } - - @Override - public void onNewIntent(Intent intent) - { - Log.i("RetroActivity", "onNewIntent invoked."); - super.onNewIntent(intent); - setIntent(intent); - pendingIntent = intent; - } - - public String getPendingIntentFullPath() - { - return pendingIntent.getStringExtra("ROM"); - } - - public String getPendingIntentLibretroPath() - { - return pendingIntent.getStringExtra("LIBRETRO"); - } - - public String getPendingIntentConfigPath() - { - return pendingIntent.getStringExtra("CONFIGFILE"); - } - - public String getPendingIntentIME() - { - return pendingIntent.getStringExtra("IME"); - } - - public boolean hasPendingIntent() - { - if (pendingIntent == null) - return false; - return true; - } - - public void clearPendingIntent() - { - pendingIntent = null; - } - - @Override - public void onBackPressed() - { - Log.i("RetroActivity", "onBackKeyPressed"); - Intent retro = new Intent(this, MainMenuActivity.class); - retro.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(retro); - } + } diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivityPast.java b/android/phoenix/src/com/retroarch/browser/RetroActivityPast.java index 9ed09cc3c2..393ccd2824 100644 --- a/android/phoenix/src/com/retroarch/browser/RetroActivityPast.java +++ b/android/phoenix/src/com/retroarch/browser/RetroActivityPast.java @@ -2,20 +2,10 @@ package com.retroarch.browser; import java.io.IOException; -import com.retroarch.browser.mainmenu.MainMenuActivity; -import com.retroarch.browser.preferences.util.UserPreferences; - -import android.annotation.SuppressLint; -import android.app.NativeActivity; -import android.content.Intent; -import android.util.Log; - // For Android 2.3.x -public final class RetroActivityPast extends NativeActivity +public final class RetroActivityPast extends RetroActivityCommon { - private Intent pendingIntent = null; - public void onCameraStart() { } @@ -37,79 +27,11 @@ public final class RetroActivityPast extends NativeActivity { } - @SuppressLint("NewApi") public void onCameraTextureInit(int gl_texid) { } - @SuppressLint("NewApi") public void onCameraSetTexture(int gl_texid) throws IOException { } - - @Override - public void onDestroy() - { - UserPreferences.readbackConfigFile(this); - } - - @Override - public void onLowMemory() - { - } - - @Override - public void onTrimMemory(int level) - { - } - - @Override - public void onNewIntent(Intent intent) - { - Log.i("RetroActivity", "onNewIntent invoked."); - super.onNewIntent(intent); - setIntent(intent); - pendingIntent = intent; - } - - public String getPendingIntentFullPath() - { - return pendingIntent.getStringExtra("ROM"); - } - - public String getPendingIntentLibretroPath() - { - return pendingIntent.getStringExtra("LIBRETRO"); - } - - public String getPendingIntentConfigPath() - { - return pendingIntent.getStringExtra("CONFIGFILE"); - } - - public String getPendingIntentIME() - { - return pendingIntent.getStringExtra("IME"); - } - - public boolean hasPendingIntent() - { - if (pendingIntent == null) - return false; - return true; - } - - public void clearPendingIntent() - { - pendingIntent = null; - } - - @Override - public void onBackPressed() - { - Log.i("RetroActivity", "onBackKeyPressed"); - Intent retro = new Intent(this, MainMenuActivity.class); - retro.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(retro); - } }