diff --git a/.gitignore b/.gitignore
index eafc1d0862..f5b1883eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,10 +115,6 @@ wiiu/wut/elf2rpl/elf2rpl
/pkg/android/phoenix/bin/
/pkg/android/phoenix/gen/
/pkg/android/phoenix/local.properties
-/pkg/android/phoenix/gradle.properties
-/pkg/android/phoenix/.gradle
-/pkg/android/phoenix/.externalNativeBuild
-/pkg/android/phoenix/build
# Cloned by libretro-fetch.sh
/media/assets/
diff --git a/deps/dr/dr_flac.h b/deps/dr/dr_flac.h
index 2ac68fb8b1..96ce30c1a1 100644
--- a/deps/dr/dr_flac.h
+++ b/deps/dr/dr_flac.h
@@ -667,7 +667,7 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr
#define DRFLAC_NO_CPUID
#endif
#else
- #if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__)
+ #if defined(__GNUC__) || defined(__clang__)
static void drflac__cpuid(int info[4], int fid)
{
__asm__ __volatile__ (
diff --git a/pkg/android/phoenix-gradle/.gitignore b/pkg/android/phoenix-gradle/.gitignore
new file mode 100644
index 0000000000..5559a70cbb
--- /dev/null
+++ b/pkg/android/phoenix-gradle/.gitignore
@@ -0,0 +1,135 @@
+
+# Created by https://www.gitignore.io/api/androidstudio
+# Edit at https://www.gitignore.io/?templates=androidstudio
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle
+.gradle/
+build/
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+captures/
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Android Patch
+gen-external-apklibs
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iml
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.gitignore.io/api/androidstudio
diff --git a/pkg/android/phoenix/sideload/README.md b/pkg/android/phoenix-gradle/README.md
similarity index 100%
rename from pkg/android/phoenix/sideload/README.md
rename to pkg/android/phoenix-gradle/README.md
diff --git a/pkg/android/phoenix-gradle/app/build.gradle b/pkg/android/phoenix-gradle/app/build.gradle
new file mode 100644
index 0000000000..a5d62c00ea
--- /dev/null
+++ b/pkg/android/phoenix-gradle/app/build.gradle
@@ -0,0 +1,68 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
+
+ defaultConfig {
+ applicationId "com.retroarch"
+ minSdkVersion 16
+ targetSdkVersion 28
+
+ ndk {
+ moduleName "retroarch-activity"
+ }
+
+ externalNativeBuild {
+ ndkBuild {
+ arguments "-j${Runtime.runtime.availableProcessors()}"
+ }
+ }
+ }
+
+ flavorDimensions "abi"
+ productFlavors {
+ ra32 {
+ dimension "abi"
+ ndk {
+ abiFilters 'armeabi-v7a', 'x86'
+ }
+ resValue "string", "app_name", "RetroArch"
+ }
+ ra64 {
+ dimension "abi"
+ ndk {
+ abiFilters 'arm64-v8a', 'x86_64'
+ }
+ applicationIdSuffix '.aarch64'
+ resValue "string", "app_name", "RetroArch (AArch64)"
+ }
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+ externalNativeBuild {
+ ndkBuild {
+ path file('../../phoenix/jni/Android.mk')
+ }
+ }
+
+ sourceSets {
+ ra32 {
+ java.srcDirs = ['../../phoenix/src']
+ res.srcDirs = ['../../phoenix/res', '../../phoenix/libs/googleplay/res']
+ }
+ ra64 {
+ java.srcDirs = ['../../phoenix/src']
+ res.srcDirs = ['../../phoenix64/res', '../../phoenix64/libs/googleplay/res']
+ }
+ }
+}
+
+dependencies {
+ implementation files('../../phoenix/libs/googleplay/libs/google-play-services.jar')
+}
diff --git a/pkg/android/phoenix-gradle/app/src/main/AndroidManifest.xml b/pkg/android/phoenix-gradle/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..fb842b9c9c
--- /dev/null
+++ b/pkg/android/phoenix-gradle/app/src/main/AndroidManifest.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix-gradle/build.gradle b/pkg/android/phoenix-gradle/build.gradle
new file mode 100644
index 0000000000..2b29ba2521
--- /dev/null
+++ b/pkg/android/phoenix-gradle/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.2.1'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ jcenter()
+ }
+}
diff --git a/pkg/android/phoenix/gradle/wrapper/gradle-wrapper.jar b/pkg/android/phoenix-gradle/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from pkg/android/phoenix/gradle/wrapper/gradle-wrapper.jar
rename to pkg/android/phoenix-gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/pkg/android/phoenix/gradle/wrapper/gradle-wrapper.properties b/pkg/android/phoenix-gradle/gradle/wrapper/gradle-wrapper.properties
similarity index 91%
rename from pkg/android/phoenix/gradle/wrapper/gradle-wrapper.properties
rename to pkg/android/phoenix-gradle/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf61..ae45383b6d 100644
--- a/pkg/android/phoenix/gradle/wrapper/gradle-wrapper.properties
+++ b/pkg/android/phoenix-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/pkg/android/phoenix/gradlew b/pkg/android/phoenix-gradle/gradlew
old mode 100755
new mode 100644
similarity index 100%
rename from pkg/android/phoenix/gradlew
rename to pkg/android/phoenix-gradle/gradlew
diff --git a/pkg/android/phoenix/gradlew.bat b/pkg/android/phoenix-gradle/gradlew.bat
similarity index 96%
rename from pkg/android/phoenix/gradlew.bat
rename to pkg/android/phoenix-gradle/gradlew.bat
index e95643d6a2..f9553162f1 100644
--- a/pkg/android/phoenix/gradlew.bat
+++ b/pkg/android/phoenix-gradle/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pkg/android/phoenix-gradle/settings.gradle b/pkg/android/phoenix-gradle/settings.gradle
new file mode 100644
index 0000000000..e7b4def49c
--- /dev/null
+++ b/pkg/android/phoenix-gradle/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/pkg/android/phoenix/sideload/sideload_core_android_studio.png b/pkg/android/phoenix-gradle/sideload_core_android_studio.png
similarity index 100%
rename from pkg/android/phoenix/sideload/sideload_core_android_studio.png
rename to pkg/android/phoenix-gradle/sideload_core_android_studio.png
diff --git a/pkg/android/phoenix-legacy/.gitignore b/pkg/android/phoenix-legacy/.gitignore
deleted file mode 100644
index 859bcd7938..0000000000
--- a/pkg/android/phoenix-legacy/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/gen
-/bin
-/libs/*/*.so
-/obj
-/jni/modules/*.so
diff --git a/pkg/android/phoenix-legacy/src/com/retroarch/browser/debug/CoreSideloadActivity.java b/pkg/android/phoenix-legacy/src/com/retroarch/browser/debug/CoreSideloadActivity.java
deleted file mode 100644
index 37a4ee7b37..0000000000
--- a/pkg/android/phoenix-legacy/src/com/retroarch/browser/debug/CoreSideloadActivity.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.retroarch.browser.debug;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.retroarch.browser.mainmenu.MainMenuActivity;
-import com.retroarch.browser.preferences.util.UserPreferences;
-import com.retroarch.browser.retroactivity.RetroActivityPast;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * This activity allows developers to sideload and run a core
- * from their PC through adb
- *
- * Usage : see Phoenix Gradle Build README.md
- */
-public class CoreSideloadActivity extends Activity
-{
- private static final String EXTRA_CORE = "LIBRETRO";
- private static final String EXTRA_CONTENT = "ROM";
-
- private TextView textView;
- private CoreSideloadWorkerTask workerThread;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // The most simple layout is no layout at all
- textView = new TextView(this);
- setContentView(textView);
-
- // Check that we have at least the core extra
- if (!getIntent().hasExtra(EXTRA_CORE))
- {
- textView.setText("Missing extra \"LIBRETRO\"");
- return;
- }
-
- // Start our worker thread
- workerThread = new CoreSideloadWorkerTask(this, textView, getIntent().getStringExtra(EXTRA_CORE), getIntent().getStringExtra(EXTRA_CONTENT));
- workerThread.execute();
- }
-
- @Override
- protected void onDestroy() {
- if (workerThread != null)
- {
- workerThread.cancel(true);
- workerThread = null;
- }
- super.onDestroy();
- }
-
- private static class CoreSideloadWorkerTask extends AsyncTask
- {
- private TextView progressTextView;
- private String core;
- private String content;
- private Activity ctx;
- private File destination;
-
- public CoreSideloadWorkerTask(Activity ctx, TextView progressTextView, String corePath, String contentPath)
- {
- this.progressTextView = progressTextView;
- this.core = corePath;
- this.ctx = ctx;
- this.content = contentPath;
- }
-
- @Override
- protected void onPreExecute() {
- super.onPreExecute();
- progressTextView.setText("Sideloading...");
- }
-
- @Override
- protected String doInBackground(Void... voids) {
- File coreFile = new File(core);
- File corePath = new File(UserPreferences.getPreferences(ctx).getString("libretro_path", ctx.getApplicationInfo().dataDir + "/cores/"));
-
- // Check that both files exist
- if (!coreFile.exists())
- return "Input file doesn't exist (" + core + ")";
-
- if (!corePath.exists())
- return "Destination directory doesn't exist (" + corePath.getAbsolutePath() + ")";
-
- destination = new File(corePath, coreFile.getName());
-
- // Copy it
- Log.d("sideload", "Copying " + coreFile.getAbsolutePath() + " to " + destination.getAbsolutePath());
- long copied = 0;
- long max = coreFile.length();
- try
- {
- InputStream is = new FileInputStream(coreFile);
- OutputStream os = new FileOutputStream(destination);
-
- byte[] buf = new byte[1024];
- int length;
-
- while ((length = is.read(buf)) > 0)
- {
- os.write(buf, 0, length);
-
- copied += length;
- publishProgress((int)(copied / max * 100));
- }
-
- is.close();
- os.close();
- }
- catch (IOException ex)
- {
- ex.printStackTrace();
- return ex.getMessage();
- }
-
- return null;
- }
-
- @Override
- protected void onProgressUpdate(Integer... values) {
- super.onProgressUpdate(values);
-
- if (values.length > 0)
- progressTextView.setText("Sideloading: " + values[0] + "%");
- }
-
- @Override
- protected void onPostExecute(String s) {
- super.onPostExecute(s);
-
- // Everything went as expected
- if (s == null)
- {
- progressTextView.setText("Done!");
-
- // Run RA with our newly sideloaded core (and content)
- Intent retro = new Intent(ctx, RetroActivityPast.class);
-
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-
- retro.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
- Log.d("sideload", "Running RetroArch with core " + destination.getAbsolutePath());
-
- MainMenuActivity.startRetroActivity(
- retro,
- content,
- destination.getAbsolutePath(),
- UserPreferences.getDefaultConfigPath(ctx),
- Settings.Secure.getString(ctx.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD),
- ctx.getApplicationInfo().dataDir,
- ctx.getApplicationInfo().sourceDir);
-
- ctx.startActivity(retro);
- ctx.finish();
- }
- // An error occured
- else
- {
- progressTextView.setText("Error: " + s);
- }
- }
- }
-}
diff --git a/pkg/android/phoenix-legacy/src/com/retroarch/browser/mainmenu/MainMenuActivity.java b/pkg/android/phoenix-legacy/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
deleted file mode 100644
index 996cfa236c..0000000000
--- a/pkg/android/phoenix-legacy/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.retroarch.browser.mainmenu;
-
-import com.retroarch.browser.preferences.util.UserPreferences;
-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;
- public static String PACKAGE_NAME;
- 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 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 permissionsNeeded = new ArrayList();
- final List permissionsList = new ArrayList();
-
- 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 = 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());
- String external = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + PACKAGE_NAME + "/files";
- retro.putExtra("EXTERNAL", external);
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
-
- PACKAGE_NAME = getPackageName();
-
- // Bind audio stream to hardware controls.
- setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
- UserPreferences.updateConfigFile(this);
-
- checkRuntimePermissions();
- }
-}
diff --git a/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java b/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
deleted file mode 100644
index 4125a3e2a8..0000000000
--- a/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
+++ /dev/null
@@ -1,315 +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} activity.
- */
-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();
- }
-}
diff --git a/pkg/android/phoenix-legacy/.classpath b/pkg/android/phoenix/.classpath
similarity index 100%
rename from pkg/android/phoenix-legacy/.classpath
rename to pkg/android/phoenix/.classpath
diff --git a/pkg/android/phoenix/.gitignore b/pkg/android/phoenix/.gitignore
index 3ca44edbb9..859bcd7938 100644
--- a/pkg/android/phoenix/.gitignore
+++ b/pkg/android/phoenix/.gitignore
@@ -1,3 +1,5 @@
-.gradle
-.externalNativeBuild
-build
+/gen
+/bin
+/libs/*/*.so
+/obj
+/jni/modules/*.so
diff --git a/pkg/android/phoenix-legacy/.project b/pkg/android/phoenix/.project
similarity index 100%
rename from pkg/android/phoenix-legacy/.project
rename to pkg/android/phoenix/.project
diff --git a/pkg/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs b/pkg/android/phoenix/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from pkg/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs
rename to pkg/android/phoenix/.settings/org.eclipse.jdt.core.prefs
diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 8fe3d21fe2..100057ca7b 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+ android:minSdkVersion="9"
+ android:targetSdkVersion="26" />
-
+ android:banner="@drawable/banner">
@@ -40,6 +36,10 @@
+
+
+
+
diff --git a/pkg/android/phoenix-legacy/ant.properties b/pkg/android/phoenix/ant.properties
similarity index 100%
rename from pkg/android/phoenix-legacy/ant.properties
rename to pkg/android/phoenix/ant.properties
diff --git a/pkg/android/phoenix/build.gradle b/pkg/android/phoenix/build.gradle
deleted file mode 100644
index 0fe3483d7d..0000000000
--- a/pkg/android/phoenix/build.gradle
+++ /dev/null
@@ -1,99 +0,0 @@
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath "com.android.tools.build:gradle:3.4.1"
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 28
- buildToolsVersion "28.0.3"
-
- flavorDimensions "variant"
-
- defaultConfig {
- externalNativeBuild {
- ndkBuild {
- arguments "-j${Runtime.runtime.availableProcessors()}"
- }
- }
- }
-
- productFlavors {
- normal {
- dimension "variant"
- }
- aarch64 {
- applicationIdSuffix '.aarch64'
- resValue "string", "app_name", "RetroArch (AArch64)"
-
- dimension "variant"
- ndk {
- abiFilters 'arm64-v8a', 'x86_64'
- }
- }
- ra32 {
- applicationIdSuffix '.ra32'
- resValue "string", "app_name", "RetroArch (32-bit)"
-
- dimension "variant"
- ndk {
- abiFilters 'armeabi-v7a', 'x86'
- }
- }
- }
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- assets.srcDirs = ['assets']
- java.srcDirs = ['src', '../phoenix-common/src']
- jniLibs.srcDir '../phoenix-common/libs'
- jni.srcDirs = []
- res.srcDirs = ['../phoenix-common/res']
- }
- aarch64 {
- res.srcDirs = ['res64']
- }
- }
-
- externalNativeBuild {
- ndkBuild {
- path '../phoenix-common/jni/Android.mk'
- }
- }
-
- signingConfigs {
- if (project.hasProperty("RELEASE_STORE_FILE")) {
- release {
- storeFile file(RELEASE_STORE_FILE)
- storePassword RELEASE_STORE_PASSWORD
- keyAlias RELEASE_KEY_ALIAS
- keyPassword RELEASE_KEY_PASSWORD
- }
- }
- }
-
- buildTypes {
- release {
- signingConfig signingConfigs.release
- }
- }
-}
-
-dependencies {
- implementation 'com.google.android.gms:play-services-location:16.0.0'
-}
diff --git a/pkg/android/phoenix-legacy/build.xml b/pkg/android/phoenix/build.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/build.xml
rename to pkg/android/phoenix/build.xml
diff --git a/pkg/android/phoenix-legacy/docs/Building in Eclipse.md b/pkg/android/phoenix/docs/Building in Eclipse.md
similarity index 100%
rename from pkg/android/phoenix-legacy/docs/Building in Eclipse.md
rename to pkg/android/phoenix/docs/Building in Eclipse.md
diff --git a/pkg/android/phoenix-common/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
similarity index 98%
rename from pkg/android/phoenix-common/jni/Android.mk
rename to pkg/android/phoenix/jni/Android.mk
index e72570e1fe..563e86fa96 100644
--- a/pkg/android/phoenix-common/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -100,7 +100,7 @@ LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder
# Let ndk-build set the optimization flags but remove -O3 like in cf3c3
LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS))
-LOCAL_LDLIBS := -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \
$(LOCAL_PATH)/$(RARCH_DIR)/deps \
diff --git a/pkg/android/phoenix-common/jni/Application.mk b/pkg/android/phoenix/jni/Application.mk
similarity index 100%
rename from pkg/android/phoenix-common/jni/Application.mk
rename to pkg/android/phoenix/jni/Application.mk
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/.classpath b/pkg/android/phoenix/libs/googleplay/.classpath
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/.classpath
rename to pkg/android/phoenix/libs/googleplay/.classpath
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/.project b/pkg/android/phoenix/libs/googleplay/.project
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/.project
rename to pkg/android/phoenix/libs/googleplay/.project
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/.settings/org.eclipse.jdt.core.prefs b/pkg/android/phoenix/libs/googleplay/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/.settings/org.eclipse.jdt.core.prefs
rename to pkg/android/phoenix/libs/googleplay/.settings/org.eclipse.jdt.core.prefs
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/AndroidManifest.xml b/pkg/android/phoenix/libs/googleplay/AndroidManifest.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/AndroidManifest.xml
rename to pkg/android/phoenix/libs/googleplay/AndroidManifest.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/README.txt b/pkg/android/phoenix/libs/googleplay/README.txt
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/README.txt
rename to pkg/android/phoenix/libs/googleplay/README.txt
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/build.xml b/pkg/android/phoenix/libs/googleplay/build.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/build.xml
rename to pkg/android/phoenix/libs/googleplay/build.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/libs/google-play-services.jar b/pkg/android/phoenix/libs/googleplay/libs/google-play-services.jar
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/libs/google-play-services.jar
rename to pkg/android/phoenix/libs/googleplay/libs/google-play-services.jar
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/proguard.txt b/pkg/android/phoenix/libs/googleplay/proguard.txt
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/proguard.txt
rename to pkg/android/phoenix/libs/googleplay/proguard.txt
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/project.properties b/pkg/android/phoenix/libs/googleplay/project.properties
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/project.properties
rename to pkg/android/phoenix/libs/googleplay/project.properties
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_dark.xml b/pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_dark.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_dark.xml
rename to pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_dark.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_light.xml b/pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_light.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_light.xml
rename to pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_light.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
rename to pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml b/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml
rename to pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml b/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml
rename to pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml b/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml
rename to pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_light.xml b/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_light.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_light.xml
rename to pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_light.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-af/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-af/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-af/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-af/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-am/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-am/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-am/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-am/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ar/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ar/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ar/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ar/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-be/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-be/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-be/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-be/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-bg/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-bg/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-bg/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-bg/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ca/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ca/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ca/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ca/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-cs/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-cs/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-cs/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-cs/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-da/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-da/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-da/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-da/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-de/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-de/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-de/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-de/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-el/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-el/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-el/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-el/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rGB/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-en-rGB/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rGB/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-en-rGB/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rIN/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-en-rIN/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rIN/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-en-rIN/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-es-rUS/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-es-rUS/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-es-rUS/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-es-rUS/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-es/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-es/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-es/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-es/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-et-rEE/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-et-rEE/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-et-rEE/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-et-rEE/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-et/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-et/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-et/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-et/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-fa/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-fa/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-fa/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-fa/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-fi/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-fi/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-fi/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-fi/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-fr-rCA/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-fr-rCA/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-fr-rCA/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-fr-rCA/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-fr/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-fr/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-fr/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-fr/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-hi/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-hi/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-hi/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-hi/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-hr/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-hr/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-hr/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-hr/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-hu/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-hu/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-hu/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-hu/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-hy-rAM/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-hy-rAM/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-hy-rAM/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-hy-rAM/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-in/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-in/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-in/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-in/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-it/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-it/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-it/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-it/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-iw/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-iw/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-iw/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-iw/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ja/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ja/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ja/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ja/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ka-rGE/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ka-rGE/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ka-rGE/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ka-rGE/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-km-rKH/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-km-rKH/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-km-rKH/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-km-rKH/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ko/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ko/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ko/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ko/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-lo-rLA/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-lo-rLA/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-lo-rLA/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-lo-rLA/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-lt/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-lt/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-lt/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-lt/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-lv/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-lv/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-lv/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-lv/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-mn-rMN/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-mn-rMN/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-mn-rMN/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-mn-rMN/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ms-rMY/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ms-rMY/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ms-rMY/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ms-rMY/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ms/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ms/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ms/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ms/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-nb/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-nb/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-nb/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-nb/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-nl/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-nl/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-nl/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-nl/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-pl/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-pl/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-pl/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-pl/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rBR/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-pt-rBR/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rBR/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-pt-rBR/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rPT/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-pt-rPT/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rPT/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-pt-rPT/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-pt/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-pt/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-pt/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ro/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ro/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ro/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ro/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-ru/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-ru/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-ru/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-ru/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-sk/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-sk/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-sk/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-sk/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-sl/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-sl/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-sl/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-sl/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-sr/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-sr/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-sr/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-sr/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-sv/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-sv/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-sv/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-sv/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-sw/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-sw/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-sw/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-sw/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-th/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-th/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-th/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-th/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-tl/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-tl/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-tl/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-tl/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-tr/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-tr/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-tr/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-tr/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-uk/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-uk/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-uk/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-uk/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-vi/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-vi/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-vi/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-vi/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rCN/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-zh-rCN/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rCN/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-zh-rCN/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rHK/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-zh-rHK/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rHK/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-zh-rHK/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rTW/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-zh-rTW/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rTW/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-zh-rTW/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values-zu/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values-zu/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values-zu/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values-zu/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values/ads_attrs.xml b/pkg/android/phoenix/libs/googleplay/res/values/ads_attrs.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values/ads_attrs.xml
rename to pkg/android/phoenix/libs/googleplay/res/values/ads_attrs.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values/colors.xml b/pkg/android/phoenix/libs/googleplay/res/values/colors.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values/colors.xml
rename to pkg/android/phoenix/libs/googleplay/res/values/colors.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values/maps_attrs.xml b/pkg/android/phoenix/libs/googleplay/res/values/maps_attrs.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values/maps_attrs.xml
rename to pkg/android/phoenix/libs/googleplay/res/values/maps_attrs.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values/strings.xml b/pkg/android/phoenix/libs/googleplay/res/values/strings.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values/strings.xml
rename to pkg/android/phoenix/libs/googleplay/res/values/strings.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/res/values/version.xml b/pkg/android/phoenix/libs/googleplay/res/values/version.xml
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/res/values/version.xml
rename to pkg/android/phoenix/libs/googleplay/res/values/version.xml
diff --git a/pkg/android/phoenix-legacy/libs/googleplay/src/android/.readme b/pkg/android/phoenix/libs/googleplay/src/android/.readme
similarity index 100%
rename from pkg/android/phoenix-legacy/libs/googleplay/src/android/.readme
rename to pkg/android/phoenix/libs/googleplay/src/android/.readme
diff --git a/pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj b/pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj
similarity index 100%
rename from pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj
rename to pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj
diff --git a/pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj.filters b/pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj.filters
similarity index 100%
rename from pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj.filters
rename to pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj.filters
diff --git a/pkg/android/phoenix-legacy/msvc-2017-android.Packaging.androidproj b/pkg/android/phoenix/msvc-2017-android.Packaging.androidproj
similarity index 100%
rename from pkg/android/phoenix-legacy/msvc-2017-android.Packaging.androidproj
rename to pkg/android/phoenix/msvc-2017-android.Packaging.androidproj
diff --git a/pkg/android/phoenix-legacy/msvc-2017-android.sln b/pkg/android/phoenix/msvc-2017-android.sln
similarity index 100%
rename from pkg/android/phoenix-legacy/msvc-2017-android.sln
rename to pkg/android/phoenix/msvc-2017-android.sln
diff --git a/pkg/android/phoenix-legacy/proguard-project.txt b/pkg/android/phoenix/proguard-project.txt
similarity index 100%
rename from pkg/android/phoenix-legacy/proguard-project.txt
rename to pkg/android/phoenix/proguard-project.txt
diff --git a/pkg/android/phoenix-legacy/project.properties b/pkg/android/phoenix/project.properties
similarity index 97%
rename from pkg/android/phoenix-legacy/project.properties
rename to pkg/android/phoenix/project.properties
index 2bb7b45d10..645b855d3c 100644
--- a/pkg/android/phoenix-legacy/project.properties
+++ b/pkg/android/phoenix/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-16
+target=android-26
android.library.reference.1=libs/googleplay
diff --git a/pkg/android/phoenix-common/res/drawable-hdpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-hdpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-hdpi/ic_launcher.png
diff --git a/pkg/android/phoenix-common/res/drawable-ldpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-ldpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-ldpi/ic_launcher.png
diff --git a/pkg/android/phoenix-common/res/drawable-mdpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-mdpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-mdpi/ic_launcher.png
diff --git a/pkg/android/phoenix-common/res/drawable-xhdpi/banner.png b/pkg/android/phoenix/res/drawable-xhdpi/banner.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-xhdpi/banner.png
rename to pkg/android/phoenix/res/drawable-xhdpi/banner.png
diff --git a/pkg/android/phoenix-common/res/drawable-xhdpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-xhdpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-xhdpi/ic_launcher.png
diff --git a/pkg/android/phoenix/res/drawable-xhdpi/ouya_icon.png b/pkg/android/phoenix/res/drawable-xhdpi/ouya_icon.png
new file mode 100644
index 0000000000..45d15267dc
Binary files /dev/null and b/pkg/android/phoenix/res/drawable-xhdpi/ouya_icon.png differ
diff --git a/pkg/android/phoenix-common/res/drawable-xxhdpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-xxhdpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-xxhdpi/ic_launcher.png
diff --git a/pkg/android/phoenix-common/res/drawable-xxxhdpi/ic_launcher.png b/pkg/android/phoenix/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from pkg/android/phoenix-common/res/drawable-xxxhdpi/ic_launcher.png
rename to pkg/android/phoenix/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/pkg/android/phoenix/res/drawable/banner.png b/pkg/android/phoenix/res/drawable/banner.png
new file mode 100644
index 0000000000..45d15267dc
Binary files /dev/null and b/pkg/android/phoenix/res/drawable/banner.png differ
diff --git a/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java b/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java
index 71cbcf5200..76d255c43f 100644
--- a/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java
+++ b/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java
@@ -14,6 +14,7 @@ import android.widget.TextView;
import com.retroarch.browser.mainmenu.MainMenuActivity;
import com.retroarch.browser.preferences.util.UserPreferences;
import com.retroarch.browser.retroactivity.RetroActivityFuture;
+import com.retroarch.browser.retroactivity.RetroActivityPast;
import java.io.File;
import java.io.FileInputStream;
@@ -152,7 +153,16 @@ public class CoreSideloadActivity extends Activity
progressTextView.setText("Done!");
// Run RA with our newly sideloaded core (and content)
- Intent retro = new Intent(ctx, RetroActivityFuture.class);
+ Intent retro;
+
+ if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB))
+ {
+ retro = new Intent(ctx, RetroActivityFuture.class);
+ }
+ else
+ {
+ retro = new Intent(ctx, RetroActivityPast.class);
+ }
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
diff --git a/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java b/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
index 7f8a4ef9e7..537fee43cc 100644
--- a/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
+++ b/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
@@ -2,6 +2,7 @@ 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;
@@ -41,16 +42,13 @@ public final class MainMenuActivity extends PreferenceActivity
private boolean addPermission(List permissionsList, String permission)
{
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
+ if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED)
{
- if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED)
- {
- permissionsList.add(permission);
+ permissionsList.add(permission);
- // Check for Rationale Option
- if (!shouldShowRequestPermissionRationale(permission))
- return false;
- }
+ // Check for Rationale Option
+ if (!shouldShowRequestPermissionRationale(permission))
+ return false;
}
return true;
@@ -58,7 +56,7 @@ public final class MainMenuActivity extends PreferenceActivity
public void checkRuntimePermissions()
{
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
+ if (android.os.Build.VERSION.SDK_INT >= 23)
{
// Android 6.0+ needs runtime permission checks
List permissionsNeeded = new ArrayList();
@@ -68,8 +66,6 @@ public final class MainMenuActivity extends PreferenceActivity
permissionsNeeded.add("Read External Storage");
if (!addPermission(permissionsList, Manifest.permission.WRITE_EXTERNAL_STORAGE))
permissionsNeeded.add("Write External Storage");
- if (!addPermission(permissionsList, Manifest.permission.ACCESS_FINE_LOCATION))
- permissionsNeeded.add("Access fine location");
if (permissionsList.size() > 0)
{
@@ -93,13 +89,10 @@ public final class MainMenuActivity extends PreferenceActivity
{
if (which == AlertDialog.BUTTON_POSITIVE)
{
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
- {
- requestPermissions(permissionsList.toArray(new String[permissionsList.size()]),
- REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
+ requestPermissions(permissionsList.toArray(new String[permissionsList.size()]),
+ REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
- Log.i("MainMenuActivity", "User accepted request for external storage permissions.");
- }
+ Log.i("MainMenuActivity", "User accepted request for external storage permissions.");
}
}
});
@@ -123,7 +116,16 @@ public final class MainMenuActivity extends PreferenceActivity
public void finalStartup()
{
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- Intent retro = new Intent(this, RetroActivityFuture.class);
+ 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);
diff --git a/pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/ConfigFile.java b/pkg/android/phoenix/src/com/retroarch/browser/preferences/util/ConfigFile.java
similarity index 100%
rename from pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/ConfigFile.java
rename to pkg/android/phoenix/src/com/retroarch/browser/preferences/util/ConfigFile.java
diff --git a/pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/UserPreferences.java b/pkg/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
similarity index 100%
rename from pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/UserPreferences.java
rename to pkg/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
diff --git a/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
similarity index 100%
rename from pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
rename to pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
diff --git a/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
similarity index 96%
rename from pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
rename to pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
index 896d8dcc8a..109126a171 100644
--- a/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
+++ b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
@@ -49,16 +49,14 @@ public class RetroActivityCommon extends RetroActivityLocation
long[] pattern = {16};
int[] strengths = {strength};
- if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
- if (id == -1)
- vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
- else
- {
- InputDevice dev = InputDevice.getDevice(id);
+ if (id == -1)
+ vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
+ else
+ {
+ InputDevice dev = InputDevice.getDevice(id);
- if (dev != null)
- vibrator = dev.getVibrator();
- }
+ if (dev != null)
+ vibrator = dev.getVibrator();
}
if (vibrator == null)
@@ -74,7 +72,7 @@ public class RetroActivityCommon extends RetroActivityLocation
else
pattern[0] = 1000;
- if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+ if (Build.VERSION.SDK_INT >= 26) {
if (id >= 0)
Log.i("RetroActivity", "Vibrate id " + id + ": strength " + strength);
diff --git a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
index 63b6f92989..92c142aebc 100644
--- a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
+++ b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
@@ -40,16 +40,13 @@ public final class RetroActivityFuture extends RetroActivityCamera {
// Check for Android UI specific parameters
Intent retro = getIntent();
+ String refresh = retro.getStringExtra("REFRESH");
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
- 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 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
@@ -64,22 +61,20 @@ public final class RetroActivityFuture extends RetroActivityCamera {
public void hideMouseCursor() {
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
- // 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) { }
+ // 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
diff --git a/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
similarity index 100%
rename from pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
rename to pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
diff --git a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
index 70a094f687..9fedbf2e7b 100644
--- a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
+++ b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
@@ -1,10 +1,11 @@
package com.retroarch.browser.retroactivity;
-import com.google.android.gms.common.api.GoogleApiClient;
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.google.android.gms.location.LocationServices;
import com.retroarch.browser.preferences.util.UserPreferences;
import android.app.NativeActivity;
@@ -15,19 +16,17 @@ import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
-import android.content.pm.PackageManager;
-import android.Manifest;
-
/**
* Class that implements location-based functionality for
- * the {@link RetroActivityFuture} activity.
+ * the {@link RetroActivityFuture} and {@link RetroActivityPast}
+ * activities.
*/
public class RetroActivityLocation extends NativeActivity
-implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener
+implements ConnectionCallbacks, OnConnectionFailedListener, LocationListener
{
/* LOCATION VARIABLES */
private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0;
- private GoogleApiClient mGoogleApiClient = null;
+ private LocationClient mLocationClient = null;
private Location mCurrentLocation;
// Define an object that holds accuracy and frequency parameters
@@ -44,31 +43,24 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
@Override
public void onConnected(Bundle dataBundle)
{
- if (mGoogleApiClient == null)
+ if (mLocationClient == null)
return;
// Display the connection status
Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show();
location_service_running = true;
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
- {
- if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED)
- {
// If already requested, start periodic updates
if (mUpdatesRequested)
{
- LocationServices.FusedLocationApi.requestLocationUpdates(
- mGoogleApiClient, mLocationRequest, this);
+ mLocationClient.requestLocationUpdates(mLocationRequest, this, null);
}
else
{
// Get last known location
- mCurrentLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
+ mCurrentLocation = mLocationClient.getLastLocation();
locationChanged = true;
}
- }
- }
}
/**
@@ -76,24 +68,23 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
* location client drops because of an error.
*/
@Override
- public void onConnectionSuspended(int i)
+ public void onDisconnected()
{
- if (mGoogleApiClient == null)
+ 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 (mGoogleApiClient.isConnected())
+ if (mLocationClient.isConnected())
{
/*
* Remove location updates for a listener.
* The current Activity is the listener, so
* the argument is "this".
*/
- LocationServices.FusedLocationApi.removeLocationUpdates(
- mGoogleApiClient, this);
+ mLocationClient.removeLocationUpdates(this);
}
location_service_running = false;
@@ -165,13 +156,8 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
* Create a new location client, using the enclosing class to
* handle callbacks.
*/
- if (mGoogleApiClient == null) {
- mGoogleApiClient = new GoogleApiClient.Builder(this)
- .addApi(LocationServices.API)
- .addConnectionCallbacks(this)
- .addOnConnectionFailedListener(this)
- .build();
- }
+ if (mLocationClient == null)
+ mLocationClient = new LocationClient(this, this, this);
// Start with updates turned off
mUpdatesRequested = false;
@@ -185,17 +171,17 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
/**
- * Executed upon starting the {@link GoogleApiClient}.
+ * Executed upon starting the {@link LocationClient}.
*/
public void onLocationStart()
{
- if (mGoogleApiClient == null)
+ if (mLocationClient == null)
return;
mUpdatesRequested = true;
// Connect the client.
- mGoogleApiClient.connect();
+ mLocationClient.connect();
}
/**
@@ -213,8 +199,8 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
public void onLocationStop()
{
// Disconnecting the client invalidates it.
- if (mGoogleApiClient != null && mUpdatesRequested)
- mGoogleApiClient.disconnect();
+ if (mLocationClient != null && mUpdatesRequested)
+ mLocationClient.disconnect();
}
/**
diff --git a/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityPast.java b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
similarity index 100%
rename from pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
rename to pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
diff --git a/pkg/android/phoenix64/.classpath b/pkg/android/phoenix64/.classpath
new file mode 100644
index 0000000000..51769745b2
--- /dev/null
+++ b/pkg/android/phoenix64/.classpath
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix-common/.gitignore b/pkg/android/phoenix64/.gitignore
similarity index 100%
rename from pkg/android/phoenix-common/.gitignore
rename to pkg/android/phoenix64/.gitignore
diff --git a/pkg/android/phoenix64/.project b/pkg/android/phoenix64/.project
new file mode 100644
index 0000000000..4af1961cac
--- /dev/null
+++ b/pkg/android/phoenix64/.project
@@ -0,0 +1,33 @@
+
+
+ RetroArch
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/pkg/android/phoenix-legacy/AndroidManifest.xml b/pkg/android/phoenix64/AndroidManifest.xml
similarity index 78%
rename from pkg/android/phoenix-legacy/AndroidManifest.xml
rename to pkg/android/phoenix64/AndroidManifest.xml
index 017bc704fa..00fec1e386 100644
--- a/pkg/android/phoenix-legacy/AndroidManifest.xml
+++ b/pkg/android/phoenix64/AndroidManifest.xml
@@ -1,7 +1,7 @@
@@ -10,7 +10,7 @@
+ android:targetSdkVersion="26" />
@@ -19,7 +19,7 @@
@@ -32,6 +32,10 @@
+
+
+
+
diff --git a/pkg/android/phoenix64/Readme.md b/pkg/android/phoenix64/Readme.md
new file mode 100644
index 0000000000..ce900d257e
--- /dev/null
+++ b/pkg/android/phoenix64/Readme.md
@@ -0,0 +1,3 @@
+# Phoenix - Android front-end for RetroArch.
+
+- For instructions on importing the project correctly, please see the document, "Building in Eclipse.txt" within the docs folder.
\ No newline at end of file
diff --git a/pkg/android/phoenix64/ant.properties b/pkg/android/phoenix64/ant.properties
new file mode 100644
index 0000000000..97d04e9d39
--- /dev/null
+++ b/pkg/android/phoenix64/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+source.dir=../phoenix/src
diff --git a/pkg/android/phoenix64/build.xml b/pkg/android/phoenix64/build.xml
new file mode 100644
index 0000000000..9698a04abf
--- /dev/null
+++ b/pkg/android/phoenix64/build.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/docs/Building in Eclipse.md b/pkg/android/phoenix64/docs/Building in Eclipse.md
new file mode 100644
index 0000000000..bef2b9aea3
--- /dev/null
+++ b/pkg/android/phoenix64/docs/Building in Eclipse.md
@@ -0,0 +1,45 @@
+## Building the JNI-related files for Phoenix.
+
+ 1. If you haven't already, install the Android NDK (http://developer.android.com/tools/sdk/ndk/index.html)
+
+ 2. In the Phoenix root directory you should notice the folder named "jni".
+
+ 3. Open Command Prompt/Terminal and cd into this directory.
+
+ 4. Run ndk-build within this directory (just type "ndk-build" and hit Enter) and wait for everything to finish building.
+
+ 5. All built libraries should now reside within the "libs" directory.
+
+ 6. Continue to the next section of this document.
+
+
+
+## How to import the project into Eclipse and build the front-end:
+
+ 1. Install the Android ADT plugin for Eclipse if you haven't. (http://developer.android.com/sdk/installing/installing-adt.html)
+
+ 2. In Eclipse, do: File->Import->Existing Android Code Into Workspace.
+
+ 3. Browse to the location of the folder named "phoenix" in the RetroArch repository and select it as the root dir. (as of writing, it is /android/phoenix).
+
+ 4. You should see two projects have been found, "RetroArch" and "android-support-v7-appcompat". Import both of these.
+
+ 5. Let Eclipse finish building the workspace, or whatever.
+
+ 6. You should now be able to build it normally like any application.
+
+
+
+## Where do I place the built libretro cores?
+
+Simply place all built libretro cores within the directory [phoenix root]/assets/cores. Create this directory if it doesn't exist already.
+After placing your cores there, they should show up within the core selection screen of the front-end.
+
+## Where do I place overlays, shaders and core info files?
+
+Core info files go in [phoenix root]/assets/info, GLSL shaders go in [phoenix root]/assets/shaders_glsl and overlays go in [phoenix root]/assets/overlays. If the folders don't exist, create them first.
+
+## Notes
+
+1. If you’re running into an issue where adding an existing Android project results in “Invalid project description”, please select a workspace location that doesn’t contain the Android projects.
+2. If Eclipse still complains about missing appcompat, right-click on RetroArch->Properties->Android->Library->Add “android-support-v7-appcompat”, and then remove the old appcompat reference.
diff --git a/pkg/android/phoenix64/jni/Android.mk b/pkg/android/phoenix64/jni/Android.mk
new file mode 100644
index 0000000000..0f9477f449
--- /dev/null
+++ b/pkg/android/phoenix64/jni/Android.mk
@@ -0,0 +1,144 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+RARCH_DIR := ../../../..
+
+HAVE_NEON := 1
+HAVE_LOGGER := 0
+HAVE_VULKAN := 1
+HAVE_CHEEVOS := 1
+HAVE_MENU_WIDGETS := 1
+
+INCFLAGS :=
+DEFINES :=
+
+LIBRETRO_COMM_DIR := $(RARCH_DIR)/libretro-common
+DEPS_DIR := $(RARCH_DIR)/deps
+
+GIT_VERSION := $(shell git rev-parse --short HEAD 2>/dev/null)
+ifneq ($(GIT_VERSION),)
+ DEFINES += -DHAVE_GIT_VERSION -DGIT_VERSION=$(GIT_VERSION)
+endif
+
+include $(CLEAR_VARS)
+ifeq ($(TARGET_ARCH),arm)
+ DEFINES += -DANDROID_ARM -marm
+ LOCAL_ARM_MODE := arm
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+ DEFINES += -DANDROID_X86 -DHAVE_SSSE3
+endif
+
+ifeq ($(TARGET_ARCH),x86_64)
+ DEFINES += -DANDROID_X64
+endif
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+
+ifeq ($(HAVE_NEON),1)
+ DEFINES += -D__ARM_NEON__ -DHAVE_NEON
+ LOCAL_SRC_FILES += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float_neon.S.neon \
+ $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16_neon.S.neon \
+ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_neon.S.neon \
+ $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon
+endif
+DEFINES += -DANDROID_ARM_V7
+endif
+
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+ DEFINES += -DANDROID_AARCH64
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+ DEFINES += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+endif
+
+LOCAL_MODULE := retroarch-activity
+
+LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin.c \
+ $(RARCH_DIR)/griffin/griffin_cpp.cpp
+
+ifeq ($(HAVE_LOGGER), 1)
+ DEFINES += -DHAVE_LOGGER
+endif
+LOGGER_LDLIBS := -llog
+
+ifeq ($(GLES),3)
+ GLES_LIB := -lGLESv3
+ DEFINES += -DHAVE_OPENGLES3
+else
+ GLES_LIB := -lGLESv2
+ DEFINES += -DHAVE_OPENGLES2
+endif
+
+#DEFINES += -DHAVE_VIDEO_LAYOUT
+DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETPLAYDISCOVERY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL -DHAVE_EASTEREGG
+DEFINES += -DWANT_IFADDRS
+
+ifeq ($(HAVE_MENU_WIDGETS),1)
+DEFINES += -DHAVE_MENU_WIDGETS
+endif
+
+ifeq ($(HAVE_VULKAN),1)
+DEFINES += -DHAVE_VULKAN -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -D__STDC_LIMIT_MACROS
+endif
+DEFINES += -DHAVE_7ZIP
+
+ifeq ($(HAVE_CHEEVOS),1)
+DEFINES += -DHAVE_CHEEVOS -DRC_DISABLE_LUA
+endif
+
+DEFINES += -DHAVE_SL
+DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0
+
+LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES)
+LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES)
+
+# Let ndk-build set the optimization flags but remove -O3 like in cf3c3
+LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS))
+
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \
+ $(LOCAL_PATH)/$(RARCH_DIR)/deps \
+ $(LOCAL_PATH)/$(RARCH_DIR)/deps/stb \
+ $(LOCAL_PATH)/$(RARCH_DIR)/deps/7zip
+
+INCLUDE_DIRS := \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/stb/ \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/ \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include
+
+ifeq ($(HAVE_CHEEVOS),1)
+INCLUDE_DIRS += -I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include
+endif
+
+LOCAL_CFLAGS += $(INCLUDE_DIRS)
+LOCAL_CXXFLAGS += $(INCLUDE_DIRS)
+LOCAL_CPPFLAGS += $(INCLUDE_DIRS)
+
+ifeq ($(HAVE_VULKAN),1)
+INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
+
+LOCAL_C_INCLUDES += $(INCFLAGS)
+LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(DEPS_DIR)/glslang \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/glslang/glslang/glslang/Public \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/glslang/glslang/SPIRV \
+ -I$(LOCAL_PATH)/$(DEPS_DIR)/SPIRV-Cross
+
+LOCAL_CFLAGS += -Wno-sign-compare -Wno-unused-variable -Wno-parentheses
+LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin_glslang.cpp
+endif
+
+LOCAL_LDLIBS += -lOpenSLES -lz
+
+ifneq ($(SANITIZER),)
+ LOCAL_CFLAGS += -g -fsanitize=$(SANITIZER) -fno-omit-frame-pointer
+ LOCAL_CPPFLAGS += -g -fsanitize=$(SANITIZER) -fno-omit-frame-pointer
+ LOCAL_LDFLAGS += -fsanitize=$(SANITIZER)
+endif
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/pkg/android/phoenix64/jni/Application.mk b/pkg/android/phoenix64/jni/Application.mk
new file mode 100644
index 0000000000..5058071558
--- /dev/null
+++ b/pkg/android/phoenix64/jni/Application.mk
@@ -0,0 +1,42 @@
+ifeq ($(GLES),3)
+ ifndef NDK_GL_HEADER_VER
+ APP_PLATFORM := android-18
+ else
+ APP_PLATFORM := $(NDK_GL_HEADER_VER)
+ endif
+else
+ ifndef NDK_NO_GL_HEADER_VER
+ APP_PLATFORM := android-9
+ else
+ APP_PLATFORM := $(NDK_NO_GL_HEADER_VER)
+ endif
+endif
+
+ifndef TARGET_ABIS
+ APP_ABI := arm64-v8a
+else
+ APP_ABI := $(TARGET_ABIS)
+endif
+
+# Run $NDK/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/asan_device_setup once
+# for each AVD you use, replacing llvm-3.6 with the latest you have and
+# linux-x86_64 with your host ABI.
+ifneq ($(SANITIZER),)
+ # AddressSanitizer doesn't run on mips
+ ifndef TARGET_ABIS
+ APP_ABI := arm64-v8a
+ else
+ ifneq ($(findstring mips,$(TARGET_ABIS)),)
+ $(error "AddressSanitizer does not support mips.")
+ endif
+ endif
+ USE_CLANG := 1
+endif
+
+ifeq ($(USE_CLANG),1)
+ NDK_TOOLCHAIN_VERSION := clang
+ APP_CFLAGS := -Wno-invalid-source-encoding
+ APP_CPPFLAGS := -Wno-invalid-source-encoding
+endif
+
+APP_STL := c++_static
diff --git a/pkg/android/phoenix64/libs/googleplay/.classpath b/pkg/android/phoenix64/libs/googleplay/.classpath
new file mode 100644
index 0000000000..51769745b2
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/.classpath
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/.project b/pkg/android/phoenix64/libs/googleplay/.project
new file mode 100644
index 0000000000..06ae985eaa
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/.project
@@ -0,0 +1,33 @@
+
+
+ google-play-services_lib
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/AndroidManifest.xml b/pkg/android/phoenix64/libs/googleplay/AndroidManifest.xml
new file mode 100644
index 0000000000..99c96a3961
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/AndroidManifest.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/README.txt b/pkg/android/phoenix64/libs/googleplay/README.txt
new file mode 100644
index 0000000000..32f8d5eb85
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/README.txt
@@ -0,0 +1,17 @@
+Library Project including Google Play services client jar.
+
+This can be used by an Android project to use the API's provided
+by Google Play services.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works. The content is actually
+located in the libs/ directory.
+
+
+USAGE:
+
+Make sure you import this Android library project into your IDE
+and set this project as a dependency.
+
+Note that if you use proguard, you will want to include the
+options from proguard.txt in your configuration.
\ No newline at end of file
diff --git a/pkg/android/phoenix64/libs/googleplay/build.xml b/pkg/android/phoenix64/libs/googleplay/build.xml
new file mode 100644
index 0000000000..640264ba12
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/build.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/libs/google-play-services.jar b/pkg/android/phoenix64/libs/googleplay/libs/google-play-services.jar
new file mode 100644
index 0000000000..dff6f7c241
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/libs/google-play-services.jar differ
diff --git a/pkg/android/phoenix64/libs/googleplay/proguard.txt b/pkg/android/phoenix64/libs/googleplay/proguard.txt
new file mode 100644
index 0000000000..0c9693a2c0
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/proguard.txt
@@ -0,0 +1,20 @@
+-keep class * extends java.util.ListResourceBundle {
+ protected Object[][] getContents();
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+ public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+ @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
\ No newline at end of file
diff --git a/pkg/android/phoenix64/libs/googleplay/project.properties b/pkg/android/phoenix64/libs/googleplay/project.properties
new file mode 100644
index 0000000000..93c8c3c08d
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-21
+android.library=true
diff --git a/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_dark.xml b/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_dark.xml
new file mode 100644
index 0000000000..a615ba2747
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_dark.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_light.xml b/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_light.xml
new file mode 100644
index 0000000000..662066899b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/color/common_signin_btn_text_light.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
new file mode 100644
index 0000000000..0f9e7917e0
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..570e432252
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
new file mode 100644
index 0000000000..570e432252
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
new file mode 100644
index 0000000000..0f9e7917e0
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
new file mode 100644
index 0000000000..f507b9f7da
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
new file mode 100644
index 0000000000..d5625e5fc1
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
new file mode 100644
index 0000000000..aea3c0d168
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
new file mode 100644
index 0000000000..849e89f3aa
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
new file mode 100644
index 0000000000..f4ab2f2a51
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
new file mode 100644
index 0000000000..9fe611d684
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
new file mode 100644
index 0000000000..bbcde39cf0
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..53957b698f
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
new file mode 100644
index 0000000000..53957b698f
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
new file mode 100644
index 0000000000..bbcde39cf0
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
new file mode 100644
index 0000000000..000d12e8e3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
new file mode 100644
index 0000000000..d9279405c6
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
new file mode 100644
index 0000000000..67f263c80e
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
new file mode 100644
index 0000000000..96324c52f9
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
new file mode 100644
index 0000000000..e4503128f6
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
new file mode 100644
index 0000000000..fb94b77616
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png
new file mode 100644
index 0000000000..894f1b9f93
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png
new file mode 100644
index 0000000000..ac777614e6
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png
new file mode 100644
index 0000000000..f1c32d3b9e
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png
new file mode 100644
index 0000000000..08a4670c47
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
new file mode 100644
index 0000000000..dddcbebf12
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..58b75bd7de
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
new file mode 100644
index 0000000000..58b75bd7de
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
new file mode 100644
index 0000000000..dddcbebf12
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
new file mode 100644
index 0000000000..7d9ed7834d
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
new file mode 100644
index 0000000000..0ca401d376
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
new file mode 100644
index 0000000000..f2c3f55717
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
new file mode 100644
index 0000000000..83b4fc9d6d
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
new file mode 100644
index 0000000000..dd74fe8761
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
new file mode 100644
index 0000000000..b7dc7aac7e
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
new file mode 100644
index 0000000000..efdfe2e616
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..c7650b09e3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
new file mode 100644
index 0000000000..c7650b09e3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
new file mode 100644
index 0000000000..efdfe2e616
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
new file mode 100644
index 0000000000..8c76283e50
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
new file mode 100644
index 0000000000..abd26bcd41
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
new file mode 100644
index 0000000000..28181c338b
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
new file mode 100644
index 0000000000..34957fad5f
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
new file mode 100644
index 0000000000..e923ee9c75
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
new file mode 100644
index 0000000000..34cf6bbad5
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png
new file mode 100644
index 0000000000..d7e5777153
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png
new file mode 100644
index 0000000000..af301c2dc9
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png
new file mode 100644
index 0000000000..f43e965fb8
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png
new file mode 100644
index 0000000000..0b2b5c9a98
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
new file mode 100644
index 0000000000..9044a118af
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..e94a49b0ae
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
new file mode 100644
index 0000000000..e94a49b0ae
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
new file mode 100644
index 0000000000..9044a118af
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
new file mode 100644
index 0000000000..bfe4f04639
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
new file mode 100644
index 0000000000..876884fad7
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
new file mode 100644
index 0000000000..b3e6dd5b40
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
new file mode 100644
index 0000000000..5a888f28f5
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
new file mode 100644
index 0000000000..d0f7b4cbf3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
new file mode 100644
index 0000000000..0db6b06450
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
new file mode 100644
index 0000000000..d182b5e2c3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..47e2aeaf32
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
new file mode 100644
index 0000000000..47e2aeaf32
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
new file mode 100644
index 0000000000..d182b5e2c3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
new file mode 100644
index 0000000000..64e9706874
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
new file mode 100644
index 0000000000..0fd8cdda14
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
new file mode 100644
index 0000000000..3427b47681
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
new file mode 100644
index 0000000000..31e38c4c12
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
new file mode 100644
index 0000000000..e6a7880730
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
new file mode 100644
index 0000000000..972962dcfd
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png
new file mode 100644
index 0000000000..bb933092be
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png
new file mode 100644
index 0000000000..6174fcd9b1
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png
new file mode 100644
index 0000000000..6a4c298e2d
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png
new file mode 100644
index 0000000000..f68e9133bb
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
new file mode 100644
index 0000000000..9044a118af
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..e94a49b0ae
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
new file mode 100644
index 0000000000..e94a49b0ae
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
new file mode 100644
index 0000000000..9044a118af
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
new file mode 100644
index 0000000000..bfe4f04639
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
new file mode 100644
index 0000000000..876884fad7
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
new file mode 100644
index 0000000000..b3e6dd5b40
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
new file mode 100644
index 0000000000..5a888f28f5
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
new file mode 100644
index 0000000000..d0f7b4cbf3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
new file mode 100644
index 0000000000..0db6b06450
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
new file mode 100644
index 0000000000..d182b5e2c3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
new file mode 100644
index 0000000000..47e2aeaf32
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
new file mode 100644
index 0000000000..47e2aeaf32
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
new file mode 100644
index 0000000000..d182b5e2c3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
new file mode 100644
index 0000000000..64e9706874
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
new file mode 100644
index 0000000000..0fd8cdda14
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
new file mode 100644
index 0000000000..3427b47681
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
new file mode 100644
index 0000000000..31e38c4c12
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
new file mode 100644
index 0000000000..e6a7880730
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
new file mode 100644
index 0000000000..972962dcfd
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
new file mode 100644
index 0000000000..4f23739dc3
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png
new file mode 100644
index 0000000000..8ffa1d72e6
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
new file mode 100644
index 0000000000..4d81cf40cd
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
new file mode 100644
index 0000000000..fab5a79b45
Binary files /dev/null and b/pkg/android/phoenix64/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png differ
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml
new file mode 100644
index 0000000000..dd1cf679fe
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml
new file mode 100644
index 0000000000..abf412bda8
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml
new file mode 100644
index 0000000000..2d92217cdf
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_light.xml b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_light.xml
new file mode 100644
index 0000000000..810c02112d
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/drawable/common_signin_btn_text_light.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-af/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-af/strings.xml
new file mode 100644
index 0000000000..1b211f5076
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-af/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Kry Google Play-dienste"
+ "Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou foon is nie."
+ "Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou tablet is nie."
+ "Kry Google Play-dienste"
+ "Aktiveer Google Play-dienste"
+ "Hierdie program sal nie werk tensy jy Google Play-dienste aktiveer nie."
+ "Aktiveer Google Play-dienste"
+ "Dateer Google Play-dienste op"
+ "Hierdie program sal nie loop nie, tensy jy Google Play-dienste opdateer."
+ "Netwerkfout"
+ "\'n Dataverbinding is nodig om aan Google Play-dienste te koppel."
+ "Ongeldige rekening"
+ "Die gespesifiseerde rekening bestaan nie op hierdie toestel nie. Kies asseblief \'n ander rekening."
+ "Onbekende probleem met Google Play-dienste."
+ "Google Play-dienste"
+ "Google Play-dienste, waarop sommige van jou programme staatmaak, werk nie met jou toestel nie. Kontak asseblief die vervaardiger vir bystand."
+ "Dit lyk of die datum op die toestel verkeerd is. Gaan asseblief die datum op die toestel na."
+ "Dateer op"
+ "Meld aan"
+ "Meld aan met Google"
+
+ "\'n Program het probeer om \'n slegte weergawe van Google Play-dienste te gebruik."
+ "\'n Program vereis dat Google Play-dienste geaktiveer word."
+ "\'n Program vereis dat Google Play-dienste geïnstalleer word."
+ "\'n Program vereis \'n opdatering vir Google Play-dienste."
+ "Google Play-dienstefout"
+ "Versoek deur %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-am/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-am/strings.xml
new file mode 100644
index 0000000000..2585210fe0
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-am/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play አገልግሎቶችን አግኝ"
+ "ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ስልክዎ ላይ የሉም።"
+ "ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ጡባዊዎ ላይ የሉም።"
+ "Google Play አገልግሎቶችን አግኝ"
+ "Google Play አገልግሎቶችን አንቃ"
+ "Google Play አገልግሎቶችን እስካላነቁ ድረስ ይህ መተግበሪያ አይሰራም።"
+ "Google Play አገልግሎቶችን አንቃ"
+ "Google Play አገልግሎቶችን ያዘምኑ"
+ "Google Play አገልግሎቶችን እስኪያዘምኑ ድረስ ይህ መተግበሪያ አይሰራም።"
+ "የአውታረ መረብ ስህተት"
+ "ከGoogle Play አገልግሎቶች ጋር ለመገናኘት የውሂብ ግንኙነት ያስፈልጋል።"
+ "ልክ ያልሆነ መለያ"
+ "የተገለጸው መለያ በዚህ መሣሪያ ላይ የለም። እባክው የተለየ መለያ ይምረጡ።"
+ "በGoogle Play አገልግሎቶች ላይ ያልታወቀ ችግር።"
+ "Google Play አገልግሎቶች"
+ "የGoogle Play አገልግሎቶች፣ አንዳንድ መተግበሪያዎችዎ በእሱ ላይ ጥገኛ የሆኑት፣ በመሣሪያዎ አይደገፍም። እባክዎ ለእርዳታ አምራቹን ያግኙ።"
+ "በመሣሪያው ላይ ያለው ቀን ትክክል አይመስልም። እባክዎ በመሣሪያው ላይ ያለውን ቀን ያረጋግጡ።"
+ "ያዘምኑ"
+ "ግባ"
+ "በGoogle ይግቡ"
+
+ "መተግበሪያው የGoogle Play አገልግሎቶችን መጥፎ ስሪት ለመጠቀም ሞክሯል።"
+ "መተግበሪያው Google Play አገልግሎቶች እንዲነቁ ይፈልጋል።"
+ "መተግበሪያው Google Play አገልግሎቶች እንዲጫኑ ይፈልጋል።"
+ "መተግበሪያው Google Play አገልግሎቶች እንዲዘምን ይፈልጋል።"
+ "የGoogle Play አገልግሎቶች ስህተት"
+ "በ%1$s የተጠየቀ"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ar/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ar/strings.xml
new file mode 100644
index 0000000000..bbc10b71fa
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ar/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "الحصول على خدمات Google Play"
+ "لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في هاتفك."
+ "لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في جهازك اللوحي."
+ "الحصول على خدمات Google Play"
+ "تمكين خدمات Google Play"
+ "لن يعمل هذا التطبيق ما لم يتم تمكين خدمات Google Play."
+ "تمكين خدمات Google Play"
+ "تحديث خدمات Google Play"
+ "لن يتم تشغيل هذا التطبيق ما لم تحدِّث خدمات Google Play."
+ "خطأ في الشبكة"
+ "يتطلب الاتصال بخدمات Google Play وجود اتصال بيانات."
+ "حساب غير صالح"
+ "الحساب الذي تمّ تحديده غير موجود على الجهاز. يُرجى اختيار حساب آخر."
+ "حدثت مشكلة غير معروفة في خدمات Google Play."
+ "خدمات Google Play"
+ "خدمات Google Play التي تستجيب لها بعض تطبيقاتك لا تعمل على جهازك. يُرجى الاتصال بجهة التصنيع للحصول على المساعدة."
+ "يبدو أن التاريخ على الجهاز غير صحيح. الرجاء التحقق من التاريخ على الجهاز."
+ "تحديث"
+ "تسجيل الدخول"
+ "تسجيل الدخول باستخدام Google"
+
+ "يحاول أحد التطبيقات استخدام إصدار غير صالح من خدمات Google Play."
+ "يتطلب أحد التطبيقات تمكين خدمات Google Play."
+ "يتطلب أحد التطبيقات تثبيت خدمات Google Play."
+ "يتطلب أحد التطبيقات تحديث خدمات Google Play."
+ "خطأ في خدمات Google Play"
+ "تم الطلب عن طريق %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-be/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-be/strings.xml
new file mode 100644
index 0000000000..81382d1c0f
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-be/strings.xml
@@ -0,0 +1,36 @@
+
+
+ "Атрымаць службы Google Play"
+ "Гэта прыкладанне не будзе працаваць без службаў Google Play, якіх няма ў вашым тэлефоне."
+ "Гэта прыкладанне не будзе працаваць без службаў Google Play, якіх няма на вашым планшэце."
+ "Атрымаць службы Google Play"
+ "Уключыць службы Google Play"
+ "Гэта прыкладанне не будзе працаваць, пакуль вы не ўключыце службы Google Play."
+ "Уключыць службы Google Play"
+ "Абнаўленне службаў Google Play"
+ "Гэта прыкладанне не будзе працаваць падчас абнаўлення службаў Google Play."
+
+
+
+
+
+
+
+
+ "Невядомая праблема са службамі Google Play."
+ "Службы Google Play"
+ "Службы Google Play, да якiх прывязаны некаторыя прыкладаннi, не падтрымлiваюцца на вашай прыладзе. Па дапамогу звярнiцеся да вытворцы."
+
+
+ "Абнавіць"
+ "Увайсцi"
+ "Увайсці ў Google"
+
+ "Прыкладанне паспрабавала скарыстацца сапсаванай версіяй службаў Google Play."
+ "Прыкладанне патрабуе ўключэння службаў Google Play."
+ "Прыкладанне патрабуе ўсталявання службаў Google Play."
+ "Прыкладанне патрабуе абнаўлення службаў Google Play."
+ "Памылка службаў Google Play"
+ "Запытана прыкладаннем %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-bg/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-bg/strings.xml
new file mode 100644
index 0000000000..bb8da3c105
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-bg/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Изтегляне на услугите за Google Play"
+ "Това приложение няма да се изпълнява без услугите за Google Play, които липсват в телефона ви."
+ "Това приложение няма да се изпълнява без услугите за Google Play, които липсват в таблета ви."
+ "Услуги за Google Play: Изтегл."
+ "Активиране на услугите за Google Play"
+ "Това приложение няма да работи, освен ако не активирате услугите за Google Play."
+ "Услуги за Google Play: Актив."
+ "Актуализиране на услугите за Google Play"
+ "Това приложение няма да се изпълнява, освен ако не актуализирате услугите за Google Play."
+ "Грешка в мрежата"
+ "За свързване с услугите за Google Play се изисква връзка за данни."
+ "Невалиден профил"
+ "Посоченият профил не съществува на това устройство. Моля, изберете друг."
+ "Неизвестен проблем с услугите за Google Play."
+ "Услуги за Google Play"
+ "Услугите за Google Play, на които разчитат някои от приложенията ви, не се поддържат от устройството ви. Моля, свържете се с производителя за помощ."
+ "Изглежда, че датата на устройството е неправилна. Моля, проверете я."
+ "Актуализиране"
+ "Вход"
+ "Вход с Google"
+
+ "Приложение опита да ползва неправилна версия на услуг. за Google Play."
+ "Приложение изисква активирането на услугите за Google Play."
+ "Приложение изисква инсталирането на услугите за Google Play."
+ "Приложение изисква актуализирането на услугите за Google Play."
+ "Грешка в услугите за Google Play"
+ "Заявено от %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ca/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ca/strings.xml
new file mode 100644
index 0000000000..5b63e86af7
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ca/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Baixa els serveis de Google Play"
+ "Aquesta aplicació no s\'executarà si el telèfon no té instal·lats els serveis de Google Play."
+ "Aquesta aplicació no funcionarà si la tauleta no té instal·lats els serveis de Google Play."
+ "Baixa els serveis de Google Play"
+ "Activa els serveis de Google Play"
+ "Aquesta aplicació no funcionarà si no actives els serveis de Google Play."
+ "Activa els serveis de Google Play"
+ "Actualitza els serveis de Google Play"
+ "Aquesta aplicació no s\'executarà si no actualitzes els serveis de Google Play."
+ "Error de xarxa"
+ "Es requereix una connexió de dades per connectar amb els serveis de Google Play."
+ "Compte no vàlid"
+ "El compte especificat no existeix en aquest dispositiu. Tria un compte diferent."
+ "Error desconegut relacionat amb els serveis de Google Play."
+ "Serveis de Google Play"
+ "El teu dispositiu no és compatible amb els serveis de Google Play, en què es basen les teves aplicacions. Per obtenir assistència, contacta amb el fabricant."
+ "Sembla que la data del dispositiu no és correcta. Comprova-la."
+ "Actualitza"
+ "Inicia sessió"
+ "Inicia sessió amb Google"
+
+ "Una aplic. ha intentat utilitzar una versió errònia de serveis de Play."
+ "Una aplicació requereix que s\'activin els serveis de Google Play."
+ "Una aplicació requereix que s\'instal·lin els serveis de Google Play."
+ "Una aplicació requereix que s\'actualitzin els serveis de Google Play."
+ "Error dels serveis de Google Play"
+ "Sol·licitada per %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-cs/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-cs/strings.xml
new file mode 100644
index 0000000000..1b5423b039
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-cs/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Instalovat služby Google Play"
+ "Ke spuštění této aplikace jsou potřeba služby Google Play, které v telefonu nemáte."
+ "Ke spuštění této aplikace jsou potřeba služby Google Play, které v tabletu nemáte."
+ "Instalovat služby Google Play"
+ "Aktivovat služby Google Play"
+ "Ke spuštění této aplikace je třeba aktivovat služby Google Play."
+ "Aktivovat služby Google Play"
+ "Aktualizace služeb Google Play"
+ "Ke spuštění této aplikace je třeba aktualizovat služby Google Play."
+ "Chyba sítě"
+ "Připojení ke službám Google Play vyžaduje datové připojení."
+ "Neplatný účet"
+ "Zadaný účet v tomto zařízení neexistuje. Zvolte prosím jiný účet."
+ "Nastal neznámý problém se službami Google Play."
+ "Služby Google Play"
+ "Některé vaše aplikace vyžadují služby Google Play, které ve vašem zařízení nejsou podporovány. S žádostí o pomoc se prosím obraťte na výrobce."
+ "Datum v zařízení není správně nastaveno. Zkontrolujte prosím datum."
+ "Aktualizovat"
+ "Přihlásit se"
+ "Přihlásit se účtem Google"
+
+ "Aplikace se pokusila použít nesprávnou verzi Služeb Google Play."
+ "Aplikace vyžaduje aktivované Služby Google Play."
+ "Aplikace vyžaduje instalaci Služeb Google Play."
+ "Aplikace vyžaduje aktualizaci Služeb Google Play."
+ "Chyba služeb Google Play"
+ "Požadováno aplikací %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-da/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-da/strings.xml
new file mode 100644
index 0000000000..daa2160d3b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-da/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Hent Google Play-tjenester"
+ "Denne app kan ikke køre uden Google Play-tjenester, som mangler på din telefon."
+ "Denne app kan ikke køre uden Google Play-tjenester, som mangler på din tablet."
+ "Hent Google Play-tjenester"
+ "Aktivér Google Play-tjenester"
+ "Denne app virker ikke, medmindre du aktiverer Google Play-tjenester."
+ "Aktivér Google Play-tjenester"
+ "Opdater Google Play-tjenester"
+ "Denne app kan ikke køre, medmindre du opdaterer Google Play-tjenester."
+ "Netværksfejl"
+ "Der kræves en dataforbindelse for at oprette forbindelse til Google Play-tjenester."
+ "Ugyldig konto"
+ "Den angivne konto findes ikke på denne enhed. Vælg en anden konto."
+ "Ukendt problem med Google Play-tjenester."
+ "Google Play-tjenester"
+ "Google Play-tjenester, som nogle af dine applikationer er afhængige af, understøttes ikke af din enhed. Kontakt producenten for at få hjælp."
+ "Datoen på enheden ser ud til at være forkert. Husk at kontrollere datoen på enheden."
+ "Opdater"
+ "Log ind"
+ "Log ind med Google"
+
+ "En applikation forsøgte at bruge en defekt version af Google Play."
+ "En applikation kræver, at Google Play er aktiveret."
+ "En applikation kræver, at Google Play er installeret."
+ "En applikation kræver en opdatering af Google Play."
+ "Fejl i Google Play-tjenester"
+ "Anmodning fra %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-de/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-de/strings.xml
new file mode 100644
index 0000000000..ef6d779eff
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-de/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play-Dienste installieren"
+ "Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Telefon nicht installiert sind."
+ "Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Tablet nicht installiert sind."
+ "Google Play-Dienste installieren"
+ "Google Play-Dienste aktivieren"
+ "Diese App funktioniert nur, wenn Sie die Google Play-Dienste aktivieren."
+ "Google Play-Dienste aktivieren"
+ "Google Play-Dienste aktualisieren"
+ "Diese App wird nur ausgeführt, wenn Sie die Google Play-Dienste aktualisieren."
+ "Netzwerkfehler"
+ "Um eine Verbindung zu den Google Play-Diensten herzustellen, ist eine Datenverbindung erforderlich."
+ "Ungültiges Konto"
+ "Das angegebene Konto ist auf diesem Gerät nicht vorhanden. Bitte wählen Sie ein anderes Konto aus."
+ "Unbekanntes Problem mit Google Play-Diensten"
+ "Google Play-Dienste"
+ "Google Play-Dienste, auf denen einige Ihrer Apps basieren, werden von diesem Gerät nicht unterstützt. Wenden Sie sich für weitere Informationen an den Hersteller."
+ "Das Datum auf dem Gerät scheint falsch zu sein. Bitte überprüfen Sie das Datum auf dem Gerät."
+ "Aktualisieren"
+ "Anmelden"
+ "Über Google anmelden"
+
+ "Anwendung versuchte, defekte Google Play-Dienste-Version zu verwenden"
+ "Anwendung erfordert aktivierte Google Play-Dienste"
+ "Anwendung erfordert die Installation von Google Play-Diensten"
+ "Anwendung erfordert ein Update für Google Play-Dienste"
+ "Fehler bei Google Play-Diensten"
+ "Angefordert von %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-el/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-el/strings.xml
new file mode 100644
index 0000000000..13a5dc5ef3
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-el/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Λήψη υπηρεσιών Google Play"
+ "Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το τηλέφωνό σας."
+ "Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το tablet σας."
+ "Λήψη υπηρεσιών Google Play"
+ "Ενεργοποίηση υπηρεσιών Google Play"
+ "Αυτή η εφαρμογή δεν θα λειτουργήσει εάν δεν έχετε ενεργοποιήσει τις υπηρεσίες Google Play."
+ "Ενεργοπ. υπηρεσιών Google Play"
+ "Ενημέρωση υπηρεσιών Google Play"
+ "Αυτή η εφαρμογή θα εκτελεστεί αφού ενημερώσετε τις υπηρεσίες Google Play."
+ "Σφάλμα δικτύου"
+ "Απαιτείται σύνδεση δεδομένων για να συνδεθείτε με τις Υπηρεσίες Google Play."
+ "Μη έγκυρος λογαριασμός"
+ "Ο συγκεκριμένος λογαριασμός δεν υπάρχει σε αυτήν τη συσκευή. Επιλέξτε έναν διαφορετικό λογαριασμό."
+ "Άγνωστο πρόβλημα με τις υπηρεσίες Google Play."
+ "Υπηρεσίες Google Play"
+ "Οι υπηρεσίες Google Play, στις οποίες βασίζονται ορισμένες από τις εφαρμογές σας, δεν υποστηρίζονται στη συσκευή σας. Επικοινωνήστε με τον κατασκευαστή για υποστήριξη."
+ "Η ημερομηνία στη συσκευή φαίνεται λανθασμένη. Ελέγξτε την ημερομηνία στη συσκευή."
+ "Ενημέρωση"
+ "Σύνδεση"
+ "Συνδεθείτε στο Google"
+
+ "Απόπειρα χρήσης ακατάλληλης έκδοσης Υπηρεσιών Google Play από εφαρμογή"
+ "Μια εφαρμογή απαιτεί τις Υπηρεσίες Google Play για ενεργοποίηση."
+ "Μια εφαρμογή απαιτεί την εγκατάσταση των Υπηρεσιών Google Play."
+ "Μια εφαρμογή απαιτεί μια ενημέρωση για τις Υπηρεσίες Google Play."
+ "Σφάλμα υπηρεσιών Google Play"
+ "Υποβλήθηκε αίτημα από την εφαρμογή %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-en-rGB/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000000..106d390b3e
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-en-rGB/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Get Google Play services"
+ "This app won\'t run without Google Play services, which are missing from your phone."
+ "This app won\'t run without Google Play services, which are missing from your tablet."
+ "Get Google Play services"
+ "Enable Google Play services"
+ "This app won\'t work unless you enable Google Play services."
+ "Enable Google Play services"
+ "Update Google Play services"
+ "This app won\'t run unless you update Google Play services."
+ "Network Error"
+ "A data connection is required to connect to Google Play services."
+ "Invalid Account"
+ "The specified account does not exist on this device. Please choose a different account."
+ "Unknown issue with Google Play services."
+ "Google Play services"
+ "Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance."
+ "The date on the device appears to be incorrect. Please check the date on the device."
+ "Update"
+ "Sign in"
+ "Sign in with Google"
+
+ "An application attempted to use a bad version of Google Play Services."
+ "An application requires Google Play Services to be enabled."
+ "An application requires installation of Google Play Services."
+ "An application requires an update for Google Play Services."
+ "Google Play services error"
+ "Requested by %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-en-rIN/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000000..106d390b3e
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-en-rIN/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Get Google Play services"
+ "This app won\'t run without Google Play services, which are missing from your phone."
+ "This app won\'t run without Google Play services, which are missing from your tablet."
+ "Get Google Play services"
+ "Enable Google Play services"
+ "This app won\'t work unless you enable Google Play services."
+ "Enable Google Play services"
+ "Update Google Play services"
+ "This app won\'t run unless you update Google Play services."
+ "Network Error"
+ "A data connection is required to connect to Google Play services."
+ "Invalid Account"
+ "The specified account does not exist on this device. Please choose a different account."
+ "Unknown issue with Google Play services."
+ "Google Play services"
+ "Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance."
+ "The date on the device appears to be incorrect. Please check the date on the device."
+ "Update"
+ "Sign in"
+ "Sign in with Google"
+
+ "An application attempted to use a bad version of Google Play Services."
+ "An application requires Google Play Services to be enabled."
+ "An application requires installation of Google Play Services."
+ "An application requires an update for Google Play Services."
+ "Google Play services error"
+ "Requested by %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-es-rUS/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000000..6be905908c
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-es-rUS/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Obtener Google Play Services"
+ "Esta aplicación no se ejecutará si no instalasGoogle Play Services en tu dispositivo."
+ "Esta aplicación no se ejecutará si no instalas Google Play Services en tu tablet."
+ "Descargar Google Play Services"
+ "Activar Google Play Services"
+ "Esta aplicación no funcionará si no activas Google Play Services."
+ "Activar Google Play Services"
+ "Actualizar Google Play Services"
+ "Esta aplicación no se ejecutará si no actualizas Google Play Services."
+ "Error de red"
+ "Se necesita una conexión de datos para establecer conexión con Google Play Services."
+ "Cuenta no válida"
+ "La cuenta especificada no existe en este dispositivo. Elige otra cuenta."
+ "Error desconocido relacionado con Google Play Services"
+ "Google Play Services"
+ "Google Play Services, del cual dependen algunas de tus aplicaciones, no es compatible con tu dispositivo. Comunícate con el fabricante para obtener ayuda."
+ "Parece que la fecha del dispositivo es incorrecta. ¿Puedes revisarla?"
+ "Actualizar"
+ "Acceder"
+ "Acceder con Google"
+
+ "Una aplic. intentó usar una versión no válida de Google Play Services"
+ "Una aplicación requiere que se active Google Play Services"
+ "Una aplicación requiere que se instale Google Play Services"
+ "Una aplicación requiere que se actualice Google Play Services"
+ "Error de Google Play Services"
+ "Solicitada por %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-es/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-es/strings.xml
new file mode 100644
index 0000000000..ed32995cf2
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-es/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Descargar servicios de Google Play"
+ "Esta aplicación no se ejecutará si tu teléfono no tiene instalados los servicios de Google Play."
+ "Esta aplicación no se ejecutará si tu tablet no tiene instalados los servicios de Google Play."
+ "Descargar servicios de Google Play"
+ "Habilitar servicios de Google Play"
+ "Esta aplicación no funcionará si no habilitas los servicios de Google Play."
+ "Habilitar servicios de Google Play"
+ "Actualizar servicios de Google Play"
+ "Esta aplicación no se ejecutará si no actualizas los servicios de Google Play."
+ "Error de red"
+ "Se necesita una conexión de datos para establecer conexión con los servicios de Google Play."
+ "Cuenta no válida"
+ "La cuenta especificada no existe en este dispositivo. Selecciona otra cuenta."
+ "Error desconocido relacionado con los servicios de Google Play"
+ "Servicios de Google Play"
+ "Tu dispositivo no es compatible con los servicios de Google Play, de los cuales dependen tus aplicaciones. Para obtener asistencia, ponte en contacto el fabricante."
+ "Parece que la fecha del dispositivo es incorrecta. Compruébala."
+ "Actualizar"
+ "Iniciar sesión"
+ "Iniciar sesión con Google"
+
+ "Una aplicación intentó usar versión incorrecta de servicios de Google Play."
+ "Una aplicación requiere que se habiliten los servicios de Play."
+ "Una aplicación requiere que se instalen los servicios de Google Play."
+ "Una aplicación requiere que se actualicen los servicios de Google Play."
+ "Error de los servicios de Google Play"
+ "Solicitada por %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-et-rEE/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000000..281caff497
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-et-rEE/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Hankige Google Play teenused"
+ "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie telefonis pole."
+ "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie tahvelarvutis pole."
+ "Hankige Google Play teenused"
+ "Lubage Google Play teenused"
+ "See rakendus ei tööta, kui te ei luba Google Play teenuseid."
+ "Lubage Google Play teenused"
+ "Värskendage Google Play teenuseid"
+ "Seda rakendust ei saa käitada, kui te ei värskenda Google Play teenuseid."
+ "Võrgu viga"
+ "Google Play teenustega ühenduse loomiseks on vajalik andmesideühendus."
+ "Vale konto"
+ "Määratud kontot pole selles seadmes olemas. Valige muu konto."
+ "Google Play teenuste tundmatu probleem."
+ "Google Play teenused"
+ "Teie seade ei toeta Google Play teenuseid, millele mõni teie rakendustest toetub. Abi saamiseks võtke ühendust tootjaga."
+ "Seadme kuupäev paistab olevat vale. Kontrollige seadme kuupäeva."
+ "Värskenda"
+ "Logi sisse"
+ "Logi sisse Google\'iga"
+
+ "Rakendus püüdis kasutada Google Play teenuste sobimatut versiooni."
+ "Rakenduse kasutamiseks peavad olema lubatud Google Play teenused."
+ "Rakenduse kasutamiseks peavad olema installitud Google Play teenused."
+ "Rakenduse kasutamiseks tuleb värskendada Google Play teenuseid."
+ "Viga Google Play teenustes"
+ "Päringu esitas: %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-et/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-et/strings.xml
new file mode 100644
index 0000000000..281caff497
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-et/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Hankige Google Play teenused"
+ "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie telefonis pole."
+ "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie tahvelarvutis pole."
+ "Hankige Google Play teenused"
+ "Lubage Google Play teenused"
+ "See rakendus ei tööta, kui te ei luba Google Play teenuseid."
+ "Lubage Google Play teenused"
+ "Värskendage Google Play teenuseid"
+ "Seda rakendust ei saa käitada, kui te ei värskenda Google Play teenuseid."
+ "Võrgu viga"
+ "Google Play teenustega ühenduse loomiseks on vajalik andmesideühendus."
+ "Vale konto"
+ "Määratud kontot pole selles seadmes olemas. Valige muu konto."
+ "Google Play teenuste tundmatu probleem."
+ "Google Play teenused"
+ "Teie seade ei toeta Google Play teenuseid, millele mõni teie rakendustest toetub. Abi saamiseks võtke ühendust tootjaga."
+ "Seadme kuupäev paistab olevat vale. Kontrollige seadme kuupäeva."
+ "Värskenda"
+ "Logi sisse"
+ "Logi sisse Google\'iga"
+
+ "Rakendus püüdis kasutada Google Play teenuste sobimatut versiooni."
+ "Rakenduse kasutamiseks peavad olema lubatud Google Play teenused."
+ "Rakenduse kasutamiseks peavad olema installitud Google Play teenused."
+ "Rakenduse kasutamiseks tuleb värskendada Google Play teenuseid."
+ "Viga Google Play teenustes"
+ "Päringu esitas: %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-fa/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-fa/strings.xml
new file mode 100644
index 0000000000..4546e5747e
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-fa/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "دریافت خدمات Google Play"
+ "این برنامه بدون خدمات Google Play اجرا نمیشود، این خدمات در تلفن شما وجود ندارد."
+ "این برنامه بدون خدمات Google Play اجرا نمیشود، این خدمات در رایانهٔ لوحی شما وجود ندارد."
+ "دریافت خدمات Google Play"
+ "فعال کردن خدمات Google Play"
+ "تا زمانیکه خدمات Google Play را فعال نکنید این برنامه کار نمیکند."
+ "فعال کردن خدمات Google Play"
+ "بهروزرسانی خدمات Google Play"
+ "تا زمانیکه خدمات Google Play را بهروز نکنید این برنامه کار نمیکند."
+ "خطای شبکه"
+ "برای اتصال به خدمات Google Play اتصال داده لازم است."
+ "حساب نامعتبر"
+ "حسابی که تعیین کردید در این دستگاه وجود ندارد. لطفاً حساب دیگری را انتخاب کنید."
+ "مشکل نامشخص در خدمات Google Play."
+ "خدمات Google Play"
+ "خدمات Google Play، که برخی از برنامههای شما به آن وابسته است، توسط دستگاه شما پشتیبانی نمیشود. لطفاً برای دریافت کمک با سازنده تماس بگیرید."
+ "تاریخ روی دستگاه ظاهراً اشتباه است. لطفاً تاریخ روی دستگاه را بررسی کنید."
+ "بهروزرسانی"
+ "ورود به سیستم"
+ "ورود به سیستم با Google"
+
+ "برنامهای تلاش کرد از نسخه نادرستی از خدمات Google Play استفاده کند."
+ "برنامهای به فعال کردن خدمات Google Play نیاز دارد."
+ "برنامهای به نصب خدمات Google Play نیاز دارد."
+ "برنامهای به بهروزرسانی خدمات Google Play نیاز دارد."
+ "خطا در خدمات Google Play"
+ "درخواست توسط %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-fi/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-fi/strings.xml
new file mode 100644
index 0000000000..00d3ceb215
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-fi/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Asenna Google Play -palvelut"
+ "Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat puhelimesta."
+ "Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat tablet-laitteesta."
+ "Asenna Google Play -palvelut"
+ "Ota Google Play -palvelut käyttöön"
+ "Tämä sovellus ei toimi, ellet ota Google Play -palveluita käyttöön."
+ "Ota Google Play -palv. käyttöön"
+ "Päivitä Google Play -palvelut"
+ "Tämä sovellus ei toimi, ellet päivitä Google Play -palveluita."
+ "Verkkovirhe"
+ "Google Play -palveluiden käyttöön tarvitaan tietoliikenneyhteys."
+ "Tili ei kelpaa"
+ "Kyseistä tiliä ei ole tällä laitteella. Valitse toinen tili."
+ "Tuntematon ongelma käytettäessä Google Play -palveluita."
+ "Google Play -palvelut"
+ "Google Play -palveluita, joita osa sovelluksistasi käyttää, ei tueta laitteellasi. Pyydä ohjeita laitteen valmistajalta."
+ "Laitteen päivämäärä vaikuttaa virheelliseltä. Tarkista laitteen päivämäärä."
+ "Päivitä"
+ "Kirjaudu"
+ "Kirjaudu Google-tiliin"
+
+ "Sovellus yritti käyttää virheellistä Google Play -palveluiden versiota"
+ "Ota käyttöön Google Play -palvelut, jotta sovellus toimii."
+ "Asenna Google Play -palvelut, jotta sovellus toimii."
+ "Päivitä Google Play -palvelut, jotta sovellus toimii."
+ "Virhe Google Play -palveluissa"
+ "Pyynnön teki %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-fr-rCA/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000..e915fe4067
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-fr-rCA/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Installer les services Google Play"
+ "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone."
+ "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette."
+ "Installer les services Google Play"
+ "Activer les services Google Play"
+ "Cette application ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play."
+ "Activer les services Google Play"
+ "Mettre à jour les services Google Play"
+ "Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play."
+ "Erreur réseau"
+ "Vous devez disposer d\'une connexion de données pour utiliser les services Google Play."
+ "Compte erroné"
+ "Le compte indiqué n\'existe pas sur cet appareil. Veuillez sélectionner un autre compte."
+ "Problème inconnu avec les services Google Play."
+ "Services Google Play"
+ "Les services Google Play, dont dépendent certaines de vos applications, ne sont pas compatibles avec votre appareil. Veuillez contacter le fabricant pour obtenir de l\'aide."
+ "La date sur l\'appareil semble incorrecte. Veuillez la vérifier."
+ "Mettre à jour"
+ "Connexion"
+ "Se connecter via Google"
+
+ "Une application requiert une version valide des services Google Play"
+ "Une application requiert l\'activation des services Google Play"
+ "Une application requiert l\'installation des services Google Play"
+ "Une application requiert la mise à jour des services Google Play"
+ "Erreur liée aux services Google Play"
+ "Demandée par %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-fr/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-fr/strings.xml
new file mode 100644
index 0000000000..321b28370b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-fr/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Installer les services Google Play"
+ "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone."
+ "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette."
+ "Installer services Google Play"
+ "Activer les services Google Play"
+ "Cette application ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play."
+ "Activer services Google Play"
+ "Mettre à jour les services Google Play"
+ "Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play."
+ "Erreur réseau"
+ "Vous devez disposer d\'une connexion de données pour utiliser les services Google Play."
+ "Compte erroné"
+ "Le compte indiqué n\'existe pas sur cet appareil. Veuillez sélectionner un autre compte."
+ "Problème inconnu avec les services Google Play."
+ "Services Google Play"
+ "Les services Google Play, dont dépendent certaines de vos applications, ne sont pas compatibles avec votre appareil. Veuillez contacter le fabricant pour obtenir de l\'aide."
+ "La date sur l\'appareil semble incorrecte. Veuillez la vérifier."
+ "Mettre à jour"
+ "Connexion"
+ "Se connecter avec Google"
+
+ "Une application requiert une version valide des services Google Play"
+ "Une application requiert l\'activation des services Google Play"
+ "Une application requiert l\'installation des services Google Play"
+ "Une application requiert la mise à jour des services Google Play"
+ "Erreur liée aux services Google Play"
+ "Demandée par %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-hi/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-hi/strings.xml
new file mode 100644
index 0000000000..e1b3b95707
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-hi/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play सेवाएं पाएं"
+ "यह एप्स Google Play सेवाओं के बिना नहीं चलेगा, जो आपके फ़ोन में नहीं हैं."
+ "यह एप्स Google Play सेवाओं के बिना नहीं चलेगा, जो आपके टेबलेट में नहीं हैं."
+ "Google Play सेवाएं पाएं"
+ "Google Play सेवाएं सक्षम करें"
+ "जब तक आप Google Play सेवाएं सक्षम नहीं करते, तब तक यह एप्स कार्य नहीं करेगा."
+ "Google Play सेवाएं सक्षम करें"
+ "Google Play सेवाएं से नई जानकारी"
+ "जब तक आप Google Play सेवाओं से नई जानकारी नहीं लेते हैं, तब तक यह एप्स नहीं चलेगा."
+ "नेटवर्क त्रुटि"
+ "Google Play सेवाओं से कनेक्ट करने के लिए डेटा कनेक्शन की आवश्यकता है."
+ "अमान्य खाता"
+ "निर्दिष्ट खाता इस उपकरण पर मौजूद नहीं है. कृपया कोई भिन्न खाता चुनें."
+ "Google Play सेवाओं के साथ अज्ञात समस्या."
+ "Google Play सेवाएं"
+ "Google Play सेवाएं, जिन पर आपके कुछ एप्स निर्भर करते हैं, आपके उपकरण द्वारा समर्थित नहीं हैं. कृपया सहायता के लिए निर्माता से संपर्क करें."
+ "उपकरण का दिनांक गलत प्रतीत हो रहा है. कृपया उपकरण का दिनांक जांचें."
+ "नई जानकारी पाएं"
+ "प्रवेश करें"
+ "Google से प्रवेश करें"
+
+ "एप्लि. ने Google Play सेवाओं के खराब संस्करण के उपयोग का प्रयास किया."
+ "एप्स के लिए Google Play सेवाओं को सक्षम किए जाने की आवश्यकता है."
+ "एप्स के लिए Google Play सेवाओं के इंस्टॉलेशन की आवश्यकता है."
+ "एप्स के लिए Google Play सेवाओं में Google Play से नई जानकारी की आवश्यकता है."
+ "Google Play सेवाएं त्रुटि"
+ "%1$s द्वारा अनुरोधित"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-hr/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-hr/strings.xml
new file mode 100644
index 0000000000..b7d462d882
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-hr/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Preuzmi usluge za Google Play"
+ "Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem telefonu."
+ "Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem tabletnom računalu."
+ "Preuzmi usluge za Google Play"
+ "Omogući usluge za Google Play"
+ "Ova aplikacija neće raditi ako ne omogućite usluge za Google Play."
+ "Omogući usluge za Google Play"
+ "Ažuriraj usluge za Google Play"
+ "Ova se aplikacija neće pokrenuti ako ne ažurirate usluge za Google Play."
+ "Mrežna pogreška"
+ "Potrebna je podatkovna veza za povezivanje s uslugama Google Play."
+ "Nevažeći račun"
+ "Navedeni račun ne postoji na ovom uređaju. Odaberite neki drugi račun."
+ "Nepoznata poteškoća s uslugama za Google Play."
+ "Usluge za Google Play"
+ "Usluge za Google Play, koje su potrebne za funkcioniranje nekih vaših aplikacija, nisu podržane na vašem uređaju. Pomoć potražite od proizvođača."
+ "Čini se da datum na uređaju nije točan. Provjerite datum na uređaju."
+ "Ažuriranje"
+ "Prijava"
+ "Prijava uslugom Google"
+
+ "Aplikacija je pokušala upotrijebiti lošu verziju Usluga za Google Play."
+ "Aplikacija zahtijeva omogućavanje Usluga za Google Play."
+ "Aplikacija zahtijeva instaliranje Usluga za Google Play."
+ "Aplikacija zahtijeva ažuriranje Usluga za Google Play."
+ "Pogreška usluga za Google Play"
+ "Zahtijeva aplikacija %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-hu/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-hu/strings.xml
new file mode 100644
index 0000000000..cd15ad328f
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-hu/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Play Szolgáltatások telepítése"
+ "Az alkalmazás működéséhez a Google Play Szolgáltatások szükségesek, ezek nincsenek telepítve a telefonon."
+ "Az alkalmazás működéséhez a Google Play Szolgáltatások szükségesek, ezek nincsenek telepítve a táblagépen."
+ "Play Szolgáltatások telepítése"
+ "Google Play Szolgáltatások aktiválása"
+ "Az alkalmazás csak akkor fog működni, ha engedélyezi a Google Play Szolgáltatásokat."
+ "Play Szolgáltatások aktiválása"
+ "Play Szolgáltatások frissítése"
+ "Az alkalmazás csak akkor fog működni, ha frissíti a Google Play Szolgáltatásokat."
+ "Hálózati hiba"
+ "A Google Play Szolgáltatásokhoz történő kapcsolódáshoz adatkapcsolat szükséges."
+ "Érvénytelen fiók"
+ "A megadott fiók nem létezik ezen az eszközön. Kérjük, válasszon másik fiókot."
+ "Ismeretlen hiba a Google Play Szolgáltatásokban."
+ "Google Play Szolgáltatások"
+ "A Google Play Szolgáltatásokat, amelyre egyes alkalmazások támaszkodnak, nem támogatja az eszköz. Segítségért forduljon az eszköz gyártójához."
+ "Az eszközön beállított dátum helytelen. Kérjük, ellenőrizze azt."
+ "Frissítés"
+ "Belépés"
+ "Google-bejelentkezés"
+
+ "Egy alkalmazás a Play Szolgáltatások rossz verzióját akarta használni."
+ "Egy alkalmazás kéri a Google Play Szolgáltatások engedélyezését."
+ "Egy alkalmazás kéri a Google Play Szolgáltatások telepítését."
+ "Egy alkalmazás kéri a Google Play Szolgáltatások frissítését."
+ "Google Play szolgáltatási hiba"
+ "Igénylő: %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-hy-rAM/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000000..d89be9bf64
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-hy-rAM/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Տեղադրեք Google Play ծառայությունները"
+ "Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր հեռախոսում:"
+ "Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր գրասալիկում:"
+ "Տեղադրել Google Play ծառայությունները"
+ "Միացնել Google Play ծառայությունները"
+ "Այս ծրագիրը չի աշխատի, եթե դուք չմիացնեք Google Play ծառայությունները:"
+ "Միացնել Google Play ծառայությունները"
+ "Նորացրեք Google Play ծառայությունները"
+ "Այս ծրագիրը չի գործարկվի, եթե դուք չնորացնեք Google Play ծառայությունները:"
+ "Ցանցի սխալ կա"
+ "Պահանջվում է տվյալների կապ` Google Play ծառայություններին միանալու համար:"
+ "Հաշիվն անվավեր է"
+ "Նշված հաշիվը գոյություն չունի այս սարքում: Ընտրեք այլ հաշիվ:"
+ "Անհայտ խնդիր՝ Google Play ծառայություններում:"
+ "Google Play ծառայություններ"
+ "Google Play ծառայությունները, որոնց ապավինում են ձեր ծրագրերից որոշները, չեն աջակցվում ձեր սարքի կողմից: Խնդրում ենք կապվել արտադրողի հետ օգնության համար:"
+ "Սարքի ամսաթիվը կարծես սխալ է: Ստուգեք սարքի ամսաթիվը:"
+ "Նորացնել"
+ "Մուտք գործել"
+ "Մուտք գործեք Google-ով"
+
+ "Հավելվածը փորձել է կիրառել Google Play ծառայությունների վատ տարբերակը:"
+ "Հավելվածը պահանջում է միացնել Google Play ծառայությունները:"
+ "Հավելվածը պահանջում է տեղադրել Google Play ծառայությունները:"
+ "Հավելվածը պահանջում է թարմացնել Google Play ծառայությունները:"
+ "Google Play ծառայությունների սխալ"
+ "%1$s-ի հարցմամբ"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-in/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-in/strings.xml
new file mode 100644
index 0000000000..526b84a816
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-in/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Dapatkan layanan Google Play"
+ "Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di ponsel Anda."
+ "Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di tablet Anda."
+ "Dapatkan layanan Google Play"
+ "Aktifkan layanan Google Play"
+ "Aplikasi ini tidak akan bekerja sampai Anda mengaktifkan layanan Google Play."
+ "Aktifkan layanan Google Play"
+ "Perbarui layanan Google Play"
+ "Aplikasi ini tidak akan berjalan sampai Anda memperbarui layanan Google Play."
+ "Kesalahan Jaringan"
+ "Sambungan data diperlukan untuk tersambung ke layanan Google Play."
+ "Akun Tidak Valid"
+ "Akun yang ditentukan tidak ada di perangkat ini. Pilih akun lain."
+ "Masalah tidak diketahui pada layanan Google Play."
+ "Layanan Google Play"
+ "Layanan Google Play, yang diandalkan oleh beberapa aplikasi Anda, tidak didukung oleh perangkat Anda. Hubungi pabrikan untuk mendapatkan bantuan."
+ "Tampaknya tanggal di perangkat salah. Periksa tanggal di perangkat."
+ "Perbarui"
+ "Masuk"
+ "Masuk dengan Google"
+
+ "Aplikasi mencoba menggunakan versi Layanan Google Play yang rusak."
+ "Aplikasi membutuhkan Layanan Google Play untuk dapat diaktifkan."
+ "Aplikasi membutuhkan pemasangan Layanan Google Play."
+ "Aplikasi membutuhkan pembaruan untuk Layanan Google Play."
+ "Kesalahan layanan Google Play"
+ "Diminta oleh %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-it/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-it/strings.xml
new file mode 100644
index 0000000000..f3c9f1fa5c
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-it/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Installa Google Play Services"
+ "L\'app non funzionerà senza Google Play Services, non presente sul tuo telefono."
+ "L\'app non funzionerà senza Google Play Services, non presente sul tuo tablet."
+ "Installa Google Play Services"
+ "Attiva Google Play Services"
+ "L\'app non funzionerà se non attivi Google Play Services."
+ "Attiva Google Play Services"
+ "Aggiorna Google Play Services"
+ "L\'app non funzionerà se non aggiorni Google Play Services."
+ "Errore di rete"
+ "È necessaria una connessione dati per connettersi a Google Play Services."
+ "Account non valido"
+ "L\'account specificato non esiste su questo dispositivo. Scegli un altro account."
+ "Problema sconosciuto con Google Play Services."
+ "Google Play Services"
+ "La piattaforma Google Play Services, su cui sono basate alcune delle tue applicazioni, non è supportata dal dispositivo in uso. Per assistenza, contatta il produttore."
+ "La data sul dispositivo sembra sbagliata. Controllala."
+ "Aggiorna"
+ "Accedi"
+ "Accedi con Google"
+
+ "Un\'app ha tentato di usare una versione non valida di Play Services."
+ "Un\'applicazione richiede l\'attivazione di Google Play Services."
+ "Un\'applicazione richiede l\'installazione di Google Play Services."
+ "Un\'applicazione richiede un aggiornamento di Google Play Services."
+ "Errore Google Play Services"
+ "Richiesta da %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-iw/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-iw/strings.xml
new file mode 100644
index 0000000000..76869a9f38
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-iw/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "קבל את שירותי Google Play"
+ "אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטלפון שלך."
+ "אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטאבלט שלך."
+ "קבל את שירותי Google Play"
+ "הפעלת שירותי Google Play"
+ "אפליקציה זו לא תעבוד אם לא תפעיל את שירותי Google Play."
+ "הפעל את שירותי Google Play"
+ "עדכון שירותי Google Play"
+ "אפליקציה זו לא תפעל אם לא תעדכן את שירותי Google Play."
+ "שגיאת רשת."
+ "דרוש חיבור נתונים כדי להתחבר לשירותי Google Play."
+ "חשבון לא חוקי"
+ "החשבון שצוין לא קיים במכשיר זה. בחר חשבון אחר."
+ "בעיה לא ידועה בשירותי Google Play."
+ "שירותי Google Play"
+ "שירותי Google Play, שחלק מהאפליקציות שלך מתבססות עליהם, אינם נתמכים על ידי המכשיר שברשותך. צור קשר עם היצרן לקבלת סיוע."
+ "נראה שהתאריך במכשיר שגוי. בדוק את התאריך במכשיר."
+ "עדכן"
+ "היכנס"
+ "היכנס באמצעות Google"
+
+ "יש אפליקציה שניסתה להשתמש בגרסה שגויה של שירותי Google Play."
+ "יש אפליקציה המחייבת הפעלה של שירותי Google Play."
+ "יש אפליקציה המחייבת התקנה של שירותי Google Play."
+ "יש אפליקציה המחייבת עדכון של שירותי Google Play."
+ "שגיאה בשירותי Google Play"
+ "התבקשה על ידי %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ja/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ja/strings.xml
new file mode 100644
index 0000000000..0d8b606230
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ja/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Play開発者サービスの入手"
+ "このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いの携帯端末にはインストールされていません。"
+ "このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いのタブレットにはインストールされていません。"
+ "Play開発者サービスの入手"
+ "Play開発者サービスの有効化"
+ "このアプリの実行には、Google Play開発者サービスの有効化が必要です。"
+ "Play開発者サービスの有効化"
+ "Play開発者サービスの更新"
+ "このアプリの実行には、Google Play開発者サービスの更新が必要です。"
+ "ネットワークエラー"
+ "Google Play開発者サービスに接続するには、データ接続が必要です。"
+ "無効なアカウント"
+ "指定したアカウントはこの端末上に存在しません。別のアカウントを選択してください。"
+ "Google Play開発者サービスで原因不明の問題が発生しました。"
+ "Google Play開発者サービス"
+ "一部のアプリが使用しているGoogle Play開発者サービスは、お使いの端末ではサポートされていません。詳しくは、端末メーカーまでお問い合わせください。"
+ "端末上の日付が正しくないようです。端末上の日付をご確認ください。"
+ "更新"
+ "ログイン"
+ "Googleでログイン"
+
+ "アプリはGoogle Play開発者サービスの不適切なバージョンを使用しようとしました。"
+ "アプリではGoogle Play開発者サービスを有効にする必要があります。"
+ "アプリではGoogle Play開発者サービスをインストールする必要があります。"
+ "アプリではGoogle Play開発者サービスをアップデートする必要があります。"
+ "Google Play開発者サービスのエラー"
+ "%1$sによるリクエスト"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ka-rGE/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000000..8a2c74aa98
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ka-rGE/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play სერვისების მიღება"
+ "ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება."
+ "ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება."
+ "Google Play სერვისების მიღება"
+ "Google Play სერვისების გააქტიურება"
+ "ეს აპი არ იმუშავებს, თუ არ გაააქტიურებთ Google Play სერვისებს."
+ "Google Play სერვისების გააქტიურება"
+ "Google Play სერვისების განახლება"
+ "ეს აპი ვერ გაეშვება, თუ Google Play სერვისებს არ განაახლებთ."
+ "ქსელის შეცდომა"
+ "Google Play Services-თან დასაკავშირებლად მონაცემთა გადაცემა აუცილებელია."
+ "ანგარიში არასწორია"
+ "მითითებული ანგარიში ამ მოწყობილობაზე არ არსებობს. გთხოვთ, აირჩიოთ სხვა ანგარიში."
+ "Google Play სერვისებთან დაკავშირებით უცნობი შეფერხება წარმოიშვა."
+ "Google Play სერვისები"
+ "Google Play სერვისები, რაც თქვენს ზოგიერთ აპს ჭირდება, თქვენს მოწყობილობაზე მხარდაჭერილი არ არის. გთხოვთ, დაუკავშირდეთ მწარმოებელს დახმარებისათვის."
+ "როგორც ჩანს, მოწყობილობის თარიღი არასწორია. გთხოვთ, შეამოწმოთ მოწყობილობის თარიღი."
+ "განახლება"
+ "შესვლა"
+ "Google-ით შესვლა"
+
+ "აპლიკაცია შეეცადა გამოეყენებინა Google Play სერვისების არასწორი ვერსია."
+ "აპლიკაცია საჭიროებს გააქტიურებულ Google Play Services."
+ "აპლიკაცია საჭიროებს Google Play Services-ის ინსტალაციას."
+ "აპლიკაცია საჭიროებს Google Play Services-ის განახლებას."
+ "Google Play სერვისების შეცდომა"
+ "მომთხოვნი: %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-km-rKH/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000000..afebf30875
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-km-rKH/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "ទទួលសេវាកម្មកម្សាន្ត Google"
+ "កម្មវិធីនេះនឹងមិនដំណើរការទេបើគ្មានសេវាកម្មកម្សាន្ត Google ដែលទូរស័ព្ទរបស់អ្នកមិនមាន។"
+ "កម្មវិធីនេះនឹងមិនដំណើរការទេបើគ្មានសេវាកម្មកម្សាន្ត Google ដែលកុំព្យូទ័របន្ទះរបស់អ្នកមិនមាន។"
+ "ទទួលសេវាកម្មកម្សាន្ត Google"
+ "បើកសេវាកម្មកម្សាន្ត Google"
+ "កម្មវិធីនេះនឹងមិនដំណើរការទេ លុះត្រាតែអ្នកបើកសេវាកម្មកម្សាន្ត Google ។"
+ "បើកសេវាកម្មកម្សាន្ត Google"
+ "ធ្វើបច្ចុប្បន្នភាពសេវាកម្មកម្សាន្ត Google"
+ "កម្មវិធីនេះនឹងមិនដំណើរការទេ លុះត្រាតែអ្នកធ្វើបច្ចុប្បន្នភាពសេវាកម្មកម្សាន្ត Google ។"
+ "កំហុសបណ្ដាញ"
+ "បានទាមទារការតភ្ជាប់ទិន្នន័យ ដើម្បីភ្ជាប់សេវាកម្មឃ្លាំងកម្មវិធី។"
+ "គណនីមិនត្រឹមត្រូវ"
+ "គណនីដែលបានបញ្ជាក់មិនមាននៅលើឧបករណ៍នេះទេ។ សូមជ្រើសគណនីផ្សេង។"
+ "មិនស្គាល់បញ្ហាជាមួយសេវាកម្មកម្សាន្ត Google ។"
+ "សេវាកម្មកម្សាន្ត Google"
+ "សេវាកម្មកម្សាន្ត Google អាស្រ័យលើកម្មវិធីរបស់អ្នក មិនត្រូវបានគាំទ្រដោយឧបករណ៍របស់អ្នក។ សូមទាក់ទងក្រុមហ៊ុនផលិតសម្រាប់ជំនួយ។"
+ "កាលបរិច្ឆេទលើឧបករណ៍បង្ហាញថាមិនត្រឹមត្រូវ។ សូមពិនិត្យកាលបរិច្ឆេទលើឧបករណ៍។"
+ "ធ្វើបច្ចុប្បន្នភាព"
+ "ចូល"
+ "ចូលដោយប្រើ Google"
+
+ "កម្មវិធីព្យាយាមប្រើកំណែមិនល្អរបស់សេវាកម្មឃ្លាំកម្មវិធី។"
+ "កម្មវិធីទាមទារបើកសេវាកម្មឃ្លាំងកម្មវិធី។"
+ "កម្មវិធីទាមទារការដំឡើងសេវាកម្មឃ្លាំងកម្មវិធី។"
+ "កម្មវិធីទាមទារធ្វើបច្ចុប្បន្នភាពសេវាកម្មឃ្លាំងកម្មវិធី។"
+ "កំហុសសេវាកម្មកម្សាន្ត Google"
+ "បានស្នើដោយ %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ko/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ko/strings.xml
new file mode 100644
index 0000000000..e37f1fd02a
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ko/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play 서비스 설치"
+ "휴대전화에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다."
+ "태블릿에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다."
+ "Google Play 서비스 설치"
+ "Google Play 서비스 사용"
+ "Google Play 서비스를 사용하도록 설정해야 이 앱이 작동합니다."
+ "Google Play 서비스 사용"
+ "Google Play 서비스 업데이트"
+ "Google Play 서비스를 업데이트해야만 이 앱이 실행됩니다."
+ "네트워크 오류"
+ "Google Play 서비스에 연결하려면 데이터 연결이 필요합니다."
+ "올바르지 않은 계정"
+ "지정한 계정이 이 기기에 존재하지 않습니다. 다른 계정을 선택하세요."
+ "Google Play 서비스에 알 수 없는 문제가 발생했습니다."
+ "Google Play 서비스"
+ "일부 사용자 애플리케이션에 필요한 Google Play 서비스가 사용자 기기에서 지원되지 않습니다. 기기 제조업체에 문의하시기 바랍니다."
+ "기기의 날짜가 잘못된 것 같습니다. 기기의 날짜를 확인해 주세요."
+ "업데이트"
+ "로그인"
+ "Google 계정으로 로그인"
+
+ "애플리케이션에서 잘못된 버전의 Google Play 서비스를 사용하려고 했습니다."
+ "Google Play 서비스를 사용하도록 설정해야 하는 애플리케이션입니다."
+ "Google Play 서비스를 설치해야 하는 애플리케이션입니다."
+ "Google Play 서비스를 업데이트해야 하는 애플리케이션입니다."
+ "Google Play 서비스 오류"
+ "%1$s에서 요청"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-lo-rLA/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000000..32bcb0b92b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-lo-rLA/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "ຕິດຕັ້ງບໍລິການ Google Play"
+ "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນໂທລະສັບຂອງທ່ານ."
+ "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນແທັບເລັດຂອງທ່ານ."
+ "ຕິດຕັ້ງບໍລິການ Google Play"
+ "ເປີດໃຊ້ບໍລິການ Google Play"
+ "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ຈົນກວ່າທ່ານຈະເປີດໃຊ້ບໍລິການ Google Play"
+ "ເປີດໃຊ້ບໍລິການ Google Play"
+ "ອັບເດດບໍລິການ Google Play"
+ "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ຈົນກວ່າທ່ານຈະອັບເດດບໍລິການ Google Play."
+ "ເຄືອຂ່າຍຜິດພາດ"
+ "ຕ້ອງໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດເພື່ອໃຊ້ Google Play Services."
+ "ບັນຊີບໍ່ຖືກຕ້ອງ"
+ "ບັນຊີທີ່ເລືອກບໍ່ມີໃນອຸປະກອນນີ້. ກະລຸນາເລືອກບັນຊີອື່ນ."
+ "ມີປັນຫາທີ່ບໍ່ຄາດຄິດໃນບໍລິການ Google Play."
+ "ບໍລິການ Google Play"
+ "ບໍລິການ Google Play ທີ່ບາງແອັບພລິເຄຊັນຂອງທ່ານຕ້ອງອາໄສນັ້ນ ບໍ່ຖືກຮອງຮັບໃນອຸປະກອນຂອງທ່ານ. ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດສຳລັບການແນະນຳ."
+ "ວັນທີຂອງອຸປະກອນບໍ່ຖືກຕ້ອງ. ກະລຸນາກວດສອບວັນທີຂອງອຸປະກອນຂອງທ່ານ."
+ "ອັບເດດ"
+ "ເຂົ້າສູ່ລະບົບ"
+ "ເຂົ້າສູ່ລະບົບດ້ວຍ Google"
+
+ "ແອັບພລິເຄຊັນໄດ້ພະຍາຍາມໃຊ້ Google Play Services ເວີຊັນທີ່ບໍ່ສາມາດໃຊ້ໄດ້."
+ "ແອັບພລິເຄຊັນຕ້ອງການເປີດນຳໃຊ້ Google Play Services."
+ "ແອັບພລິເຄຊັນຕ້ອງການໃຫ້ຕິດຕັ້ງ Google Play Services."
+ "ແອັບພລິເຄຊັນຕ້ອງການອັບເດດ Google Play Services."
+ "ບໍລິການ Google Play ຜິດພາດ"
+ "ຮ້ອງຂໍໂດຍ %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-lt/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-lt/strings.xml
new file mode 100644
index 0000000000..73de5fa9aa
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-lt/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Gauti „Google Play“ paslaugų"
+ "Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos telefone."
+ "Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos planšetiniame kompiuteryje."
+ "Gauti „Google Play“ paslaugų"
+ "Įgalinti „Google Play“ paslaugas"
+ "Ši programa neveiks, jei neįgalinsite „Google Play“ paslaugų."
+ "Įgal. „Google Play“ paslaugas"
+ "Atnaujinti „Google Play“ paslaugas"
+ "Ši programa neveiks, jei neatnaujinsite „Google Play“ paslaugų."
+ "Tinklo klaida"
+ "Norint prisijungti prie „Google Play“ paslaugų reikia duomenų ryšio."
+ "Netinkama paskyra"
+ "Nurodytos paskyros šiame įrenginyje nėra. Pasirinkite kitą paskyrą."
+ "Nežinoma „Google Play“ paslaugų problema."
+ "„Google Play“ paslaugos"
+ "Jūsų įrenginys nepalaiko „Google Play“ paslaugų, kuriomis remiasi kai kurios programos. Jei reikia pagalbos, susisiekite su gamintoju."
+ "Įrenginyje nurodyta data neteisinga. Patikrinkite įrenginyje nurodytą datą."
+ "Atnaujinti"
+ "Prisij."
+ "Prisij. naud. „Google“"
+
+ "Programa bandė naudotis netinkama „Google Play“ paslaugų versija."
+ "Norint naudoti programą būtina įgalinti „Google Play“ paslaugas."
+ "Norint naudoti programą būtina įdiegti „Google Play“ paslaugas."
+ "Norint naudoti programą būtina atnaujinti „Google Play“ paslaugas."
+ "„Google Play“ paslaugų klaida"
+ "Užklausą pateikė „%1$s“"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-lv/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-lv/strings.xml
new file mode 100644
index 0000000000..9e4b6ee6bd
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-lv/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play pakalpojumu iegūšana"
+ "Lai šī lietotne darbotos, tālrunī ir jāinstalē Google Play pakalpojumi."
+ "Lai šī lietotne darbotos, planšetdatorā ir jāinstalē Google Play pakalpojumi."
+ "Iegūt Google Play pakalpojumus"
+ "Google Play pakalpojumu iespējošana"
+ "Lai šī lietotne darbotos, iespējojiet Google Play pakalpojumus."
+ "Iespējot Google Play pakalpojumus"
+ "Google Play pakalpojumu atjaunināšana"
+ "Lai šī lietotne darbotos, atjauniniet Google Play pakalpojumus."
+ "Tīkla kļūda"
+ "Lai izveidotu savienojumu ar Google Play pakalpojumiem, ir nepieciešams datu savienojums."
+ "Nederīgs konts"
+ "Norādītais konts šajā ierīcē nepastāv. Lūdzu, izvēlieties citu kontu."
+ "Nezināma problēma ar Google Play pakalpojumiem."
+ "Google Play pakalpojumi"
+ "Jūsu ierīce neatbalsta Google Play pakalpojumus, kuri nepieciešami dažu jūsu lietojumprogrammu darbībai. Lūdzu, sazinieties ar ražotāju, lai saņemtu palīdzību."
+ "Šķiet, ka ierīcē ir iestatīts nepareizs datums. Lūdzu, pārbaudiet ierīces datumu."
+ "Atjaunināt"
+ "Pierakst."
+ "Pierakstīties Google"
+
+ "Lietojumpr. mēģināja izmantot nederīgu Google Play pakalp. versiju."
+ "Lai lietojumprogramma darbotos, ir jāiespējo Google Play pakalpojumi."
+ "Lai lietojumprogramma darbotos, ir jāinstalē Google Play pakalpojumi."
+ "Lai lietojumprogramma darbotos, jāatjaunina Google Play pakalpojumi."
+ "Google Play pakalpojumu kļūda"
+ "Pieprasījums no lietotnes %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-mn-rMN/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000000..1743256a11
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-mn-rMN/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play үйлчилгээ авах"
+ "Таны утсанд байхгүй байгаа Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."
+ "Таны таблетэд байхгүй Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."
+ "Google Play үйлчилгээ авах"
+ "Google Play үйлчилгээг идэвхжүүлэх"
+ "Та Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."
+ "Google Play үйлчилгээг идэвхжүүлэх"
+ "Google Play үйлчилгээг шинэчлэх"
+ "Та Google Play үйлчилгээг шинэчлэхгүй бол энэ апп ажиллах боломжгүй."
+ "Сүлжээний алдаа"
+ "Google Play үйлчилгээнд холбогдохын тулд дата холболт шаардлагатай."
+ "Буруу акаунт"
+ "Заасан акаунт энэ төхөөрөмж дээр байхгүй байна. Өөр акаунт сонгоно уу."
+ "Google Play үйлчилгээтэй холбоотой тодорхойгүй алдаа."
+ "Google Play үйлчилгээ"
+ "Таны зарим аппликешнүүдийн хамаардаг Google Play үйлчилгээ таны төхөөрөмжид дэмжигдэхгүй байна. Тусламж авахын тулд үйлдвэрлэгчтэй холбоо барина уу."
+ "Төхөөрөмжийн огноо буруу байгаа бололтой. Төхөөрөмжийн огноог шалгана уу."
+ "Шинэчлэх"
+ "Нэвтрэх"
+ "Google-р нэвтрэх:"
+
+ "Аппликешн Google Play Үйлчилгээний муу хувилбарыг ашиглахыг оролдлоо."
+ "Аппликешн Google Play Үйлчилгээг идэвхжүүлсэн байхыг шаардана."
+ "Аппликешн Google Play Үйлчилгээг суулгахыг шаардана."
+ "Аппликешн Google Play Үйлчилгээг шинэчлэхийг шаардана."
+ "Google Play үйлчилгээний алдаа"
+ "Хүсэлт гаргасан %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ms-rMY/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000000..8e8a4b9b8a
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ms-rMY/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Dapatkan perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada telefon anda."
+ "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada tablet anda."
+ "Dapatkan perkhidmatan Google Play"
+ "Dayakan perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi kecuali anda mendayakan perkhidmatan Google Play."
+ "Dayakan perkhidmatan Google Play"
+ "Kemas kini perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi kecuali anda mengemas kini perkhidmatan Google Play."
+ "Ralat Rangkaian"
+ "Sambungan data diperlukan untuk menyambung ke perkhidmatan Google Play."
+ "Akaun Tidak Sah"
+ "Akaun yang dinyatakan tidak wujud pada peranti ini. Sila pilih akaun yang lain."
+ "Isu tidak diketahui dengan perkhidmatan Google Play."
+ "Perkhidmatan Google Play"
+ "Peranti anda tidak menyokong perkhidmatan Google Play, sedangkan sesetengah aplikasi anda memerlukannya. Sila hubungi pengilang untuk bantuan."
+ "Tarikh pada peranti kelihatan tidak betul. Sila semak tarikh pada peranti."
+ "Kemas kini"
+ "Log masuk"
+ "Log masuk dengan Google"
+
+ "Aplikasi cuba menggunakan versi Perkhidmatan Google Play yang rosak."
+ "Perkhidmatan Google Play perlu didayakan untuk menggunakan aplikasi."
+ "Perkhidmatan Google Play perlu dipasang untuk mengguankan aplikasi."
+ "Perkhidmatan Google Play perlu dikemas kini untuk menggunakan aplikasi."
+ "Ralat perkhidmatan Google Play"
+ "Diminta oleh %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ms/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ms/strings.xml
new file mode 100644
index 0000000000..8e8a4b9b8a
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ms/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Dapatkan perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada telefon anda."
+ "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada tablet anda."
+ "Dapatkan perkhidmatan Google Play"
+ "Dayakan perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi kecuali anda mendayakan perkhidmatan Google Play."
+ "Dayakan perkhidmatan Google Play"
+ "Kemas kini perkhidmatan Google Play"
+ "Apl ini tidak akan berfungsi kecuali anda mengemas kini perkhidmatan Google Play."
+ "Ralat Rangkaian"
+ "Sambungan data diperlukan untuk menyambung ke perkhidmatan Google Play."
+ "Akaun Tidak Sah"
+ "Akaun yang dinyatakan tidak wujud pada peranti ini. Sila pilih akaun yang lain."
+ "Isu tidak diketahui dengan perkhidmatan Google Play."
+ "Perkhidmatan Google Play"
+ "Peranti anda tidak menyokong perkhidmatan Google Play, sedangkan sesetengah aplikasi anda memerlukannya. Sila hubungi pengilang untuk bantuan."
+ "Tarikh pada peranti kelihatan tidak betul. Sila semak tarikh pada peranti."
+ "Kemas kini"
+ "Log masuk"
+ "Log masuk dengan Google"
+
+ "Aplikasi cuba menggunakan versi Perkhidmatan Google Play yang rosak."
+ "Perkhidmatan Google Play perlu didayakan untuk menggunakan aplikasi."
+ "Perkhidmatan Google Play perlu dipasang untuk mengguankan aplikasi."
+ "Perkhidmatan Google Play perlu dikemas kini untuk menggunakan aplikasi."
+ "Ralat perkhidmatan Google Play"
+ "Diminta oleh %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-nb/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-nb/strings.xml
new file mode 100644
index 0000000000..1e16bbb6d2
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-nb/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Installer Google Play Tjenester"
+ "Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på telefonen din."
+ "Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på nettbrettet ditt."
+ "Installer Google Play Tjenester"
+ "Aktiver Google Play Tjenester"
+ "Denne appen fungerer ikke med mindre du aktiverer Google Play Tjenester."
+ "Aktiver Google Play Tjenester"
+ "Oppdater Google Play Tjenester"
+ "Denne appen kan ikke kjøres før du oppdaterer Google Play Tjenester."
+ "Nettverksfeil"
+ "Du må ha datatilkobling for å koble deg til Google Play-tjenester."
+ "Ugyldig konto"
+ "Den angitte kontoen finnes ikke på enheten. Velg en annen konto."
+ "Det oppsto et ukjent problem med Google Play Tjenester."
+ "Google Play-tjenester"
+ "Google Play Tjenester, som noen av appene er avhengige av, støttes ikke av enheten. Ta kontakt med produsenten for å få hjelp."
+ "Datoen på enheten ser ut til å være feil. Sjekk datoen på enheten."
+ "Oppdater"
+ "Logg på"
+ "Logg inn med Google"
+
+ "En app prøvde å bruke en skadet versjon av Google Play Tjenester."
+ "En app krever Google Play Tjenester for å aktiveres."
+ "En app krever at Google Play Tjenester installeres."
+ "En app krever at Google Play Tjenester oppdateres."
+ "Google Play Tjenester-feil"
+ "Forespurt av %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-nl/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-nl/strings.xml
new file mode 100644
index 0000000000..f38db5fcdb
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-nl/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play-services ophalen"
+ "Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw telefoon."
+ "Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw tablet."
+ "Google Play-services ophalen"
+ "Google Play-services inschakelen"
+ "Deze app werkt niet, tenzij u Google Play-services inschakelt."
+ "Google Play-services inschak."
+ "Google Play-services bijwerken"
+ "Deze app kan niet worden uitgevoerd, tenzij u Google Play-services bijwerkt."
+ "Netwerkfout"
+ "Er is een gegevensverbinding nodig om verbinding te kunnen maken met Google Play-services."
+ "Ongeldig account"
+ "Het gespecificeerde account bestaat niet op dit apparaat. Kies een ander account."
+ "Onbekend probleem met Google Play-services."
+ "Google Play-services"
+ "Google Play-services, dat vereist is voor een aantal van uw applicaties, wordt niet ondersteund door uw apparaat. Neem contact op met de fabrikant voor ondersteuning."
+ "De datum op het apparaat lijkt onjuist. Controleer de datum op het apparaat."
+ "Bijwerken"
+ "Inloggen"
+ "Inloggen met Google"
+
+ "Onjuiste versie van Google Play-services wordt gebruikt."
+ "Google Play-services moet zijn ingeschakeld voor een applicatie."
+ "Google Play-services moet zijn geïnstalleerd voor een applicatie."
+ "Google Play-services moet worden geüpdatet voor een applicatie."
+ "Fout met Google Play-services"
+ "Aangevraagd door %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-pl/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-pl/strings.xml
new file mode 100644
index 0000000000..5eba15ff3a
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-pl/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Pobierz Usługi Google Play"
+ "Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na telefonie."
+ "Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na tablecie."
+ "Pobierz Usługi Google Play"
+ "Włącz Usługi Google Play"
+ "Ta aplikacja nie będzie działać, jeśli nie włączysz Usług Google Play."
+ "Włącz Usługi Google Play"
+ "Aktualizuj Usługi Google Play"
+ "Ta aplikacja nie będzie działać, jeśli nie zaktualizujesz Usług Google Play."
+ "Błąd sieci"
+ "Korzystanie z usług Google Play wymaga połączenia z internetem."
+ "Nieprawidłowe konto"
+ "Podanego konta nie ma na tym urządzeniu. Wybierz inne konto."
+ "Nieznany problem z Usługami Google Play."
+ "Usługi Google Play"
+ "Usługi Google Play, od których zależy działanie niektórych aplikacji, nie są obsługiwane na Twoim urządzeniu. Skontaktuj się z producentem, by uzyskać pomoc."
+ "Data ustawiona na urządzeniu wydaje się nieprawidłowa. Sprawdź datę ustawioną na urządzeniu."
+ "Aktualizuj"
+ "Zaloguj się"
+ "Zaloguj się przez Google"
+
+ "Aplikacja próbowała skorzystać z nieprawidłowej wersji Usług Google Play."
+ "Aplikacja wymaga włączenia Usług Google Play."
+ "Aplikacja wymaga zainstalowania Usług Google Play."
+ "Aplikacja wymaga aktualizacji Usług Google Play."
+ "Błąd usług Google Play"
+ "Żądanie z aplikacji %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-pt-rBR/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..6db462d709
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-pt-rBR/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Instale o Google Play Services"
+ "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu telefone."
+ "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu tablet."
+ "Instalar o Google Play Services"
+ "Ative o Google Play Services"
+ "Este aplicativo só funciona com o Google Play Services ativado."
+ "Ativar o Google Play Services"
+ "Atualize o Google Play Services"
+ "Este aplicativo só funciona com uma versão atualizada do Google Play Services."
+ "Erro na rede"
+ "É necessária uma conexão de dados para conectar ao Google Play Services."
+ "Conta inválida"
+ "A conta especificada não existe no dispositivo. Escolha outra conta."
+ "Problema desconhecido com o Google Play Services."
+ "Play Services"
+ "O Google Play Services, necessário para alguns dos aplicativos, não é compatível com seu dispositivo. Entre em contato com o fabricante para obter assistência."
+ "A data no dispositivo parece incorreta. Verifique a data no dispositivo."
+ "Atualizar"
+ "Login"
+ "Fazer login com o Google"
+
+ "Um aplicativo tentou usar uma versão errada do Google Play Services."
+ "Um aplicativo requer a ativação do Google Play Services."
+ "Um aplicativo requer a instalação do Google Play Services."
+ "Um aplicativo requer a atualização do Google Play Services."
+ "Ocorreu um erro no Google Play Services"
+ "Solicitado por %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-pt-rPT/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..0ceafcb95f
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-pt-rPT/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Obter serviços do Google Play"
+ "Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu telemóvel."
+ "Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu tablet."
+ "Obter serviços do Google Play"
+ "Ativar serviços do Google Play"
+ "Esta aplicação não funcionará enquanto não ativar os serviços do Google Play."
+ "Ativar serviços do Google Play"
+ "Atualizar serviços do Google Play"
+ "Esta aplicação não será executada enquanto não atualizar os serviços do Google Play."
+ "Erro de Rede"
+ "É necessária uma ligação de dados para se ligar aos Serviços do Google Play."
+ "Conta Inválida"
+ "A conta especificada não existe neste dispositivo. Escolha uma conta diferente."
+ "Problema desconhecido nos serviços do Google Play."
+ "Serviços do Google Play"
+ "Os serviços do Google Play, dos quais dependem algumas das suas aplicações, não são suportados pelo seu dispositivo. Contacte o fabricante para obter assistência."
+ "A data no dispositivo parece estar incorreta. Verifique a data no dispositivo."
+ "Atualizar"
+ "Inic. ses."
+ "Inic. sessão com o Google"
+
+ "Aplicação tentou utiliz. versão incorreta dos Serviços do Google Play."
+ "Uma aplicação necessita da ativação dos Serviços do Google Play."
+ "Uma aplicação necessita da instalação dos Serviços do Google Play."
+ "Uma aplicação necessita da atualização dos Serviços do Google Play."
+ "Erro dos serviços do Google Play"
+ "Solicitado por %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-pt/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-pt/strings.xml
new file mode 100644
index 0000000000..6db462d709
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-pt/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Instale o Google Play Services"
+ "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu telefone."
+ "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu tablet."
+ "Instalar o Google Play Services"
+ "Ative o Google Play Services"
+ "Este aplicativo só funciona com o Google Play Services ativado."
+ "Ativar o Google Play Services"
+ "Atualize o Google Play Services"
+ "Este aplicativo só funciona com uma versão atualizada do Google Play Services."
+ "Erro na rede"
+ "É necessária uma conexão de dados para conectar ao Google Play Services."
+ "Conta inválida"
+ "A conta especificada não existe no dispositivo. Escolha outra conta."
+ "Problema desconhecido com o Google Play Services."
+ "Play Services"
+ "O Google Play Services, necessário para alguns dos aplicativos, não é compatível com seu dispositivo. Entre em contato com o fabricante para obter assistência."
+ "A data no dispositivo parece incorreta. Verifique a data no dispositivo."
+ "Atualizar"
+ "Login"
+ "Fazer login com o Google"
+
+ "Um aplicativo tentou usar uma versão errada do Google Play Services."
+ "Um aplicativo requer a ativação do Google Play Services."
+ "Um aplicativo requer a instalação do Google Play Services."
+ "Um aplicativo requer a atualização do Google Play Services."
+ "Ocorreu um erro no Google Play Services"
+ "Solicitado por %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ro/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ro/strings.xml
new file mode 100644
index 0000000000..eb428964ec
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ro/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Descărcaţi Servicii Google Play"
+ "Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe telefon."
+ "Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe tabletă."
+ "Obţineţi Servicii Google Play"
+ "Activaţi Servicii Google Play"
+ "Această aplicaţie nu va funcţiona decât dacă activaţi Servicii Google Play."
+ "Activaţi Servicii Google Play"
+ "Actualizaţi Servicii Google Play"
+ "Această aplicaţie nu poate rula decât dacă actualizaţi Servicii Google Play."
+ "Eroare de reţea"
+ "Este necesară o conexiune de date pentru a vă conecta la serviciile Google Play."
+ "Cont nevalid"
+ "Contul menționat nu există pe acest dispozitiv. Alegeți alt cont."
+ "Problemă necunoscută privind Servicii Google Play."
+ "Servicii Google Play"
+ "Gadgetul nu acceptă serviciile Google Play, pe care se bazează unele dintre aplicații. Pentru asistență, contactați producătorul gadgetului."
+ "Data de pe dispozitiv pare să fie incorectă. Verificați data de pe dispozitiv."
+ "Actualizaţi"
+ "Conectați"
+ "Conectați-vă cu Google"
+
+ "Aplicația a încercat să utilizeze o vers. Servicii Google Play greșită"
+ "O aplicație necesită activarea Serviciilor Google Play."
+ "O aplicație necesită instalarea Serviciilor Google Play."
+ "O aplicație necesită o actualizare pentru Servicii Google Play."
+ "Eroare Servicii Google Play"
+ "Solicitată de %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-ru/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-ru/strings.xml
new file mode 100644
index 0000000000..c784aae95c
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-ru/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Установите Сервисы Google Play"
+ "Для работы этого приложения требуется установить Сервисы Google Play."
+ "Для работы этого приложения требуется установить Сервисы Google Play."
+ "Установить"
+ "Включите Сервисы Google Play"
+ "Для работы этого приложения требуется включить Сервисы Google Play."
+ "Включить"
+ "Обновите Сервисы Google Play"
+ "Для работы этого приложения требуется обновить Сервисы Google Play."
+ "Ошибка сети"
+ "Для работы с Google Play требуется подключение к сети."
+ "Недействительный аккаунт"
+ "Этого аккаунта нет на устройстве. Выберите другой."
+ "Неизвестная ошибка с Сервисами Google Play."
+ "Сервисы Google Play"
+ "Сервисы Google Play, необходимые для работы некоторых приложений, не поддерживаются на вашем устройстве. Обратитесь к производителю."
+ "Проверьте правильность даты, указанной на устройстве."
+ "Обновить"
+ "Войти"
+ "Войти в аккаунт Google"
+
+ "Версия сервисов Google Play неисправна"
+ "Для работы приложения требуется включить сервисы Google Play"
+ "Для работы приложения требуется установить сервисы Google Play"
+ "Для работы приложения требуется обновить сервисы Google Play"
+ "Ошибка сервисов Google Play"
+ "Запрос от приложения \"%1$s\""
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-sk/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-sk/strings.xml
new file mode 100644
index 0000000000..125d87f6da
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-sk/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Inštalovať služby Google Play"
+ "Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v telefóne nemáte."
+ "Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v tablete nemáte."
+ "Inštalovať služby Google Play"
+ "Povoliť služby Google Play"
+ "Táto aplikácia bude fungovať až po povolení služieb Google Play."
+ "Povoliť služby Google Play"
+ "Aktualizovať služby Google Play"
+ "Túto aplikáciu bude možné spustiť až po aktualizácii služieb Google Play."
+ "Chyba siete"
+ "Pripojenie k službám Google Play si vyžaduje dátové pripojenie."
+ "Neplatný účet"
+ "Zadaný účet v tomto zariadení neexistuje. Vyberte iný účet."
+ "Neznámy problém so službami Google Play."
+ "Služby Google Play"
+ "Niektoré vaše aplikácie vyžadujú služby Google Play, ktoré vo vašom zariadení nie sú podporované. Ak potrebujete pomoc, kontaktujte výrobcu."
+ "Dátum nastavený v zariadení sa zdá byť nesprávny. Skontrolujte ho."
+ "Aktualizovať"
+ "Prihlásiť sa"
+ "Prihlásiť sa do účtu Google"
+
+ "Aplikácia sa pokúsila použiť nesprávnu verziu služieb Google Play."
+ "Aplikácia vyžaduje povolenie služieb Google Play."
+ "Aplikácia vyžaduje inštaláciu služieb Google Play."
+ "Aplikácia vyžaduje aktualizáciu služieb Google Play."
+ "Chyba služieb Google Play"
+ "Vyžiadané aplikáciou %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-sl/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-sl/strings.xml
new file mode 100644
index 0000000000..df5821f94c
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-sl/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Namestite storitve Google Play"
+ "Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v telefonu."
+ "Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v tabličnem računalniku."
+ "Namestite storitve Google Play"
+ "Omogočite storitve Google Play"
+ "Aplikacija ne bo delovala, če ne omogočite storitev Google Play."
+ "Omogočite storitve Google Play"
+ "Posodobite storitve Google Play"
+ "Ta aplikacija ne deluje, če ne posodobite storitev Google Play."
+ "Omrežna napaka"
+ "Za povezavo s storitvami Google Play potrebujete internetno povezavo."
+ "Neveljaven račun"
+ "V tej napravi ne obstaja navedeni račun. Izberite drugega."
+ "Neznana težava s storitvami Google Play."
+ "Storitve Google Play"
+ "Vaša naprava na podpira storitev Google Play, ki jih potrebujejo nekatere od vaših aplikacij. Za pomoč se obrnite na izdelovalca."
+ "Videti je, da je datum v napravi napačen. Preverite ga."
+ "Posodobi"
+ "Prijava"
+ "Prijavite se v Google"
+
+ "Aplikacija je poskusila uporabiti napačno različico Storitev Google Play."
+ "Za delovanje aplikacije morate omogočiti Storitve Google Play."
+ "Za delovanje aplikacije morate namestiti Storitve Google Play."
+ "Za delovanje aplikacije morate posodobiti Storitve Google Play."
+ "Napaka storitev Google Play"
+ "Zahtevala aplikacija %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-sr/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-sr/strings.xml
new file mode 100644
index 0000000000..ad0b549547
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-sr/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Преузимање Google Play услуга"
+ "Ова апликација не може да се покрене без Google Play услуга, које недостају на телефону."
+ "Ова апликација не може да се покрене без Google Play услуга, које недостају на таблету."
+ "Преузми Google Play услуге"
+ "Омогућавање Google Play услуга"
+ "Ова апликација неће функционисати ако не омогућите Google Play услуге."
+ "Омогући Google Play услуге"
+ "Ажурирање Google Play услуга"
+ "Ова апликација не може да се покрене ако не ажурирате Google Play услуге."
+ "Грешка на мрежи"
+ "За повезивање са Google Play услугама потребна је веза за пренос података."
+ "Неважећи налог"
+ "Наведени налог не постоји на овом уређају. Одаберите други налог."
+ "Непознат проблем са Google Play услугама."
+ "Google Play услуге"
+ "Google Play услуге, које су потребне за функционисање неких од апликација, нису подржане на уређају. Контактирајте произвођача да бисте добили помоћ."
+ "Изгледа да су подаци на уређају нетачни. Проверите датум на уређају."
+ "Ажурирај"
+ "Пријави ме"
+ "Пријави ме преко Google-а"
+
+ "Апликација је покушала да користи лошу верзију Google Play услуга."
+ "Апликација захтева да Google Play услуге буду омогућене."
+ "Апликација захтева инсталирање Google Play услуга."
+ "Апликација захтева ажурирање Google Play услуга."
+ "Грешка Google Play услуга"
+ "Захтева %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-sv/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-sv/strings.xml
new file mode 100644
index 0000000000..6a10395f4b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-sv/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Hämta Google Play Tjänster"
+ "Den här appen kan inte köras utan Google Play Tjänster, som saknas på mobilen."
+ "Den här appen kan inte köras utan Google Play Tjänster, som saknas på surfplattan."
+ "Hämta Google Play Tjänster"
+ "Aktivera Google Play Tjänster"
+ "Du måste aktivera Google Play Tjänster för att den här appen ska fungera."
+ "Aktivera Google Play Tjänster"
+ "Uppdatera Google Play Tjänster"
+ "Du måste uppdatera Google Play Tjänster innan du kan köra den här appen."
+ "Nätverksfel"
+ "En dataanslutning krävs för att ansluta till Google Plays tjänster."
+ "Ogiltigt konto"
+ "Det angivna kontot finns inte på den här enheten. Välj ett annat konto."
+ "Okänt problem med Google Play Tjänster"
+ "Google Play-tjänster"
+ "Några av dina appar använder Google Play-tjänster som inte stöds av din enhet. Kontakta tillverkaren om du vill ha hjälp."
+ "Datumet på enheten verkar inte vara rätt. Kontrollera datumet på enheten."
+ "Uppdatera"
+ "Logga in"
+ "Logga in med Google"
+
+ "En olämplig version av Google Play Tjänster anropades av en app."
+ "Google Play Tjänster måste aktiveras för en att app ska fungera."
+ "Google Play Tjänster måste installeras för att en app ska fungera."
+ "Google Play Tjänster måste uppdateras för en app ska fungera."
+ "Fel på Google Play Tjänster"
+ "Begärdes av %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-sw/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-sw/strings.xml
new file mode 100644
index 0000000000..37bd92ac68
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-sw/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Pata huduma za Google Play"
+ "Programu hii haiwezi kuendeshwa bila huduma za Google Play, ambazo hazipo kwenye simu yako."
+ "Programu hii haiwezi kuendeshwa bila huduma za Google Play, ambazo hazipo kwenye kompyuta yako ndogo."
+ "Pata huduma za Google Play"
+ "Wezesha huduma za Google Play"
+ "Programu hii haitafanya kazi mpaka utakapowezesha huduma za Google Play."
+ "Wezesha huduma za Google Play"
+ "Sasisha huduma za Google Play"
+ "Programu hii haiwezi kuendeshwa mpaka utakaposasisha huduma za Google Play."
+ "Hitilafu ya Mtandao"
+ "Muunganisho wa data unahitajika ili kuunganisha kwenye huduma za Google Play."
+ "Akaunti Batili"
+ "Akaunti iliyobainishwa haipo kwenye kifaa hiki. Tafadhali chagua akaunti tofauti."
+ "Suala lisilojulikana na huduma za Google Play."
+ "Huduma za Google Play"
+ "Huduma za Google Play, ambazo baadhi ya programu zako zinategemea, si linganifu na kifaa chako. Tafadhali wasiliana na mtengenezaji kwa usaidizi."
+ "Inaeonekana tarehe ya kifaa sio sahihi. Tafadhali angalia tarehe ya kifaa."
+ "Sasisha"
+ "Ingia"
+ "Ingia ukitumia Google"
+
+ "Programu ilijaribu kutumia toleo baya la Huduma za Google Play."
+ "Programu inahitaji Huduma za Google Play ili kuwashwa."
+ "Programu inahitaji usakinishaji wa Huduma za Google Play."
+ "Programu inahitaji sasisho la Huduma za Google Play."
+ "Hitilafu kwenye Huduma za Google Play"
+ "Imeombwa na %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-th/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-th/strings.xml
new file mode 100644
index 0000000000..6f098fe801
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-th/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "รับบริการ Google Play"
+ "แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในโทรศัพท์ของคุณ"
+ "แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในแท็บเล็ตของคุณ"
+ "รับบริการ Google Play"
+ "เปิดใช้งานบริการ Google Play"
+ "แอปพลิเคชันนี้จะไม่ทำงานจนกว่าคุณจะเปิดใช้งานบริการ Google Play"
+ "เปิดใช้งานบริการ Google Play"
+ "อัปเดตบริการ Google Play"
+ "แอปพลิเคชันนี้จะไม่ทำงานจนกว่าคุณจะอัปเดตบริการ Google Play"
+ "ข้อผิดพลาดของเครือข่าย"
+ "ต้องมีการเขื่อมต่อข้อมูลเพื่อเชื่อมต่อกับบริการ Google Play"
+ "บัญชีไม่ถูกต้อง"
+ "บัญชีที่ระบุไม่มีอยู่บนอุปกรณ์นี้ โปรดเลือกบัญชีอื่น"
+ "ปัญหาที่ไม่รู้จักของบริการ Google Play"
+ "บริการ Google Play"
+ "บริการ Google Play ซึ่งใช้งานในบางแอปพลิเคชัน ไม่ได้รับการสนับสนุนโดยอุปกรณ์ของคุณ โปรดติดต่อผู้ผลิตเพื่อขอรับความช่วยเหลือ"
+ "วันที่บนอุปกรณ์ไม่ถูกต้อง โปรดตรวจสอบวันที่บนอุปกรณ์"
+ "อัปเดต"
+ "ลงชื่อใช้"
+ "ลงชื่อเข้าใช้ด้วย Google"
+
+ "แอปพลิเคชันหนึ่งพยายามใช้เวอร์ชันที่ไม่เหมาะสมของบริการ Google Play"
+ "แอปพลิเคชันหนึ่งจำเป็นต้องมีบริการ Google Play เพื่อเปิดใช้งาน"
+ "แอปพลิเคชันหนึ่งจำเป็นต้องมีการติดตั้งบริการ Google Play"
+ "แอปพลิเคชันหนึ่งจำเป็นต้องมีการอัปเดตสำหรับบริการ Google Play"
+ "ข้อผิดพลาดของบริการ Google Play"
+ "ขอโดย %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-tl/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-tl/strings.xml
new file mode 100644
index 0000000000..337f73c0cd
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-tl/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Kumuha ng mga serbisyo ng Google Play"
+ "Hindi tatakbo ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong telepono."
+ "Hindi gagana ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong tablet."
+ "Kumuha ng Google Play services"
+ "Paganahin ang Google Play services"
+ "Hindi gagana ang app na ito maliban kung papaganahin mo ang mga serbisyo ng Google Play."
+ "Enable Google Play services"
+ "I-update ang mga serbisyo ng Google Play"
+ "Hindi gagana ang app na ito maliban kung i-a-update mo ang mga serbisyo ng Google Play."
+ "May Error sa Network"
+ "Kailangan ng koneksyon ng data upang makakonekta sa mga serbisyo ng Google Play."
+ "Di-wasto ang Account"
+ "Hindi umiiral ang tinukoy na account sa device na ito. Mangyaring pumili ng ibang account."
+ "May hindi alam na isyu sa mga serbisyo ng Google Play."
+ "Mga serbisyo ng Google Play"
+ "Ang mga serbisyo ng Google Play, kung saan nakadepende ang ilan sa iyong mga application, ay hindi sinusuportahan ng iyong device. Mangyaring makipag-ugnay sa manufacturer para sa tulong."
+ "Mukhang hindi tama ang petsa sa device. Pakisuri ang petsa sa device."
+ "I-update"
+ "Sign in"
+ "Mag-sign in sa Google"
+
+ "May app na sumubok ng maling bersyon ng Mga Serbisyo ng Google Play."
+ "Kailangan ng application na na-enable ang Mga Serbisyo ng Google Play."
+ "Kailangan ng application na ma-install ang Serbisyo ng Google Play."
+ "Kailangan ng application na i-update ang Mga Serbisyo ng Google Play."
+ "Error sa mga serbisyo ng Google Play"
+ "Hiniling ng %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-tr/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-tr/strings.xml
new file mode 100644
index 0000000000..17e61e5fcb
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-tr/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Google Play hizmetlerini edinin"
+ "Google Play Hizmetleri telefonunuzda yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz."
+ "Google Play Hizmetleri tabletinizde yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz."
+ "Google Play hizmetlerini edin"
+ "Google Play hizmetlerini etkinleştir"
+ "Bu uygulama, Google Play Hizmetleri etkinleştirilmeden çalışmaz"
+ "Google Play hizmetlerini etkinleştir"
+ "Google Play hizmetlerini güncelle"
+ "Bu uygulama Google Play Hizmetleri güncellenmeden çalışmaz."
+ "Ağ Hatası"
+ "Google Play hizmetlerine bağlanmak için bir veri bağlantısı gerekiyor."
+ "Geçersiz Hesap"
+ "Belirtilen hesap bu cihazda mevcut değil. Lütfen farklı bir hesap seçin."
+ "Google Play hizmetleriyle ilgili bilinmeyen sorun."
+ "Google Play hizmetleri"
+ "Cihazınız, uygulamalarınızdan bazıları için gerekli olan Google Play hizmetlerini desteklemiyor. Lütfen yardım için üreticiyle iletişim kurun."
+ "Cihazdaki tarih doğru görünmüyor. Lütfen cihazda ayarlı tarihi kontrol edin."
+ "Güncelle"
+ "Oturum aç"
+ "Google\'da oturum aç"
+
+ "Bir uygulama, Google Play Hizmetleri\'nin bozuk bir sürümünü kullanmayı denedi."
+ "Bir uygulama, Google Play Hizmetleri\'nin etkin olmasını gerektiriyor."
+ "Bir uygulama, Google Play Hizmetleri\'nin yüklenmesini gerektiriyor."
+ "Bir uygulama, Google Play Hizmetleri için bir güncelleme gerektiriyor."
+ "Google Play hizmetleri hatası"
+ "İstekte bulunan: %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-uk/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-uk/strings.xml
new file mode 100644
index 0000000000..d657aea68d
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-uk/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Установити Google Play Послуги"
+ "Ця програма не запуститься без Google Play Послуг, яких немає у вашому телефоні."
+ "Ця програма не запуститься без Google Play Послуг, яких немає на вашому планшетному ПК."
+ "Установити Google Play Послуги"
+ "Увімкнути Google Play Послуги"
+ "Ця програма не працюватиме, поки ви не ввімкнете Google Play Послуги."
+ "Увімкнути Google Play Послуги"
+ "Оновити Google Play Послуги"
+ "Ця програма не запуститься, поки ви не оновите Google Play Послуги."
+ "Помилка мережі"
+ "Для під’єднання до сервісів Google Play потрібне з’єднання з мережею."
+ "Недійсний обліковий запис"
+ "Указаний обліковий запис не існує на цьому пристрої. Виберіть інший обліковий запис."
+ "Google Play Послуги – невідома проблема."
+ "Сервіси Google Play"
+ "Ваш пристрій не підтримує Сервіси Google Play, від яких залежить робота деяких програм. Зверніться по допомогу до виробника."
+ "Схоже, на пристрої вказано неправильну дату. Перевірте її."
+ "Оновити"
+ "Увійти"
+ "Увійти в обл.запис Google"
+
+ "Програма спробувала застосувати хибну версію Сервісів Google Play."
+ "Щоб програма працювала, потрібно ввімкнути Сервіси Google Play."
+ "Щоб програма працювала, потрібно встановити Сервіси Google Play."
+ "Щоб програма працювала, потрібно оновити Сервіси Google Play."
+ "Помилка Сервісів Google Play"
+ "Запит від програми %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-vi/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-vi/strings.xml
new file mode 100644
index 0000000000..a0434a08ac
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-vi/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Cài đặt dịch vụ của Google Play"
+ "Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Điện thoại của bạn bị thiếu dịch vụ này."
+ "Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Máy tính bảng của bạn bị thiếu dịch vụ này."
+ "Cài đặt dịch vụ của Google Play"
+ "Bật dịch vụ của Google Play"
+ "Ứng dụng này sẽ không hoạt động trừ khi bạn bật dịch vụ của Google Play."
+ "Bật dịch vụ của Google Play"
+ "Cập nhật dịch vụ của Google Play"
+ "Ứng dụng này sẽ không chạy trừ khi bạn cập nhật dịch vụ của Google Play."
+ "Lỗi mạng"
+ "Cần có kết nối dữ liệu để kết nối với các dịch vụ của Google Play."
+ "Tài khoản không hợp lệ"
+ "Tài khoản đã chỉ định không tồn tại trên thiết bị này. Vui lòng chọn một tài khoản khác."
+ "Sự cố không xác định với dịch vụ của Google Play."
+ "Dịch vụ của Google Play"
+ "Các dịch vụ của Google Play mà một số ứng dụng của bạn dựa vào không được thiết bị của bạn hỗ trợ. Vui lòng liên hệ với nhà sản xuất để được hỗ trợ."
+ "Ngày trên thiết bị có vẻ không chính xác. Vui lòng kiểm tra ngày trên thiết bị."
+ "Cập nhật"
+ "Đăng nhập"
+ "Đăng nhập bằng Google"
+
+ "Ứng dụng đã cố sử dụng phiên bản không đúng của Dịch vụ của Google Play."
+ "Ứng dụng yêu cầu Dịch vụ của Google Play phải được bật."
+ "Ứng dụng yêu cầu cài đặt Dịch vụ của Google Play."
+ "Ứng dụng yêu cầu cập nhật dành cho Dịch vụ Google Play."
+ "Lỗi dịch vụ của Google Play"
+ "Được yêu cầu bởi %1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-zh-rCN/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..4339e3eb01
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rCN/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "获取 Google Play 服务"
+ "您的手机中没有 Google Play 服务,您必须先安装该服务才能运行此应用。"
+ "您的平板电脑中没有 Google Play 服务,您必须先安装该服务才能运行此应用。"
+ "获取 Google Play 服务"
+ "启用 Google Play 服务"
+ "您必须先启用 Google Play 服务才能运行此应用。"
+ "启用 Google Play 服务"
+ "更新 Google Play 服务"
+ "您必须先更新 Google Play 服务才能运行此应用。"
+ "网络错误"
+ "您必须有数据网络连接才能接入 Google Play 服务。"
+ "无效帐户"
+ "此设备上不存在指定的帐户,请选择其他帐户。"
+ "Google Play 服务出现未知问题。"
+ "Google Play 服务"
+ "您的设备不支持部分应用所依赖的 Google Play 服务。请与设备制造商联系,以寻求帮助。"
+ "设备上的日期似乎不正确,请在设备上检查日期。"
+ "更新"
+ "登录"
+ "使用 Google 帐户登录"
+
+ "某个应用尝试使用的 Google Play 服务版本有误。"
+ "某个应用要求启用 Google Play 服务。"
+ "某个应用要求安装 Google Play 服务。"
+ "某个应用要求更新 Google Play 服务。"
+ "Google Play 服务出错"
+ "由“%1$s”发出"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-zh-rHK/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000000..abe6cf1457
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rHK/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "取得 Google Play 服務"
+ "您的手機未安裝 Google Play 服務,安裝後才能執行這個應用程式。"
+ "您的平板電腦未安裝 Google Play 服務,安裝後才能執行這個應用程式。"
+ "取得 Google Play 服務"
+ "啟用 Google Play 服務"
+ "您必須啟用 Google Play 服務,才能執行這個應用程式。"
+ "啟用 Google Play 服務"
+ "更新 Google Play 服務"
+ "您必須更新 Google Play 服務,才能執行這個應用程式。"
+ "網絡錯誤"
+ "要連接 Google Play 服務,必需數據連線。"
+ "無效的帳戶"
+ "這個裝置上沒有您指定的帳戶,請選擇其他帳戶。"
+ "Google Play 服務出現不明問題。"
+ "Google Play 服務"
+ "您的裝置不支援部分應用程式所需的 Google Play 服務。如需協助,請與您的裝置製造商聯絡。"
+ "裝置上的日期看來不正確,請檢查裝置上的日期。"
+ "更新"
+ "登入"
+ "登入 Google"
+
+ "應用程式嘗試使用錯誤版本的「Google Play 服務」。"
+ "必須啟用「Google Play 服務」,才能使用應用程式。"
+ "必須安裝「Google Play 服務」,才能使用應用程式。"
+ "必須更新「Google Play 服務」,才能使用應用程式。"
+ "Google Play 服務錯誤"
+ "「%1$s」提出要求"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-zh-rTW/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..a66018ab52
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-zh-rTW/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "取得 Google Play 服務"
+ "您的手機並未安裝 Google Play 服務,所以無法執行這個應用程式。"
+ "您的平板電腦並未安裝 Google Play 服務,所以無法執行這個應用程式。"
+ "取得 Google Play 服務"
+ "啟用 Google Play 服務"
+ "您必須啟用 Google Play 服務,這個應用程式才能運作。"
+ "啟用 Google Play 服務"
+ "更新 Google Play 服務"
+ "您必須更新 Google Play 服務,才能執行這個應用程式。"
+ "網路錯誤"
+ "需要數據連線才能連上 Google Play 服務。"
+ "無效的帳戶"
+ "這個裝置上沒有您所指定的帳戶,請選擇其他帳戶。"
+ "Google Play 服務發生不明問題。"
+ "Google Play 服務"
+ "您的裝置不支援部分應用程式所需的 Google Play 服務。如需協助,請與您的裝置製造商聯絡。"
+ "裝置上的日期似乎不正確,請檢查裝置上的日期。"
+ "更新"
+ "登入"
+ "使用 Google 帳戶登入"
+
+ "應用程式嘗試使用的 Google Play 服務版本有誤。"
+ "應用程式需要啟用 Google Play 服務。"
+ "應用程式需要安裝 Google Play 服務。"
+ "應用程式需要更新 Google Play 服務。"
+ "Google Play 服務錯誤"
+ "提出要求的應用程式:%1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values-zu/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values-zu/strings.xml
new file mode 100644
index 0000000000..572d9a52c4
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values-zu/strings.xml
@@ -0,0 +1,31 @@
+
+
+ "Thola amasevisi e-Google Play"
+ "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho efonini yakho."
+ "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho kuthebulethi yakho."
+ "Thola amasevisi e-Google Play"
+ "Nika amandla amasevisi e-Google Play"
+ "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle nje kokuthi unike amandla amasevisi e-Google Play."
+ "Nika amandla amasevisi e-Google Play"
+ "Buyekeza amasevisi e-Google Play"
+ "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle nje kokuthi ubuyekeze amasevisi e-Google Play."
+ "Iphutha lenethiwekhi"
+ "Kudingeka ukuxhumeka kwedatha ukuze kuxhunyekwe kumasevisi we-Google Play."
+ "I-Akhawunti engavumelekile"
+ "I-Akhawunti ecacisiwe ayikho kule divayisi. Sicela ukhethe i-akhawunti ehlukile."
+ "Indaba engaziwa yamasevisi we-Google Play"
+ "Amasevisi we-Google Play"
+ "Amasevisi we-Google Play, okungukuthi ezinye izinhlelo zakho zithembele kuwo, awasekelwe yidivayisi yakho. Sicela uxhumane nomkhiqizi ukuze uthole usizo."
+ "Idethi kudivayisi ibonakala ingalungile. Sicela uhlole idethi kudivayisi."
+ "Isibuyekezo"
+ "Ngena ngemvume"
+ "Ngena ngemvume nge-Google"
+
+ "Uhlelo lokusebenza luzame ukusebenzisa inguqulo embi yamasevisi we-Google Play."
+ "Uhlelo lokusebenza ludinga amasevisi we-Google Play ukuze anikwe amandla."
+ "Uhlelo lokusebenza ludinga ukufakwa kwamasevisi we-Google Play."
+ "Uhlelo lokusebenza ludinga isibuyekezo samasevisi we-Google Play."
+ "Iphutha lamasevisi we-Google Play"
+ "Kucelwe yi-%1$s"
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values/ads_attrs.xml b/pkg/android/phoenix64/libs/googleplay/res/values/ads_attrs.xml
new file mode 100644
index 0000000000..519a84272b
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values/ads_attrs.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values/colors.xml b/pkg/android/phoenix64/libs/googleplay/res/values/colors.xml
new file mode 100644
index 0000000000..6b2740a509
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values/colors.xml
@@ -0,0 +1,14 @@
+
+
+
+ @android:color/white
+ @android:color/white
+ #FFAAAAAA
+ @android:color/white
+ #FF737373
+ @android:color/white
+ #FFAAAAAA
+ #FF737373
+ #FFDD4B39
+ #d2d2d2
+
\ No newline at end of file
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values/maps_attrs.xml b/pkg/android/phoenix64/libs/googleplay/res/values/maps_attrs.xml
new file mode 100644
index 0000000000..aaf65c529e
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values/maps_attrs.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values/strings.xml b/pkg/android/phoenix64/libs/googleplay/res/values/strings.xml
new file mode 100644
index 0000000000..24bd58b11d
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values/strings.xml
@@ -0,0 +1,111 @@
+
+
+
+
+ Get Google Play services
+
+
+ This app won\'t run without Google Play services, which are missing from your phone.
+
+
+ This app won\'t run without Google Play services, which are missing from your tablet.
+
+
+ Get Google Play services
+
+
+ Enable Google Play services
+
+
+ This app won\'t work unless you enable Google Play services.
+
+
+ Enable Google Play services
+
+
+ Update Google Play services
+
+
+ This app won\'t run unless you update Google Play services.
+
+
+ Network Error
+
+
+ A data connection is required to connect to Google Play services.
+
+
+ Invalid Account
+
+
+ The specified account does not exist on this device. Please choose a different account.
+
+
+ Unknown issue with Google Play services.
+
+
+ Google Play services
+
+
+ Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance.
+
+
+ The date on the device appears to be incorrect. Please check the date on the device.
+
+
+ Update
+
+
+ Sign in
+
+
+ Sign in with Google
+
+
+
+
+
+ An application attempted to use a bad version of Google Play Services.
+
+
+
+ An application requires Google Play Services to be enabled.
+
+
+
+ An application requires installation of Google Play Services.
+
+
+
+ An application requires an update for Google Play Services.
+
+
+
+ Google Play services error
+
+
+ Requested by %1$s
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/libs/googleplay/res/values/version.xml b/pkg/android/phoenix64/libs/googleplay/res/values/version.xml
new file mode 100644
index 0000000000..890d9119aa
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/res/values/version.xml
@@ -0,0 +1,4 @@
+
+
+ 4030500
+
diff --git a/pkg/android/phoenix64/libs/googleplay/src/android/.readme b/pkg/android/phoenix64/libs/googleplay/src/android/.readme
new file mode 100644
index 0000000000..4bcebad80c
--- /dev/null
+++ b/pkg/android/phoenix64/libs/googleplay/src/android/.readme
@@ -0,0 +1,2 @@
+This hidden file is there to ensure there is an src folder.
+Once we support binary library this will go away.
\ No newline at end of file
diff --git a/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj b/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj
new file mode 100644
index 0000000000..f9dbc4b046
--- /dev/null
+++ b/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj
@@ -0,0 +1,273 @@
+
+
+
+
+ Debug
+ ARM
+
+
+ Release
+ ARM
+
+
+ Debug
+ ARM64
+
+
+ Release
+ ARM64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+ Debug
+ x86
+
+
+ Release
+ x86
+
+
+
+
+ CompileAsC
+ CompileAsC
+ CompileAsC
+ CompileAsC
+ CompileAsC
+ CompileAsC
+ CompileAsC
+ CompileAsC
+
+
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+
+
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+ c++11
+
+
+
+ {e27d73ec-6148-4817-b75c-adaa0c563939}
+ Android
+ retroarch-activity
+ en-US
+ 14.0
+ Android
+ 3.0
+ retroarch-activity.NativeActivity
+
+
+
+ DynamicLibrary
+ true
+ Clang_3_8
+ c++_static
+ android-64
+
+
+ DynamicLibrary
+ false
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ true
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ false
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ true
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ false
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ true
+ Clang_3_8
+ c++_static
+ android-26
+
+
+ DynamicLibrary
+ false
+ Clang_3_8
+ c++_static
+ android-26
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+ NotUsing
+ CompileAsCpp
+ $(SolutionDir)\..\..\..\libretro-common\include;$(SolutionDir)\..\..\..\deps;$(SolutionDir)\..\..\..\deps\libFLAC\include;$(SolutionDir)\..\..\..\deps\stb;$(SolutionDir)\..\..\..\deps\7zip;$(SolutionDir)\..\..\..\gfx\include;$(SolutionDir)\..\..\..\deps\glslang;$(SolutionDir)\..\..\..\deps\glslang\glslang\Public;$(SolutionDir)\..\..\..\deps\glslang\glslang\MachineIndependent;$(SolutionDir)\..\..\..\deps\glslang\glslang\SPIRV;$(SolutionDir)\..\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)
+ HAVE_OPENGLES2;RARCH_MOBILE;HAVE_GRIFFIN;HAVE_STB_VORBIS;HAVE_LANGEXTRA;ANDROID;HAVE_DYNAMIC;HAVE_OPENGL;HAVE_OVERLAY;HAVE_VIDEO_LAYOUT;HAVE_OPENGLES;HAVE_DYLIB;HAVE_EGL;HAVE_GLSL;HAVE_MENU;HAVE_RGUI;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;INLINE=inline;HAVE_THREADS;__LIBRETRO__;HAVE_RSOUND;HAVE_NETWORKGAMEPAD;HAVE_NETWORKING;RARCH_INTERNAL;HAVE_FILTERS_BUILTIN;HAVE_MATERIALUI;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_IMAGEVIEWER;HAVE_UPDATE_ASSETS;HAVE_CC_RESAMPLER;HAVE_MINIUPNPC;HAVE_BUILTINMINIUPNPC;MINIUPNPC_SET_SOCKET_TIMEOUT;MINIUPNPC_GET_SRC_ADDR;HAVE_KEYMAPPER;HAVE_FLAC;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_CHD;HAVE_RUNAHEAD;ENABLE_HLSL;WANT_IFADDRS;HAVE_7ZIP;HAVE_CHEEVOS;HAVE_SL;FLAC_PACKAGE_VERSION="\"retroarch\"";HAVE_LROUND;FLAC__HAS_OGG=0;DONT_WANT_ARM_OPTIMIZATIONS;__STDC_LIMIT_MACROS;%(PreprocessorDefinitions)
+ Enabled
+
+
+ %(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj.filters b/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj.filters
new file mode 100644
index 0000000000..3ae9a90039
--- /dev/null
+++ b/pkg/android/phoenix64/msvc-2017-android.NativeActivity.vcxproj.filters
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pkg/android/phoenix64/msvc-2017-android.Packaging.androidproj b/pkg/android/phoenix64/msvc-2017-android.Packaging.androidproj
new file mode 100644
index 0000000000..e61050d3de
--- /dev/null
+++ b/pkg/android/phoenix64/msvc-2017-android.Packaging.androidproj
@@ -0,0 +1,154 @@
+
+
+
+
+ Debug
+ ARM
+
+
+ Release
+ ARM
+
+
+ Debug
+ ARM64
+
+
+ Release
+ ARM64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+ Debug
+ x86
+
+
+ Release
+ x86
+
+
+
+ retroarch-activity
+ 14.0
+ 1.0
+ {94b52983-76de-4545-a708-433c377727c7}
+
+
+
+ true
+ Application
+
+
+ false
+ Application
+
+
+ true
+ Application
+
+
+ false
+ Application
+
+
+ true
+ Application
+
+
+ false
+ Application
+
+
+ true
+ Application
+
+
+ false
+ Application
+
+
+
+
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+ $(RootNamespace)
+
+
+
+
+
+
+
+
+ {e27d73ec-6148-4817-b75c-adaa0c563939}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/android/phoenix64/msvc-2017-android.sln b/pkg/android/phoenix64/msvc-2017-android.sln
new file mode 100644
index 0000000000..45919ce71c
--- /dev/null
+++ b/pkg/android/phoenix64/msvc-2017-android.sln
@@ -0,0 +1,72 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msvc-2017-android", "msvc-2017-android", "{82FC602D-4083-4ED5-858B-A066A4280E4C}"
+EndProject
+Project("{39E2626F-3545-4960-A6E8-258AD8476CE5}") = "msvc-2017-android.Packaging", "msvc-2017-android.Packaging.androidproj", "{94B52983-76DE-4545-A708-433C377727C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2017-android.NativeActivity", "msvc-2017-android.NativeActivity.vcxproj", "{E27D73EC-6148-4817-B75C-ADAA0C563939}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM.ActiveCfg = Debug|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM.Build.0 = Debug|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM.Deploy.0 = Debug|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM64.Build.0 = Debug|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x64.ActiveCfg = Debug|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x64.Build.0 = Debug|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x64.Deploy.0 = Debug|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x86.ActiveCfg = Debug|x86
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x86.Build.0 = Debug|x86
+ {94B52983-76DE-4545-A708-433C377727C7}.Debug|x86.Deploy.0 = Debug|x86
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM.ActiveCfg = Release|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM.Build.0 = Release|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM.Deploy.0 = Release|ARM
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM64.ActiveCfg = Release|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM64.Build.0 = Release|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|ARM64.Deploy.0 = Release|ARM64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x64.ActiveCfg = Release|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x64.Build.0 = Release|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x64.Deploy.0 = Release|x64
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x86.ActiveCfg = Release|x86
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x86.Build.0 = Release|x86
+ {94B52983-76DE-4545-A708-433C377727C7}.Release|x86.Deploy.0 = Release|x86
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|ARM.Build.0 = Debug|ARM
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|ARM64.Build.0 = Debug|ARM64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|x64.ActiveCfg = Debug|x64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|x64.Build.0 = Debug|x64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|x86.ActiveCfg = Debug|x86
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Debug|x86.Build.0 = Debug|x86
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|ARM.ActiveCfg = Release|ARM
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|ARM.Build.0 = Release|ARM
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|ARM64.Build.0 = Release|ARM64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|x64.ActiveCfg = Release|x64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|x64.Build.0 = Release|x64
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|x86.ActiveCfg = Release|x86
+ {E27D73EC-6148-4817-B75C-ADAA0C563939}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {94B52983-76DE-4545-A708-433C377727C7} = {82FC602D-4083-4ED5-858B-A066A4280E4C}
+ {E27D73EC-6148-4817-B75C-ADAA0C563939} = {82FC602D-4083-4ED5-858B-A066A4280E4C}
+ EndGlobalSection
+EndGlobal
diff --git a/pkg/android/phoenix64/proguard-project.txt b/pkg/android/phoenix64/proguard-project.txt
new file mode 100644
index 0000000000..f2fe1559a2
--- /dev/null
+++ b/pkg/android/phoenix64/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/pkg/android/phoenix64/project.properties b/pkg/android/phoenix64/project.properties
new file mode 100644
index 0000000000..645b855d3c
--- /dev/null
+++ b/pkg/android/phoenix64/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-26
+android.library.reference.1=libs/googleplay
diff --git a/pkg/android/phoenix64/res/drawable-hdpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..d33d1953f9
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-hdpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix64/res/drawable-ldpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000..555fbd7685
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-ldpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix64/res/drawable-mdpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..a338dfb2f9
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-mdpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix/res64/drawable-xhdpi/banner.png b/pkg/android/phoenix64/res/drawable-xhdpi/banner.png
similarity index 100%
rename from pkg/android/phoenix/res64/drawable-xhdpi/banner.png
rename to pkg/android/phoenix64/res/drawable-xhdpi/banner.png
diff --git a/pkg/android/phoenix64/res/drawable-xhdpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..7eb088dc92
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix64/res/drawable-xhdpi/ouya_icon.png b/pkg/android/phoenix64/res/drawable-xhdpi/ouya_icon.png
new file mode 100644
index 0000000000..50aa7569c0
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-xhdpi/ouya_icon.png differ
diff --git a/pkg/android/phoenix64/res/drawable-xxhdpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..c5a7c34b79
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix64/res/drawable-xxxhdpi/ic_launcher.png b/pkg/android/phoenix64/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..f6abcb638a
Binary files /dev/null and b/pkg/android/phoenix64/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/pkg/android/phoenix64/version_increment.py b/pkg/android/phoenix64/version_increment.py
new file mode 100644
index 0000000000..21a8575828
--- /dev/null
+++ b/pkg/android/phoenix64/version_increment.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+import time
+
+
+from xml.dom.minidom import parse
+dom1 = parse("AndroidManifest.xml")
+oldVersion = dom1.documentElement.getAttribute("android:versionCode")
+versionNumbers = oldVersion.split('.')
+
+versionName = dom1.documentElement.getAttribute("android:versionName")
+versionName = versionName + "_GIT"
+
+versionNumbers[-1] = unicode(int(time.time()))
+dom1.documentElement.setAttribute("android:versionCode", u'.'.join(versionNumbers))
+dom1.documentElement.setAttribute("android:versionName", versionName)
+
+with open("AndroidManifest.xml", 'wb') as f:
+ for line in dom1.toxml("utf-8"):
+ f.write(line)