Skip to content
Permalink
Browse files

Merge branch 'master' into audio-sles

  • Loading branch information
littleguy77 committed May 7, 2015
2 parents a92ce9f + 349a17a commit 5daaed169b4f2f946488b448aed39594042d030e
Showing 381 changed files with 2,309 additions and 1,573 deletions.
@@ -32,7 +32,7 @@
<activity
android:name="paulscode.android.mupen64plusae.SplashActivity"
android:label="@string/SplashActivity_title"
android:theme="@style/appTheme.Black" >
android:theme="@style/Theme.AppCompat.Black" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -60,10 +60,11 @@
android:name="paulscode.android.mupen64plusae.GalleryActivity"
android:exported="false"
android:label="@string/GalleryActivity_title"
android:launchMode="singleTask" >
android:launchMode="singleTask"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
<activity
android:name="paulscode.android.mupen64plusae.PlayMenuActivity"
android:name="paulscode.android.mupen64plusae.persistent.GamePrefsActivity"
android:exported="false"
android:label="@string/PlayMenuActivity_title" >
<intent-filter>
@@ -73,7 +74,7 @@
</intent-filter>
</activity>
<activity
android:name="paulscode.android.mupen64plusae.SettingsGlobalActivity"
android:name="paulscode.android.mupen64plusae.persistent.GlobalPrefsActivity"
android:exported="false"
android:label="@string/SettingsGlobalActivity_title" >
<intent-filter>
@@ -95,7 +96,8 @@
<activity
android:name="paulscode.android.mupen64plusae.profile.ControllerProfileActivity"
android:exported="false"
android:label="@string/ControllerProfileActivity_title" >
android:label="@string/ControllerProfileActivity_title"
android:theme="@style/Theme.AppCompat" >
<intent-filter>
<action android:name=".profile.ControllerProfileActivity" />

@@ -135,8 +137,9 @@
<activity
android:name="paulscode.android.mupen64plusae.profile.TouchscreenProfileActivity"
android:exported="false"
android:label="@string/TouchscreenProfileActivity_title" >
<intent-filter>
android:label="@string/TouchscreenProfileActivity_title"
android:theme="@style/Theme.AppCompat.Black.OverlayActionBar" >
<intent-filter>
<action android:name=".profile.TouchscreenProfileActivity" />

<category android:name="android.intent.category.DEFAULT" />
@@ -145,7 +148,8 @@
<activity
android:name="paulscode.android.mupen64plusae.input.DiagnosticActivity"
android:exported="false"
android:label="@string/DiagnosticActivity_title" >
android:label="@string/DiagnosticActivity_title"
android:theme="@style/Theme.AppCompat" >
<intent-filter>
<action android:name=".input.DiagnosticActivity" />

@@ -168,13 +172,13 @@
This behavior is specified in android:configChanges below.
-->
<activity
android:name="paulscode.android.mupen64plusae.GameActivity"
android:name="paulscode.android.mupen64plusae.game.GameActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/GameActivity_title"
android:theme="@style/appTheme.Black" >
</activity>
<activity
android:name="paulscode.android.mupen64plusae.GameActivityXperiaPlay"
android:name="paulscode.android.mupen64plusae.game.GameActivityXperiaPlay"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/GameActivity_title"
android:theme="@style/appTheme.Black" >
@@ -1,6 +1,6 @@
<class-diagram version="1.0.11" icons="true" automaticImage="PNG" always-add-relationships="false"
generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameLifecycleHandler"
<class id="1" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameLifecycleHandler"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameLifecycleHandler.java"
binary="false">
<position height="-1" width="-1" x="501" y="458"/>
@@ -9,23 +9,23 @@
<operations public="true" package="false" protected="true" private="false"/>
</display>
</class>
<class id="2" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameMenuHandler"
<class id="2" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameMenuHandler"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameMenuHandler.java" binary="false">
<position height="-1" width="-1" x="257" y="415"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
<attributes public="false" package="false" protected="false" private="false"/>
<operations public="true" package="false" protected="true" private="false"/>
</display>
</class>
<class id="3" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameOverlay"
<class id="3" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameOverlay"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameOverlay.java" binary="false">
<position height="-1" width="-1" x="188" y="673"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
<attributes public="false" package="false" protected="false" private="false"/>
<operations public="true" package="false" protected="true" private="false"/>
</display>
</class>
<class id="4" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameSurface"
<class id="4" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameSurface"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameSurface.java" binary="false">
<position height="-1" width="-1" x="501" y="690"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -34,7 +34,7 @@
</display>
</class>
<interface id="5" corner="BOTTOM_RIGHT" language="java"
name="paulscode.android.mupen64plusae.GameSurface.OnFpsChangedListener" project="mupen64plus"
name="paulscode.android.mupen64plusae.game.GameSurface.OnFpsChangedListener" project="mupen64plus"
file="/mupen64plus/src/paulscode/android/mupen64plusae/GameSurface.java" binary="false">
<position height="-1" width="-1" x="404" y="833"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -43,7 +43,7 @@
</display>
</interface>
<interface id="6" corner="BOTTOM_RIGHT" language="java"
name="paulscode.android.mupen64plusae.GameSurface.CoreLifecycleListener" project="mupen64plus"
name="paulscode.android.mupen64plusae.game.GameSurface.CoreLifecycleListener" project="mupen64plus"
file="/mupen64plus/src/paulscode/android/mupen64plusae/GameSurface.java" binary="false">
<position height="-1" width="-1" x="600" y="842"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -60,7 +60,7 @@
<operations public="true" package="false" protected="true" private="false"/>
</display>
</class>
<class id="8" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameActivityXperiaPlay"
<class id="8" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameActivityXperiaPlay"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameActivityXperiaPlay.java"
binary="false">
<position height="-1" width="-1" x="358" y="156"/>
@@ -69,7 +69,7 @@
<operations public="true" package="false" protected="true" private="false"/>
</display>
</class>
<class id="9" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.GameActivity"
<class id="9" corner="BOTTOM_RIGHT" language="java" name="paulscode.android.mupen64plusae.game.GameActivity"
project="mupen64plus" file="/mupen64plus/src/paulscode/android/mupen64plusae/GameActivity.java" binary="false">
<position height="-1" width="-1" x="379" y="190"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -107,6 +107,11 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
return JNI_VERSION_1_4;
}

