mirror of
https://github.com/libretro/RetroArch
synced 2025-02-28 22:13:51 +00:00
Move MSVC 2017 files to android/phoenix
This commit is contained in:
twinaphex
parent
4a9ef99759
commit
f53349e3dd
@ -35,7 +35,7 @@
|
|||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\..\..\..\griffin\griffin.c">
|
<ClCompile Include="..\..\..\griffin\griffin.c">
|
||||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsC</CompileAs>
|
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsC</CompileAs>
|
||||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsC</CompileAs>
|
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsC</CompileAs>
|
||||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsC</CompileAs>
|
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsC</CompileAs>
|
||||||
@ -45,7 +45,7 @@
|
|||||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs>
|
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs>
|
||||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsC</CompileAs>
|
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsC</CompileAs>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\griffin\griffin_cpp.cpp">
|
<ClCompile Include="..\..\..\griffin\griffin_cpp.cpp">
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">c++11</CppLanguageStandard>
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">c++11</CppLanguageStandard>
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">c++11</CppLanguageStandard>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">c++11</CppLanguageStandard>
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">c++11</CppLanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\griffin\griffin_glslang.cpp">
|
<ClCompile Include="..\..\..\griffin\griffin_glslang.cpp">
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">c++11</CppLanguageStandard>
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">c++11</CppLanguageStandard>
|
||||||
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">c++11</CppLanguageStandard>
|
<CppLanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">c++11</CppLanguageStandard>
|
||||||
@ -44,42 +44,34 @@
|
|||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<AndroidAPILevel>android-23</AndroidAPILevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(AndroidTargetsPath)\Android.props" />
|
<Import Project="$(AndroidTargetsPath)\Android.props" />
|
||||||
<ImportGroup Label="ExtensionSettings" />
|
<ImportGroup Label="ExtensionSettings" />
|
||||||
@ -129,10 +121,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AntBuildXml Include="build.xml" />
|
<AntBuildXml Include="build.xml" />
|
||||||
<AndroidManifest Include="AndroidManifest.xml" />
|
<AndroidManifest Include="AndroidManifest.xml" />
|
||||||
<AntProjectPropertiesFile Include="project.properties" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\msvc-2017-android.NativeActivity\msvc-2017-android.NativeActivity.vcxproj">
|
<ProjectReference Include="msvc-2017-android.NativeActivity.vcxproj">
|
||||||
<Project>{e27d73ec-6148-4817-b75c-adaa0c563939}</Project>
|
<Project>{e27d73ec-6148-4817-b75c-adaa0c563939}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26228.9
|
|||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msvc-2017-android", "msvc-2017-android", "{82FC602D-4083-4ED5-858B-A066A4280E4C}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msvc-2017-android", "msvc-2017-android", "{82FC602D-4083-4ED5-858B-A066A4280E4C}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{39E2626F-3545-4960-A6E8-258AD8476CE5}") = "msvc-2017-android.Packaging", "msvc-2017-android.Packaging\msvc-2017-android.Packaging.androidproj", "{94B52983-76DE-4545-A708-433C377727C7}"
|
Project("{39E2626F-3545-4960-A6E8-258AD8476CE5}") = "msvc-2017-android.Packaging", "msvc-2017-android.Packaging.androidproj", "{94B52983-76DE-4545-A708-433C377727C7}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2017-android.NativeActivity", "msvc-2017-android.NativeActivity\msvc-2017-android.NativeActivity.vcxproj", "{E27D73EC-6148-4817-B75C-ADAA0C563939}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2017-android.NativeActivity", "msvc-2017-android.NativeActivity.vcxproj", "{E27D73EC-6148-4817-B75C-ADAA0C563939}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -1,43 +0,0 @@
|
|||||||
<!-- <!DOCTYPE manifest [ <!ENTITY % versionDTD SYSTEM "../../../version.dtd"> %versionDTD; ]> !-->
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="com.retroarch"
|
|
||||||
android:versionCode="70"
|
|
||||||
android:versionName="1.7.3"
|
|
||||||
android:installLocation="internalOnly">
|
|
||||||
<uses-feature android:glEsVersion="0x00020000" />
|
|
||||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
|
||||||
<uses-feature android:name="android.software.leanback" android:required="false" />
|
|
||||||
<uses-feature android:name="android.hardware.gamepad" android:required="false"/>
|
|
||||||
<uses-sdk
|
|
||||||
android:minSdkVersion="9"
|
|
||||||
android:targetSdkVersion="24" />
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
||||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
|
|
||||||
<application
|
|
||||||
android:allowBackup="true"
|
|
||||||
android:icon="@drawable/ic_launcher"
|
|
||||||
android:label="RetroArch"
|
|
||||||
android:hasCode="true"
|
|
||||||
android:isGame="true"
|
|
||||||
android:banner="@drawable/banner">
|
|
||||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
|
|
||||||
<activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
|
||||||
<category android:name="tv.ouya.intent.category.GAME" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
<activity android:name="com.retroarch.browser.retroactivity.RetroActivityFuture" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
|
|
||||||
<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
|
|
||||||
<meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
|
|
||||||
</activity>
|
|
||||||
<activity android:name="com.retroarch.browser.retroactivity.RetroActivityPast" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
|
|
||||||
<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
|
|
||||||
<meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
|
|
||||||
</activity>
|
|
||||||
</application>
|
|
||||||
</manifest>
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="$(projectname)" default="help">
|
|
||||||
|
|
||||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
|
||||||
'android' tool to add properties to it.
|
|
||||||
This is the place to change some Ant specific build properties.
|
|
||||||
Here are some properties you may want to change/update:
|
|
||||||
|
|
||||||
source.dir
|
|
||||||
The name of the source directory. Default is 'src'.
|
|
||||||
out.dir
|
|
||||||
The name of the output directory. Default is 'bin'.
|
|
||||||
|
|
||||||
For other overridable properties, look at the beginning of the rules
|
|
||||||
files in the SDK, at tools/ant/build.xml
|
|
||||||
|
|
||||||
Properties related to the SDK location or the project target should
|
|
||||||
be updated using the 'android' tool with the 'update' action.
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<property file="ant.properties" />
|
|
||||||
|
|
||||||
<!-- if sdk.dir was not set from one of the property file, then
|
|
||||||
get it from the ANDROID_HOME env var. -->
|
|
||||||
<property environment="env" />
|
|
||||||
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
|
||||||
<isset property="env.ANDROID_HOME" />
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<!-- The project.properties file contains project specific properties such as
|
|
||||||
project target, and library dependencies. Lower level build properties are
|
|
||||||
stored in ant.properties
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="project.properties" />
|
|
||||||
|
|
||||||
<!-- quick check on sdk.dir -->
|
|
||||||
<fail
|
|
||||||
message="sdk.dir is missing. Make sure ANDROID_HOME environment variable is correctly set."
|
|
||||||
unless="sdk.dir"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Import per project custom build rules if present at the root of the project.
|
|
||||||
This is the place to put custom intermediary targets such as:
|
|
||||||
-pre-build
|
|
||||||
-pre-compile
|
|
||||||
-post-compile (This is typically used for code obfuscation.
|
|
||||||
Compiled code location: ${out.classes.absolute.dir}
|
|
||||||
If this is not done in place, override ${out.dex.input.absolute.dir})
|
|
||||||
-post-package
|
|
||||||
-post-build
|
|
||||||
-pre-clean
|
|
||||||
-->
|
|
||||||
<import file="custom_rules.xml" optional="true" />
|
|
||||||
|
|
||||||
<!-- Import the actual build file.
|
|
||||||
|
|
||||||
To customize existing targets, there are two options:
|
|
||||||
- Customize only one target:
|
|
||||||
- copy/paste the target into this file, *before* the
|
|
||||||
<import> task.
|
|
||||||
- customize it to your needs.
|
|
||||||
- Customize the whole content of build.xml
|
|
||||||
- copy/paste the content of the rules files (minus the top node)
|
|
||||||
into this file, replacing the <import> task.
|
|
||||||
- customize to your needs.
|
|
||||||
|
|
||||||
***********************
|
|
||||||
****** IMPORTANT ******
|
|
||||||
***********************
|
|
||||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
|
||||||
in order to avoid having your file be overridden by tools such as "android update project"
|
|
||||||
-->
|
|
||||||
<!-- version-tag: 1 -->
|
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
|
|
||||||
<target name="-pre-compile">
|
|
||||||
<path id="project.all.jars.path">
|
|
||||||
<path path="${toString:project.all.jars.path}"/>
|
|
||||||
<fileset dir="${jar.libs.dir}">
|
|
||||||
<include name="*.jar"/>
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 690 B |
Binary file not shown.
|
Before Width: | Height: | Size: 853 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
@ -1,200 +0,0 @@
|
|||||||
package com.retroarch.browser.mainmenu;
|
|
||||||
|
|
||||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
|
||||||
import com.retroarch.browser.retroactivity.RetroActivityFuture;
|
|
||||||
import com.retroarch.browser.retroactivity.RetroActivityPast;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.content.pm.ApplicationInfo;
|
|
||||||
import android.media.AudioManager;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Environment;
|
|
||||||
import android.preference.PreferenceActivity;
|
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
import android.provider.Settings;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.Manifest;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link PreferenceActivity} subclass that provides all of the
|
|
||||||
* functionality of the main menu screen.
|
|
||||||
*/
|
|
||||||
public final class MainMenuActivity extends PreferenceActivity
|
|
||||||
{
|
|
||||||
final private int REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS = 124;
|
|
||||||
boolean checkPermissions = false;
|
|
||||||
|
|
||||||
public void showMessageOKCancel(String message, DialogInterface.OnClickListener onClickListener)
|
|
||||||
{
|
|
||||||
new AlertDialog.Builder(this).setMessage(message)
|
|
||||||
.setPositiveButton("OK", onClickListener).setCancelable(false)
|
|
||||||
.setNegativeButton("Cancel", null).create().show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean addPermission(List<String> permissionsList, String permission)
|
|
||||||
{
|
|
||||||
if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED)
|
|
||||||
{
|
|
||||||
permissionsList.add(permission);
|
|
||||||
|
|
||||||
// Check for Rationale Option
|
|
||||||
if (!shouldShowRequestPermissionRationale(permission))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void checkRuntimePermissions()
|
|
||||||
{
|
|
||||||
if (android.os.Build.VERSION.SDK_INT >= 23)
|
|
||||||
{
|
|
||||||
// Android 6.0+ needs runtime permission checks
|
|
||||||
List<String> permissionsNeeded = new ArrayList<String>();
|
|
||||||
final List<String> permissionsList = new ArrayList<String>();
|
|
||||||
|
|
||||||
if (!addPermission(permissionsList, Manifest.permission.READ_EXTERNAL_STORAGE))
|
|
||||||
permissionsNeeded.add("Read External Storage");
|
|
||||||
if (!addPermission(permissionsList, Manifest.permission.WRITE_EXTERNAL_STORAGE))
|
|
||||||
permissionsNeeded.add("Write External Storage");
|
|
||||||
|
|
||||||
if (permissionsList.size() > 0)
|
|
||||||
{
|
|
||||||
checkPermissions = true;
|
|
||||||
|
|
||||||
if (permissionsNeeded.size() > 0)
|
|
||||||
{
|
|
||||||
// Need Rationale
|
|
||||||
Log.i("MainMenuActivity", "Need to request external storage permissions.");
|
|
||||||
|
|
||||||
String message = "You need to grant access to " + permissionsNeeded.get(0);
|
|
||||||
|
|
||||||
for (int i = 1; i < permissionsNeeded.size(); i++)
|
|
||||||
message = message + ", " + permissionsNeeded.get(i);
|
|
||||||
|
|
||||||
showMessageOKCancel(message,
|
|
||||||
new DialogInterface.OnClickListener()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void onClick(DialogInterface dialog, int which)
|
|
||||||
{
|
|
||||||
if (which == AlertDialog.BUTTON_POSITIVE)
|
|
||||||
{
|
|
||||||
requestPermissions(permissionsList.toArray(new String[permissionsList.size()]),
|
|
||||||
REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
|
|
||||||
|
|
||||||
Log.i("MainMenuActivity", "User accepted request for external storage permissions.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
requestPermissions(permissionsList.toArray(new String[permissionsList.size()]),
|
|
||||||
REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
|
|
||||||
|
|
||||||
Log.i("MainMenuActivity", "Requested external storage permissions.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!checkPermissions)
|
|
||||||
{
|
|
||||||
finalStartup();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void finalStartup()
|
|
||||||
{
|
|
||||||
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
|
||||||
Intent retro;
|
|
||||||
|
|
||||||
if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB))
|
|
||||||
{
|
|
||||||
retro = new Intent(this, RetroActivityFuture.class);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
retro = new Intent(this, RetroActivityPast.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
retro.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
||||||
|
|
||||||
startRetroActivity(
|
|
||||||
retro,
|
|
||||||
null,
|
|
||||||
prefs.getString("libretro_path", getApplicationInfo().dataDir + "/cores/"),
|
|
||||||
UserPreferences.getDefaultConfigPath(this),
|
|
||||||
Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD),
|
|
||||||
getApplicationInfo().dataDir,
|
|
||||||
getApplicationInfo().sourceDir);
|
|
||||||
startActivity(retro);
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
|
|
||||||
{
|
|
||||||
switch (requestCode)
|
|
||||||
{
|
|
||||||
case REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS:
|
|
||||||
for (int i = 0; i < permissions.length; i++)
|
|
||||||
{
|
|
||||||
if(grantResults[i] == PackageManager.PERMISSION_GRANTED)
|
|
||||||
{
|
|
||||||
Log.i("MainMenuActivity", "Permission: " + permissions[i] + " was granted.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.i("MainMenuActivity", "Permission: " + permissions[i] + " was not granted.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
finalStartup();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void startRetroActivity(Intent retro, String contentPath, String corePath,
|
|
||||||
String configFilePath, String imePath, String dataDirPath, String dataSourcePath)
|
|
||||||
{
|
|
||||||
if (contentPath != null) {
|
|
||||||
retro.putExtra("ROM", contentPath);
|
|
||||||
}
|
|
||||||
retro.putExtra("LIBRETRO", corePath);
|
|
||||||
retro.putExtra("CONFIGFILE", configFilePath);
|
|
||||||
retro.putExtra("IME", imePath);
|
|
||||||
retro.putExtra("DATADIR", dataDirPath);
|
|
||||||
retro.putExtra("APK", dataSourcePath);
|
|
||||||
retro.putExtra("SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath());
|
|
||||||
retro.putExtra("DOWNLOADS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
|
|
||||||
retro.putExtra("SCREENSHOTS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
|
|
||||||
String external = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/com.retroarch/files";
|
|
||||||
retro.putExtra("EXTERNAL", external);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState)
|
|
||||||
{
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
// Bind audio stream to hardware controls.
|
|
||||||
setVolumeControlStream(AudioManager.STREAM_MUSIC);
|
|
||||||
|
|
||||||
UserPreferences.updateConfigFile(this);
|
|
||||||
|
|
||||||
checkRuntimePermissions();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,281 +0,0 @@
|
|||||||
package com.retroarch.browser.preferences.util;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a configuration file that works off of a key-value pair
|
|
||||||
* in the form [key name] = "[value]".
|
|
||||||
*/
|
|
||||||
public final class ConfigFile
|
|
||||||
{
|
|
||||||
// Map containing all of the key-value pairs.
|
|
||||||
private final HashMap<String, String> map = new HashMap<String, String>();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*/
|
|
||||||
public ConfigFile()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*
|
|
||||||
* @param filePath The path to the configuration file to open.
|
|
||||||
*/
|
|
||||||
public ConfigFile(String filePath)
|
|
||||||
{
|
|
||||||
if (filePath == null)
|
|
||||||
throw new IllegalArgumentException("filePath cannot be null.");
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
open(filePath);
|
|
||||||
}
|
|
||||||
catch (IOException ioe)
|
|
||||||
{
|
|
||||||
Log.e("ConfigFile", "Stream reading the configuration file was suddenly closed for an unknown reason.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parses a configuration file from the given stream
|
|
||||||
* and appends the parsed values to the key-value map.
|
|
||||||
*
|
|
||||||
* @param stream The {@link InputStream} containing the configuration file to parse.
|
|
||||||
*/
|
|
||||||
public void append(InputStream stream) throws IOException
|
|
||||||
{
|
|
||||||
BufferedReader br = new BufferedReader(new InputStreamReader(stream));
|
|
||||||
|
|
||||||
String line;
|
|
||||||
while ((line = br.readLine()) != null)
|
|
||||||
parseLine(line);
|
|
||||||
|
|
||||||
br.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a configuration file given by configPath
|
|
||||||
* and parses all of its key-value pairs, adding
|
|
||||||
* them to the key-value map.
|
|
||||||
*
|
|
||||||
* @param configPath Path to the configuration file to parse.
|
|
||||||
*/
|
|
||||||
public void open(String configPath) throws IOException
|
|
||||||
{
|
|
||||||
clear();
|
|
||||||
append(new FileInputStream(configPath));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void parseLine(String line)
|
|
||||||
{
|
|
||||||
String[] tokens = line.split("=", 2);
|
|
||||||
if (tokens.length < 2)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (int i = 0; i < tokens.length; i++)
|
|
||||||
tokens[i] = tokens[i].trim();
|
|
||||||
|
|
||||||
String key = tokens[0];
|
|
||||||
String value = tokens[1];
|
|
||||||
|
|
||||||
if (value.startsWith("\""))
|
|
||||||
value = value.substring(1, value.lastIndexOf('\"'));
|
|
||||||
else
|
|
||||||
value = value.split(" ")[0];
|
|
||||||
|
|
||||||
if (value.length() > 0)
|
|
||||||
map.put(key, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the key-value map of all currently set keys and values.
|
|
||||||
*/
|
|
||||||
public void clear()
|
|
||||||
{
|
|
||||||
map.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes the currently set key-value pairs to
|
|
||||||
*
|
|
||||||
* @param path The path to save the
|
|
||||||
*
|
|
||||||
* @throws IOException
|
|
||||||
*/
|
|
||||||
public void write(String path) throws IOException
|
|
||||||
{
|
|
||||||
PrintWriter writer = new PrintWriter(path);
|
|
||||||
|
|
||||||
for (Map.Entry<String, String> entry : map.entrySet())
|
|
||||||
{
|
|
||||||
writer.println(entry.getKey() + " = \"" + entry.getValue() + "\"");
|
|
||||||
}
|
|
||||||
|
|
||||||
writer.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a key exists in the {@link HashMap}
|
|
||||||
* backing this ConfigFile instance.
|
|
||||||
*
|
|
||||||
* @param key The key to check for.
|
|
||||||
*
|
|
||||||
* @return true if the key exists in the HashMap backing
|
|
||||||
* this ConfigFile; false if it doesn't.
|
|
||||||
*/
|
|
||||||
public boolean keyExists(String key)
|
|
||||||
{
|
|
||||||
return map.containsKey(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a key to the given String value.
|
|
||||||
*
|
|
||||||
* @param key The key to set the String value to.
|
|
||||||
* @param value The String value to set to the key.
|
|
||||||
*/
|
|
||||||
public void setString(String key, String value)
|
|
||||||
{
|
|
||||||
map.put(key, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a key to the given boolean value.
|
|
||||||
*
|
|
||||||
* @param key The key to set the boolean value to.
|
|
||||||
* @param value The boolean value to set to the key.
|
|
||||||
*/
|
|
||||||
public void setBoolean(String key, boolean value)
|
|
||||||
{
|
|
||||||
map.put(key, Boolean.toString(value));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a key to the given Integer value.
|
|
||||||
*
|
|
||||||
* @param key The key to set the Integer value to.
|
|
||||||
* @param value The Integer value to set to the key.
|
|
||||||
*/
|
|
||||||
public void setInt(String key, int value)
|
|
||||||
{
|
|
||||||
map.put(key, Integer.toString(value));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a key to the given double value.
|
|
||||||
*
|
|
||||||
* @param key The key to set the double value to.
|
|
||||||
* @param value The double value to set to the key.
|
|
||||||
*/
|
|
||||||
public void setDouble(String key, double value)
|
|
||||||
{
|
|
||||||
map.put(key, Double.toString(value));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a key to the given float value.
|
|
||||||
*
|
|
||||||
* @param key The key to set the float value to.
|
|
||||||
* @param value The float value to set to the key.
|
|
||||||
*/
|
|
||||||
public void setFloat(String key, float value)
|
|
||||||
{
|
|
||||||
map.put(key, Float.toString(value));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the String value associated with the given key.
|
|
||||||
*
|
|
||||||
* @param key The key to get the String value from.
|
|
||||||
*
|
|
||||||
* @return the String object associated with the given key.
|
|
||||||
*/
|
|
||||||
public String getString(String key)
|
|
||||||
{
|
|
||||||
String ret = map.get(key);
|
|
||||||
|
|
||||||
if (ret != null)
|
|
||||||
return ret;
|
|
||||||
else
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the Integer value associated with the given key.
|
|
||||||
*
|
|
||||||
* @param key The key to get the Integer value from.
|
|
||||||
*
|
|
||||||
* @return the Integer value associated with the given key.
|
|
||||||
*/
|
|
||||||
public int getInt(String key)
|
|
||||||
{
|
|
||||||
String str = getString(key);
|
|
||||||
|
|
||||||
if (str != null)
|
|
||||||
return Integer.parseInt(str);
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException("Config key '" + key + "' is invalid.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the double value associated with the given key.
|
|
||||||
*
|
|
||||||
* @param key The key to get the double value from.
|
|
||||||
*
|
|
||||||
* @return the double value associated with the given key.
|
|
||||||
*/
|
|
||||||
public double getDouble(String key)
|
|
||||||
{
|
|
||||||
String str = getString(key);
|
|
||||||
|
|
||||||
if (str != null)
|
|
||||||
return Double.parseDouble(str);
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException("Config key '" + key + "' is invalid.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the float value associated with the given key.
|
|
||||||
*
|
|
||||||
* @param key The key to get the float value from.
|
|
||||||
*
|
|
||||||
* @return the float value associated with the given key.
|
|
||||||
*/
|
|
||||||
public float getFloat(String key)
|
|
||||||
{
|
|
||||||
String str = getString(key);
|
|
||||||
|
|
||||||
if (str != null)
|
|
||||||
return Float.parseFloat(str);
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException("Config key '" + key + "' is invalid.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the boolean value associated with the given key.
|
|
||||||
*
|
|
||||||
* @param key The key to get the boolean value from.
|
|
||||||
*
|
|
||||||
* @return the boolean value associated with the given key.
|
|
||||||
*/
|
|
||||||
public boolean getBoolean(String key)
|
|
||||||
{
|
|
||||||
String str = getString(key);
|
|
||||||
|
|
||||||
if (str != null)
|
|
||||||
return Boolean.parseBoolean(str);
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException("Config key '" + key + "' is invalid.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,300 +0,0 @@
|
|||||||
package com.retroarch.browser.preferences.util;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.media.AudioManager;
|
|
||||||
import android.media.AudioTrack;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
import android.content.pm.PackageManager.NameNotFoundException;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Utility class for retrieving, saving, or loading preferences.
|
|
||||||
*/
|
|
||||||
public final class UserPreferences
|
|
||||||
{
|
|
||||||
// Logging tag.
|
|
||||||
private static final String TAG = "UserPreferences";
|
|
||||||
|
|
||||||
// Disallow explicit instantiation.
|
|
||||||
private UserPreferences()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the path to the default location of the libretro config.
|
|
||||||
*
|
|
||||||
* @param ctx the current {@link Context}
|
|
||||||
*
|
|
||||||
* @return the path to the default location of the libretro config.
|
|
||||||
*/
|
|
||||||
public static String getDefaultConfigPath(Context ctx)
|
|
||||||
{
|
|
||||||
// Internal/External storage dirs.
|
|
||||||
final String internal = ctx.getFilesDir().getAbsolutePath();
|
|
||||||
String external = null;
|
|
||||||
|
|
||||||
// Get the App's external storage folder
|
|
||||||
final String state = android.os.Environment.getExternalStorageState();
|
|
||||||
if (android.os.Environment.MEDIA_MOUNTED.equals(state)) {
|
|
||||||
File extsd = ctx.getExternalFilesDir(null);
|
|
||||||
external = extsd.getAbsolutePath();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Native library directory and data directory for this front-end.
|
|
||||||
final String dataDir = ctx.getApplicationInfo().dataDir;
|
|
||||||
final String coreDir = dataDir + "/cores/";
|
|
||||||
|
|
||||||
// Get libretro name and path
|
|
||||||
final SharedPreferences prefs = getPreferences(ctx);
|
|
||||||
final String libretro_path = prefs.getString("libretro_path", coreDir);
|
|
||||||
|
|
||||||
// Check if global config is being used. Return true upon failure.
|
|
||||||
final boolean globalConfigEnabled = prefs.getBoolean("global_config_enable", true);
|
|
||||||
|
|
||||||
String append_path;
|
|
||||||
// If we aren't using the global config.
|
|
||||||
if (!globalConfigEnabled && !libretro_path.equals(coreDir))
|
|
||||||
{
|
|
||||||
String sanitized_name = sanitizeLibretroPath(libretro_path);
|
|
||||||
append_path = File.separator + sanitized_name + ".cfg";
|
|
||||||
}
|
|
||||||
else // Using global config.
|
|
||||||
{
|
|
||||||
append_path = File.separator + "retroarch.cfg";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (external != null)
|
|
||||||
{
|
|
||||||
String confPath = external + append_path;
|
|
||||||
if (new File(confPath).exists())
|
|
||||||
return confPath;
|
|
||||||
}
|
|
||||||
else if (internal != null)
|
|
||||||
{
|
|
||||||
String confPath = internal + append_path;
|
|
||||||
if (new File(confPath).exists())
|
|
||||||
return confPath;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
String confPath = "/mnt/extsd" + append_path;
|
|
||||||
if (new File(confPath).exists())
|
|
||||||
return confPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Config file does not exist. Create empty one.
|
|
||||||
|
|
||||||
// emergency fallback
|
|
||||||
String new_path = "/mnt/sd" + append_path;
|
|
||||||
|
|
||||||
if (external != null)
|
|
||||||
new_path = external + append_path;
|
|
||||||
else if (internal != null)
|
|
||||||
new_path = internal + append_path;
|
|
||||||
else if (dataDir != null)
|
|
||||||
new_path = dataDir + append_path;
|
|
||||||
|
|
||||||
try {
|
|
||||||
new File(new_path).createNewFile();
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.e(TAG, "Failed to create config file to: " + new_path);
|
|
||||||
}
|
|
||||||
return new_path;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the libretro configuration file
|
|
||||||
* with new values if settings have changed.
|
|
||||||
*
|
|
||||||
* @param ctx the current {@link Context}.
|
|
||||||
*/
|
|
||||||
public static void updateConfigFile(Context ctx)
|
|
||||||
{
|
|
||||||
String path = getDefaultConfigPath(ctx);
|
|
||||||
ConfigFile config = new ConfigFile(path);
|
|
||||||
|
|
||||||
Log.i(TAG, "Writing config to: " + path);
|
|
||||||
|
|
||||||
final String dataDir = ctx.getApplicationInfo().dataDir;
|
|
||||||
final String coreDir = dataDir + "/cores/";
|
|
||||||
|
|
||||||
final SharedPreferences prefs = getPreferences(ctx);
|
|
||||||
|
|
||||||
config.setString("libretro_directory", coreDir);
|
|
||||||
config.setInt("audio_out_rate", getOptimalSamplingRate(ctx));
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int version = ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0).versionCode;
|
|
||||||
final String dst_path = dataDir;
|
|
||||||
final String dst_path_subdir = "assets";
|
|
||||||
|
|
||||||
Log.i(TAG, "dst dir is: " + dst_path);
|
|
||||||
Log.i(TAG, "dst subdir is: " + dst_path_subdir);
|
|
||||||
|
|
||||||
config.setBoolean("log_verbosity", true);
|
|
||||||
config.setString("bundle_assets_src_path", ctx.getApplicationInfo().sourceDir);
|
|
||||||
config.setString("bundle_assets_dst_path", dst_path);
|
|
||||||
config.setString("bundle_assets_dst_path_subdir", dst_path_subdir);
|
|
||||||
config.setInt("bundle_assets_extract_version_current", version);
|
|
||||||
}
|
|
||||||
catch (NameNotFoundException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Refactor this entire mess and make this usable for per-core config
|
|
||||||
if (Build.VERSION.SDK_INT >= 17 && prefs.getBoolean("audio_latency_auto", true))
|
|
||||||
{
|
|
||||||
config.setInt("audio_block_frames", getLowLatencyBufferSize(ctx));
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
config.write(path);
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.e(TAG, "Failed to save config file to: " + path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void readbackString(ConfigFile cfg, SharedPreferences.Editor edit, String key)
|
|
||||||
{
|
|
||||||
if (cfg.keyExists(key))
|
|
||||||
edit.putString(key, cfg.getString(key));
|
|
||||||
else
|
|
||||||
edit.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void readbackBool(ConfigFile cfg, SharedPreferences.Editor edit, String key)
|
|
||||||
{
|
|
||||||
if (cfg.keyExists(key))
|
|
||||||
edit.putBoolean(key, cfg.getBoolean(key));
|
|
||||||
else
|
|
||||||
edit.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void readbackDouble(ConfigFile cfg, SharedPreferences.Editor edit, String key)
|
|
||||||
{
|
|
||||||
if (cfg.keyExists(key))
|
|
||||||
edit.putFloat(key, (float)cfg.getDouble(key));
|
|
||||||
else
|
|
||||||
edit.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
private static void readbackFloat(ConfigFile cfg, SharedPreferences.Editor edit, String key)
|
|
||||||
{
|
|
||||||
if (cfg.keyExists(key))
|
|
||||||
edit.putFloat(key, cfg.getFloat(key));
|
|
||||||
else
|
|
||||||
edit.remove(key);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
private static void readbackInt(ConfigFile cfg, SharedPreferences.Editor edit, String key)
|
|
||||||
{
|
|
||||||
if (cfg.keyExists(key))
|
|
||||||
edit.putInt(key, cfg.getInt(key));
|
|
||||||
else
|
|
||||||
edit.remove(key);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sanitizes a libretro core path.
|
|
||||||
*
|
|
||||||
* @param path The path to the libretro core.
|
|
||||||
*
|
|
||||||
* @return the sanitized libretro path.
|
|
||||||
*/
|
|
||||||
private static String sanitizeLibretroPath(String path)
|
|
||||||
{
|
|
||||||
String sanitized_name = path.substring(
|
|
||||||
path.lastIndexOf('/') + 1,
|
|
||||||
path.lastIndexOf('.'));
|
|
||||||
sanitized_name = sanitized_name.replace("neon", "");
|
|
||||||
sanitized_name = sanitized_name.replace("libretro_", "");
|
|
||||||
|
|
||||||
return sanitized_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a {@link SharedPreferences} instance containing current settings.
|
|
||||||
*
|
|
||||||
* @param ctx the current {@link Context}.
|
|
||||||
*
|
|
||||||
* @return A SharedPreference instance containing current settings.
|
|
||||||
*/
|
|
||||||
public static SharedPreferences getPreferences(Context ctx)
|
|
||||||
{
|
|
||||||
return PreferenceManager.getDefaultSharedPreferences(ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the optimal sampling rate for low-latency audio playback.
|
|
||||||
*
|
|
||||||
* @param ctx the current {@link Context}.
|
|
||||||
*
|
|
||||||
* @return the optimal sampling rate for low-latency audio playback in Hz.
|
|
||||||
*/
|
|
||||||
@TargetApi(17)
|
|
||||||
private static int getLowLatencyOptimalSamplingRate(Context ctx)
|
|
||||||
{
|
|
||||||
AudioManager manager = (AudioManager) ctx.getSystemService(Context.AUDIO_SERVICE);
|
|
||||||
|
|
||||||
return Integer.parseInt(manager
|
|
||||||
.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the optimal buffer size for low-latency audio playback.
|
|
||||||
*
|
|
||||||
* @param ctx the current {@link Context}.
|
|
||||||
*
|
|
||||||
* @return the optimal output buffer size in decimal PCM frames.
|
|
||||||
*/
|
|
||||||
@TargetApi(17)
|
|
||||||
private static int getLowLatencyBufferSize(Context ctx)
|
|
||||||
{
|
|
||||||
AudioManager manager = (AudioManager) ctx.getSystemService(Context.AUDIO_SERVICE);
|
|
||||||
int buffersize = Integer.parseInt(manager
|
|
||||||
.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER));
|
|
||||||
Log.i(TAG, "Queried ideal buffer size (frames): " + buffersize);
|
|
||||||
return buffersize;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the optimal audio sampling rate.
|
|
||||||
* <p>
|
|
||||||
* On Android 4.2+ devices this will retrieve the optimal low-latency sampling rate,
|
|
||||||
* since Android 4.2 adds support for low latency audio in general.
|
|
||||||
* <p>
|
|
||||||
* On other devices, it simply returns the regular optimal sampling rate
|
|
||||||
* as returned by the hardware.
|
|
||||||
*
|
|
||||||
* @param ctx The current {@link Context}.
|
|
||||||
*
|
|
||||||
* @return the optimal audio sampling rate in Hz.
|
|
||||||
*/
|
|
||||||
private static int getOptimalSamplingRate(Context ctx)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
if (Build.VERSION.SDK_INT >= 17)
|
|
||||||
ret = getLowLatencyOptimalSamplingRate(ctx);
|
|
||||||
else
|
|
||||||
ret = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
|
|
||||||
|
|
||||||
Log.i(TAG, "Using sampling rate: " + ret + " Hz");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,225 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.graphics.SurfaceTexture;
|
|
||||||
import android.graphics.SurfaceTexture.OnFrameAvailableListener;
|
|
||||||
import android.hardware.Camera;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
//For Android 3.0 and up
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class which provides {@link Camera} functionality
|
|
||||||
* to {@link RetroActivityFuture}.
|
|
||||||
*/
|
|
||||||
@SuppressLint("NewApi")
|
|
||||||
public class RetroActivityCamera extends RetroActivityCommon
|
|
||||||
{
|
|
||||||
private Camera mCamera = null;
|
|
||||||
private long lastTimestamp = 0;
|
|
||||||
private SurfaceTexture texture;
|
|
||||||
private boolean updateSurface = true;
|
|
||||||
private boolean camera_service_running = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executed when the {@link Camera}
|
|
||||||
* is staring to capture.
|
|
||||||
*/
|
|
||||||
public void onCameraStart()
|
|
||||||
{
|
|
||||||
if (camera_service_running)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (mCamera != null)
|
|
||||||
mCamera.startPreview();
|
|
||||||
camera_service_running = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executed when the {@link Camera} is done capturing.
|
|
||||||
* <p>
|
|
||||||
* Note that this does not release the currently held
|
|
||||||
* {@link Camera} instance and must be freed by calling
|
|
||||||
* {@link #onCameraFree}
|
|
||||||
*/
|
|
||||||
public void onCameraStop()
|
|
||||||
{
|
|
||||||
if (!camera_service_running)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (mCamera != null)
|
|
||||||
mCamera.stopPreview();
|
|
||||||
camera_service_running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Releases the currently held {@link Camera} instance.
|
|
||||||
*/
|
|
||||||
public void onCameraFree()
|
|
||||||
{
|
|
||||||
onCameraStop();
|
|
||||||
|
|
||||||
if (mCamera != null)
|
|
||||||
mCamera.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes the camera for use.
|
|
||||||
*/
|
|
||||||
public void onCameraInit()
|
|
||||||
{
|
|
||||||
if (mCamera != null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
mCamera = Camera.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Polls the camera for updates to the {@link SurfaceTexture}.
|
|
||||||
*
|
|
||||||
* @return true if polling was successful, false otherwise.
|
|
||||||
*/
|
|
||||||
public boolean onCameraPoll()
|
|
||||||
{
|
|
||||||
if (!camera_service_running)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (texture == null)
|
|
||||||
{
|
|
||||||
Log.i("RetroActivity", "No texture");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
|
|
||||||
{
|
|
||||||
if (updateSurface)
|
|
||||||
{
|
|
||||||
texture.updateTexImage();
|
|
||||||
}
|
|
||||||
|
|
||||||
long newTimestamp = texture.getTimestamp();
|
|
||||||
|
|
||||||
if (newTimestamp != lastTimestamp)
|
|
||||||
{
|
|
||||||
lastTimestamp = newTimestamp;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes the {@link SurfaceTexture} used by the
|
|
||||||
* {@link Camera} with a given OpenGL texure ID.
|
|
||||||
*
|
|
||||||
* @param gl_texid texture ID to initialize the
|
|
||||||
* {@link SurfaceTexture} with.
|
|
||||||
*/
|
|
||||||
public void onCameraTextureInit(int gl_texid)
|
|
||||||
{
|
|
||||||
texture = new SurfaceTexture(gl_texid);
|
|
||||||
texture.setOnFrameAvailableListener(onCameraFrameAvailableListener);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the {@link Camera} texture with the texture represented
|
|
||||||
* by the given OpenGL texture ID.
|
|
||||||
*
|
|
||||||
* @param gl_texid The texture ID representing the texture to set the camera to.
|
|
||||||
* @throws IOException If setting the texture fails.
|
|
||||||
*/
|
|
||||||
public void onCameraSetTexture(int gl_texid) throws IOException
|
|
||||||
{
|
|
||||||
if (texture == null)
|
|
||||||
onCameraTextureInit(gl_texid);
|
|
||||||
|
|
||||||
if (mCamera != null)
|
|
||||||
mCamera.setPreviewTexture(texture);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final OnFrameAvailableListener onCameraFrameAvailableListener = new OnFrameAvailableListener()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void onFrameAvailable(SurfaceTexture surfaceTexture)
|
|
||||||
{
|
|
||||||
updateSurface = true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState)
|
|
||||||
{
|
|
||||||
// Save the current setting for updates
|
|
||||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
|
||||||
SharedPreferences.Editor edit = prefs.edit();
|
|
||||||
edit.putBoolean("CAMERA_UPDATES_ON", false);
|
|
||||||
edit.apply();
|
|
||||||
|
|
||||||
camera_service_running = false;
|
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause()
|
|
||||||
{
|
|
||||||
// Save the current setting for updates
|
|
||||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
|
||||||
SharedPreferences.Editor edit = prefs.edit();
|
|
||||||
edit.putBoolean("CAMERA_UPDATES_ON", camera_service_running);
|
|
||||||
edit.apply();
|
|
||||||
|
|
||||||
onCameraStop();
|
|
||||||
super.onPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume()
|
|
||||||
{
|
|
||||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
|
||||||
SharedPreferences.Editor edit = prefs.edit();
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get any previous setting for camera updates
|
|
||||||
* Gets "false" if an error occurs
|
|
||||||
*/
|
|
||||||
if (prefs.contains("CAMERA_UPDATES_ON"))
|
|
||||||
{
|
|
||||||
camera_service_running = prefs.getBoolean("CAMERA_UPDATES_ON", false);
|
|
||||||
if (camera_service_running)
|
|
||||||
{
|
|
||||||
onCameraStart();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else // Otherwise, turn off camera updates
|
|
||||||
{
|
|
||||||
edit.putBoolean("CAMERA_UPDATES_ON", false);
|
|
||||||
edit.apply();
|
|
||||||
camera_service_running = false;
|
|
||||||
}
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy()
|
|
||||||
{
|
|
||||||
onCameraFree();
|
|
||||||
super.onDestroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop()
|
|
||||||
{
|
|
||||||
onCameraStop();
|
|
||||||
super.onStop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,141 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
|
||||||
import android.annotation.TargetApi;
|
|
||||||
import android.content.res.Configuration;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.IntentFilter;
|
|
||||||
import android.app.UiModeManager;
|
|
||||||
import android.os.BatteryManager;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.PowerManager;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class which provides common methods for RetroActivity related classes.
|
|
||||||
*/
|
|
||||||
public class RetroActivityCommon extends RetroActivityLocation
|
|
||||||
{
|
|
||||||
public static int FRONTEND_POWERSTATE_NONE = 0;
|
|
||||||
public static int FRONTEND_POWERSTATE_NO_SOURCE = 1;
|
|
||||||
public static int FRONTEND_POWERSTATE_CHARGING = 2;
|
|
||||||
public static int FRONTEND_POWERSTATE_CHARGED = 3;
|
|
||||||
public static int FRONTEND_POWERSTATE_ON_POWER_SOURCE = 4;
|
|
||||||
public boolean sustainedPerformanceMode = true;
|
|
||||||
|
|
||||||
// Exiting cleanly from NDK seems to be nearly impossible.
|
|
||||||
// Have to use exit(0) to avoid weird things happening, even with runOnUiThread() approaches.
|
|
||||||
// Use a separate JNI function to explicitly trigger the readback.
|
|
||||||
public void onRetroArchExit()
|
|
||||||
{
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
@TargetApi(24)
|
|
||||||
public void setSustainedPerformanceMode(boolean on)
|
|
||||||
{
|
|
||||||
sustainedPerformanceMode = on;
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= 24) {
|
|
||||||
if (isSustainedPerformanceModeSupported()) {
|
|
||||||
final CountDownLatch latch = new CountDownLatch(1);
|
|
||||||
|
|
||||||
runOnUiThread(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Log.i("RetroActivity", "setting sustained performance mode to " + sustainedPerformanceMode);
|
|
||||||
|
|
||||||
getWindow().setSustainedPerformanceMode(sustainedPerformanceMode);
|
|
||||||
|
|
||||||
latch.countDown();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
|
||||||
latch.await();
|
|
||||||
}catch(InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TargetApi(24)
|
|
||||||
public boolean isSustainedPerformanceModeSupported()
|
|
||||||
{
|
|
||||||
boolean supported = false;
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= 24)
|
|
||||||
{
|
|
||||||
PowerManager powerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
|
|
||||||
|
|
||||||
if (powerManager.isSustainedPerformanceModeSupported())
|
|
||||||
supported = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Log.i("RetroActivity", "isSustainedPerformanceModeSupported? " + supported);
|
|
||||||
|
|
||||||
return supported;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getBatteryLevel()
|
|
||||||
{
|
|
||||||
IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
|
|
||||||
// This doesn't actually register anything (or need to) because we know this particular intent is sticky and we do not specify a BroadcastReceiver anyway
|
|
||||||
Intent batteryStatus = registerReceiver(null, ifilter);
|
|
||||||
int level = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
|
|
||||||
int scale = batteryStatus.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
|
|
||||||
|
|
||||||
float percent = ((float)level / (float)scale) * 100.0f;
|
|
||||||
|
|
||||||
Log.i("RetroActivity", "battery: level = " + level + ", scale = " + scale + ", percent = " + percent);
|
|
||||||
|
|
||||||
return (int)percent;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getPowerstate()
|
|
||||||
{
|
|
||||||
IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
|
|
||||||
// This doesn't actually register anything (or need to) because we know this particular intent is sticky and we do not specify a BroadcastReceiver anyway
|
|
||||||
Intent batteryStatus = registerReceiver(null, ifilter);
|
|
||||||
int status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
|
|
||||||
boolean hasBattery = batteryStatus.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);
|
|
||||||
boolean isCharging = (status == BatteryManager.BATTERY_STATUS_CHARGING);
|
|
||||||
boolean isCharged = (status == BatteryManager.BATTERY_STATUS_FULL);
|
|
||||||
int powerstate = FRONTEND_POWERSTATE_NONE;
|
|
||||||
|
|
||||||
if (isCharged)
|
|
||||||
powerstate = FRONTEND_POWERSTATE_CHARGED;
|
|
||||||
else if (isCharging)
|
|
||||||
powerstate = FRONTEND_POWERSTATE_CHARGING;
|
|
||||||
else if (!hasBattery)
|
|
||||||
powerstate = FRONTEND_POWERSTATE_NO_SOURCE;
|
|
||||||
else
|
|
||||||
powerstate = FRONTEND_POWERSTATE_ON_POWER_SOURCE;
|
|
||||||
|
|
||||||
Log.i("RetroActivity", "power state = " + powerstate);
|
|
||||||
|
|
||||||
return powerstate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAndroidTV()
|
|
||||||
{
|
|
||||||
Configuration config = getResources().getConfiguration();
|
|
||||||
UiModeManager uiModeManager = (UiModeManager)getSystemService(UI_MODE_SERVICE);
|
|
||||||
|
|
||||||
if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
|
|
||||||
{
|
|
||||||
Log.i("RetroActivity", "isAndroidTV == true");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.i("RetroActivity", "isAndroidTV == false");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.hardware.input.InputManager;
|
|
||||||
import android.os.Build;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
|
|
||||||
public final class RetroActivityFuture extends RetroActivityCamera {
|
|
||||||
|
|
||||||
// If set to true then Retroarch will completely exit when it loses focus
|
|
||||||
private boolean quitfocus = false;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
|
|
||||||
setSustainedPerformanceMode(sustainedPerformanceMode);
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= 19) {
|
|
||||||
// Immersive mode
|
|
||||||
|
|
||||||
// Constants from API > 14
|
|
||||||
final int API_SYSTEM_UI_FLAG_LAYOUT_STABLE = 0x00000100;
|
|
||||||
final int API_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION = 0x00000200;
|
|
||||||
final int API_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN = 0x00000400;
|
|
||||||
final int API_SYSTEM_UI_FLAG_FULLSCREEN = 0x00000004;
|
|
||||||
final int API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 0x00001000;
|
|
||||||
|
|
||||||
View thisView = getWindow().getDecorView();
|
|
||||||
thisView.setSystemUiVisibility(API_SYSTEM_UI_FLAG_LAYOUT_STABLE
|
|
||||||
| API_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
|
|
||||||
| API_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
|
||||||
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
|
||||||
| API_SYSTEM_UI_FLAG_FULLSCREEN
|
|
||||||
| API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
|
|
||||||
|
|
||||||
// Check for Android UI specific parameters
|
|
||||||
Intent retro = getIntent();
|
|
||||||
String refresh = retro.getStringExtra("REFRESH");
|
|
||||||
|
|
||||||
// If REFRESH parameter is provided then try to set refreshrate accordingly
|
|
||||||
if(refresh != null) {
|
|
||||||
WindowManager.LayoutParams params = getWindow().getAttributes();
|
|
||||||
params.preferredRefreshRate = Integer.parseInt(refresh);
|
|
||||||
getWindow().setAttributes(params);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If QUITFOCUS parameter is provided then enable that Retroarch quits when focus is lost
|
|
||||||
quitfocus = retro.hasExtra("QUITFOCUS");
|
|
||||||
|
|
||||||
// If HIDEMOUSE parameters is provided then hide the mourse cursor
|
|
||||||
// This requires NVIDIA Android extensions (available on NVIDIA Shield), if they are not
|
|
||||||
// available then nothing will be done
|
|
||||||
if (retro.hasExtra("HIDEMOUSE")) hideMouseCursor();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void hideMouseCursor() {
|
|
||||||
|
|
||||||
// Check for NVIDIA extensions and minimum SDK version
|
|
||||||
Method mInputManager_setCursorVisibility;
|
|
||||||
try { mInputManager_setCursorVisibility =
|
|
||||||
InputManager.class.getMethod("setCursorVisibility", boolean.class);
|
|
||||||
}
|
|
||||||
catch (NoSuchMethodException ex) {
|
|
||||||
return; // Extensions were not available so do nothing
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hide the mouse cursor
|
|
||||||
InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
|
|
||||||
try { mInputManager_setCursorVisibility.invoke(inputManager, false); }
|
|
||||||
catch (InvocationTargetException ite) { }
|
|
||||||
catch (IllegalAccessException iae) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop() {
|
|
||||||
super.onStop();
|
|
||||||
|
|
||||||
// If QUITFOCUS parameter was set then completely exit Retroarch when focus is lost
|
|
||||||
if (quitfocus) System.exit(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
import com.retroarch.browser.mainmenu.MainMenuActivity;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
public class RetroActivityIntent extends RetroActivityCommon {
|
|
||||||
private Intent pendingIntent = null;
|
|
||||||
private static final String TAG = "RetroArch";
|
|
||||||
|
|
||||||
@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);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onNewIntent(Intent intent)
|
|
||||||
{
|
|
||||||
Log.i("RetroActivity", "onNewIntent invoked.");
|
|
||||||
super.onNewIntent(intent);
|
|
||||||
setIntent(intent);
|
|
||||||
pendingIntent = intent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the ROM file specified in the pending intent.
|
|
||||||
*
|
|
||||||
* @return the ROM file specified in the pending intent.
|
|
||||||
*/
|
|
||||||
public String getPendingIntentFullPath()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("ROM");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the specified path to the libretro core in the pending intent.
|
|
||||||
*
|
|
||||||
* @return the specified path to the libretro core in the pending intent.
|
|
||||||
*/
|
|
||||||
public String getPendingIntentLibretroPath()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("LIBRETRO");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the path specified in the pending intent to the retroarch cfg file.
|
|
||||||
*
|
|
||||||
* @return the path specified in the pending intent to the retroarch cfg file.
|
|
||||||
*/
|
|
||||||
public String getPendingIntentConfigPath()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("CONFIGFILE");
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPendingIntentStorageLocation()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("SDCARD");
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPendingIntentDownloadLocation()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("DOWNLOADS");
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPendingIntentScreenshotsLocation()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("SCREENSHOTS");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the specified IME in the pending intent.
|
|
||||||
*
|
|
||||||
* @return the specified IME in the pending intent.
|
|
||||||
*/
|
|
||||||
public String getPendingIntentIME()
|
|
||||||
{
|
|
||||||
return pendingIntent.getStringExtra("IME");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks whether or not a pending intent exists.
|
|
||||||
*
|
|
||||||
* @return true if a pending intent exists, false otherwise.
|
|
||||||
*/
|
|
||||||
public boolean hasPendingIntent()
|
|
||||||
{
|
|
||||||
if (pendingIntent == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the current pending intent.
|
|
||||||
*/
|
|
||||||
public void clearPendingIntent()
|
|
||||||
{
|
|
||||||
pendingIntent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,316 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
import com.google.android.gms.common.ConnectionResult;
|
|
||||||
import com.google.android.gms.common.GooglePlayServicesClient.ConnectionCallbacks;
|
|
||||||
import com.google.android.gms.common.GooglePlayServicesClient.OnConnectionFailedListener;
|
|
||||||
import com.google.android.gms.location.LocationClient;
|
|
||||||
import com.google.android.gms.location.LocationListener;
|
|
||||||
import com.google.android.gms.location.LocationRequest;
|
|
||||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
|
||||||
|
|
||||||
import android.app.NativeActivity;
|
|
||||||
import android.content.IntentSender;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.location.Location;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class that implements location-based functionality for
|
|
||||||
* the {@link RetroActivityFuture} and {@link RetroActivityPast}
|
|
||||||
* activities.
|
|
||||||
*/
|
|
||||||
public class RetroActivityLocation extends NativeActivity
|
|
||||||
implements ConnectionCallbacks, OnConnectionFailedListener, LocationListener
|
|
||||||
{
|
|
||||||
/* LOCATION VARIABLES */
|
|
||||||
private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0;
|
|
||||||
private LocationClient mLocationClient = null;
|
|
||||||
private Location mCurrentLocation;
|
|
||||||
|
|
||||||
// Define an object that holds accuracy and frequency parameters
|
|
||||||
LocationRequest mLocationRequest = null;
|
|
||||||
boolean mUpdatesRequested = false;
|
|
||||||
boolean locationChanged = false;
|
|
||||||
boolean location_service_running = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called by Location Services when the request to connect the
|
|
||||||
* client finishes successfully. At this point, you can
|
|
||||||
* request the current location or start periodic updates
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onConnected(Bundle dataBundle)
|
|
||||||
{
|
|
||||||
if (mLocationClient == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Display the connection status
|
|
||||||
Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show();
|
|
||||||
location_service_running = true;
|
|
||||||
|
|
||||||
// If already requested, start periodic updates
|
|
||||||
if (mUpdatesRequested)
|
|
||||||
{
|
|
||||||
mLocationClient.requestLocationUpdates(mLocationRequest, this, null);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Get last known location
|
|
||||||
mCurrentLocation = mLocationClient.getLastLocation();
|
|
||||||
locationChanged = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called by Location Services if the connection to the
|
|
||||||
* location client drops because of an error.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onDisconnected()
|
|
||||||
{
|
|
||||||
if (mLocationClient == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Display the connection status
|
|
||||||
Toast.makeText(this, "Disconnected. Please re-connect.", Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
// If the client is connected
|
|
||||||
if (mLocationClient.isConnected())
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Remove location updates for a listener.
|
|
||||||
* The current Activity is the listener, so
|
|
||||||
* the argument is "this".
|
|
||||||
*/
|
|
||||||
mLocationClient.removeLocationUpdates(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
location_service_running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called by Location Services if the attempt to
|
|
||||||
* Location Services fails.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onConnectionFailed(ConnectionResult connectionResult)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Google Play services can resolve some errors it detects.
|
|
||||||
* If the error has a resolution, try sending an Intent to
|
|
||||||
* start a Google Play services activity that can resolve
|
|
||||||
* error.
|
|
||||||
*/
|
|
||||||
if (connectionResult.hasResolution())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Start an Activity that tries to resolve the error
|
|
||||||
connectionResult.startResolutionForResult(this, CONNECTION_FAILURE_RESOLUTION_REQUEST);
|
|
||||||
}
|
|
||||||
catch (IntentSender.SendIntentException e)
|
|
||||||
{
|
|
||||||
// Thrown if Google Play services cancelled the original PendingIntent
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* If no resolution is available, display a dialog to the
|
|
||||||
* user with the error.
|
|
||||||
*/
|
|
||||||
Log.e("Connection failed", "error code: " + connectionResult.getErrorCode());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the update interval at which location-based updates
|
|
||||||
* should occur
|
|
||||||
*/
|
|
||||||
public void onLocationSetInterval(int update_interval_in_ms, int distance_interval)
|
|
||||||
{
|
|
||||||
// Use high accuracy
|
|
||||||
if (mLocationRequest == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
|
|
||||||
|
|
||||||
if (update_interval_in_ms == 0)
|
|
||||||
mLocationRequest.setInterval(5 * 1000); // 5 seconds
|
|
||||||
else
|
|
||||||
mLocationRequest.setInterval(update_interval_in_ms);
|
|
||||||
|
|
||||||
// Set the fastest update interval to 1 second
|
|
||||||
mLocationRequest.setFastestInterval(1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializing methods for location based functionality.
|
|
||||||
*/
|
|
||||||
public void onLocationInit()
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Create a new location client, using the enclosing class to
|
|
||||||
* handle callbacks.
|
|
||||||
*/
|
|
||||||
if (mLocationClient == null)
|
|
||||||
mLocationClient = new LocationClient(this, this, this);
|
|
||||||
|
|
||||||
// Start with updates turned off
|
|
||||||
mUpdatesRequested = false;
|
|
||||||
|
|
||||||
// Create the LocationRequest object
|
|
||||||
if (mLocationRequest == null)
|
|
||||||
mLocationRequest = LocationRequest.create();
|
|
||||||
|
|
||||||
onLocationSetInterval(0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executed upon starting the {@link LocationClient}.
|
|
||||||
*/
|
|
||||||
public void onLocationStart()
|
|
||||||
{
|
|
||||||
if (mLocationClient == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
mUpdatesRequested = true;
|
|
||||||
|
|
||||||
// Connect the client.
|
|
||||||
mLocationClient.connect();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Free up location services resources.
|
|
||||||
*/
|
|
||||||
public void onLocationFree()
|
|
||||||
{
|
|
||||||
/* TODO/FIXME */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executed upon stopping the location client.
|
|
||||||
* Does nothing if called when the client is not started.
|
|
||||||
*/
|
|
||||||
public void onLocationStop()
|
|
||||||
{
|
|
||||||
// Disconnecting the client invalidates it.
|
|
||||||
if (mLocationClient != null && mUpdatesRequested)
|
|
||||||
mLocationClient.disconnect();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the latitude at the current location in degrees.
|
|
||||||
*
|
|
||||||
* @return the latitude at the current location.
|
|
||||||
*/
|
|
||||||
public double onLocationGetLatitude()
|
|
||||||
{
|
|
||||||
return mCurrentLocation.getLatitude();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the longitude at the current location in degrees.
|
|
||||||
*
|
|
||||||
* @return the longitude at the current location.
|
|
||||||
*/
|
|
||||||
public double onLocationGetLongitude()
|
|
||||||
{
|
|
||||||
return mCurrentLocation.getLongitude();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the horizontal accuracy of the current location
|
|
||||||
* in meters. (NOTE: There seems to be no vertical accuracy
|
|
||||||
* for a given location with the Android location API)
|
|
||||||
*
|
|
||||||
* @return the horizontal accuracy of the current position.
|
|
||||||
*/
|
|
||||||
public double onLocationGetHorizontalAccuracy()
|
|
||||||
{
|
|
||||||
return mCurrentLocation.getAccuracy();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tells us whether the location listener callback has
|
|
||||||
* updated the current location since the last time
|
|
||||||
* we polled.
|
|
||||||
*
|
|
||||||
* @return true if location has changed, false if location has not changed.
|
|
||||||
*/
|
|
||||||
public boolean onLocationHasChanged()
|
|
||||||
{
|
|
||||||
boolean hasChanged = locationChanged;
|
|
||||||
|
|
||||||
// Reset flag
|
|
||||||
if (hasChanged)
|
|
||||||
locationChanged = false;
|
|
||||||
|
|
||||||
return hasChanged;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Define the callback method that receives location updates
|
|
||||||
@Override
|
|
||||||
public void onLocationChanged(Location location)
|
|
||||||
{
|
|
||||||
if (!location_service_running)
|
|
||||||
return;
|
|
||||||
|
|
||||||
locationChanged = true;
|
|
||||||
mCurrentLocation = location;
|
|
||||||
|
|
||||||
// Report to the UI that the location was updated
|
|
||||||
String msg = "Updated Location: " + location.getLatitude() + ", " + location.getLongitude();
|
|
||||||
Log.i("RetroArch GPS", msg);
|
|
||||||
//Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause()
|
|
||||||
{
|
|
||||||
// Save the current setting for updates
|
|
||||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
|
||||||
SharedPreferences.Editor edit = prefs.edit();
|
|
||||||
edit.putBoolean("LOCATION_UPDATES_ON", mUpdatesRequested);
|
|
||||||
edit.apply();
|
|
||||||
|
|
||||||
super.onPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume()
|
|
||||||
{
|
|
||||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
|
||||||
SharedPreferences.Editor edit = prefs.edit();
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get any previous setting for location updates
|
|
||||||
* Gets "false" if an error occurs
|
|
||||||
*/
|
|
||||||
if (prefs.contains("LOCATION_UPDATES_ON"))
|
|
||||||
{
|
|
||||||
mUpdatesRequested = prefs.getBoolean("LOCATION_UPDATES_ON", false);
|
|
||||||
if (mUpdatesRequested)
|
|
||||||
location_service_running = true;
|
|
||||||
}
|
|
||||||
else // Otherwise, turn off location updates
|
|
||||||
{
|
|
||||||
edit.putBoolean("LOCATION_UPDATES_ON", false);
|
|
||||||
edit.apply();
|
|
||||||
location_service_running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop()
|
|
||||||
{
|
|
||||||
onLocationStop();
|
|
||||||
super.onStop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
package com.retroarch.browser.retroactivity;
|
|
||||||
|
|
||||||
// For Android 2.3.x
|
|
||||||
|
|
||||||
public final class RetroActivityPast extends RetroActivityCommon
|
|
||||||
{
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user