diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 8f70423479..f5a87b3ae7 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -5,10 +5,12 @@ android:versionName="0.9.1" android:installLocation="auto" > - + + @@ -30,7 +32,8 @@ android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" - android:screenOrientation="landscape" > + > + diff --git a/android/libs/libGoogleAnalyticsServices.jar b/android/libs/libGoogleAnalyticsServices.jar new file mode 100755 index 0000000000..4530eb653b Binary files /dev/null and b/android/libs/libGoogleAnalyticsServices.jar differ diff --git a/android/res/values/analytics.xml b/android/res/values/analytics.xml new file mode 100644 index 0000000000..b8b5bb4c40 --- /dev/null +++ b/android/res/values/analytics.xml @@ -0,0 +1,8 @@ + + + UA-36039055-2 + + true + + true + diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java index 005b5075a7..01de3b77ee 100644 --- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java +++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java @@ -1,6 +1,9 @@ package org.ppsspp.ppsspp; +import android.os.Bundle; + import com.henrikrydgard.libnative.NativeActivity; +import com.google.analytics.tracking.android.EasyTracker; public class PpssppActivity extends NativeActivity { static { @@ -9,11 +12,26 @@ public class PpssppActivity extends NativeActivity { public PpssppActivity() { super(); - } - - public boolean overrideKeys() - { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public void onStart() { + super.onStart(); + EasyTracker.getInstance(this).activityStart(this); + } + + @Override + public void onStop() { + super.onStop(); + EasyTracker.getInstance(this).activityStop(this); + } + + public boolean overrideKeys() { return false; - } -} - \ No newline at end of file + } +} \ No newline at end of file diff --git a/lang b/lang index 6d8cc479c8..60b4010fb4 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 6d8cc479c8be8ba20bdab5595e5c041e7db0cdf7 +Subproject commit 60b4010fb4b16fb83718172a08a4850df6f0d8da diff --git a/native b/native index c690d4c0e1..3778d8d8b1 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit c690d4c0e13dce9829e5d2101492b982b9295f06 +Subproject commit 3778d8d8b1c3cc66470f1575b9959a04812b8f3f