void JNI_OnUnload(JavaVM *vm, void *reserved)
{
pthread_key_delete(mThreadKey);
}

// Called before SDL_main() to initialize JNI bindings
void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
{
@@ -48,6 +48,7 @@ static void *handleFront; // libmupen64plus-ui-console.so

// Function types
typedef jint (*pJNI_OnLoad) (JavaVM* vm, void* reserved);
typedef void (*pJNI_OnUnload) (JavaVM *vm, void *reserved);
typedef int (*pAeiInit) (JNIEnv* env, jclass cls);
typedef int (*pSdlInit) (JNIEnv* env, jclass cls);
typedef void (*pSdlSetScreen) (int width, int height, Uint32 format);
@@ -175,6 +176,11 @@ extern "C" DECLSPEC void SDLCALL Java_paulscode_android_mupen64plusae_jni_Native
// Clear stale error messages
dlerror();

// Find and call the JNI_OnUnLoad functions from the SDL2 library
pJNI_OnUnload JNI_OnUnLoad = (pJNI_OnUnload) locateFunction(handleSDL, "SDL2", "JNI_OnUnload");
JNI_OnUnLoad(mVm, mReserved);
JNI_OnUnLoad = NULL;

// Nullify function pointers so that they can no longer be used
aeiInit = NULL;
sdlInit = NULL;
@@ -0,0 +1 @@
*
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/fade_in.xml
**
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
<scale android:interpolator="@android:anim/decelerate_interpolator"
android:fromXScale="0.9" android:toXScale="1.0"
android:fromYScale="0.9" android:toYScale="1.0"
android:pivotX="50%" android:pivotY="100%"
android:duration="@integer/abc_config_activityDefaultDur" />
<alpha android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@integer/abc_config_activityShortDur" />
</set>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false" >
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="@integer/abc_config_activityShortDur" />
</set>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false" >
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="@integer/abc_config_activityShortDur" />
</set>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
<scale android:interpolator="@android:anim/decelerate_interpolator"
android:fromXScale="1.0" android:toXScale="0.9"
android:fromYScale="1.0" android:toYScale="0.9"
android:pivotX="50%" android:pivotY="100%"
android:duration="@integer/abc_config_activityDefaultDur" />
<alpha android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/abc_config_activityShortDur" />
</set>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_dark" />
<item android:color="@android:color/transparent" />
</selector>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_light" />
<item android:color="@android:color/transparent" />
</selector>
@@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_dark" />
<item android:color="@android:color/transparent" />
<item android:color="@color/background_material_dark" />
</selector>
@@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_light" />
<item android:color="@android:color/transparent" />
<item android:color="@color/background_material_light" />
</selector>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_dark"/>
<item android:color="@color/switch_thumb_normal_material_dark"/>
</selector>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_light"/>
<item android:color="@color/switch_thumb_normal_material_light"/>
</selector>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.