diff --git a/pkg/android/phoenix/.classpath b/pkg/android/phoenix-legacy/.classpath similarity index 100% rename from pkg/android/phoenix/.classpath rename to pkg/android/phoenix-legacy/.classpath diff --git a/pkg/android/phoenix/.gitignore b/pkg/android/phoenix-legacy/.gitignore similarity index 100% rename from pkg/android/phoenix/.gitignore rename to pkg/android/phoenix-legacy/.gitignore diff --git a/pkg/android/phoenix/.project b/pkg/android/phoenix-legacy/.project similarity index 100% rename from pkg/android/phoenix/.project rename to pkg/android/phoenix-legacy/.project diff --git a/pkg/android/phoenix/.settings/org.eclipse.jdt.core.prefs b/pkg/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from pkg/android/phoenix/.settings/org.eclipse.jdt.core.prefs rename to pkg/android/phoenix-legacy/.settings/org.eclipse.jdt.core.prefs diff --git a/pkg/android/phoenix-legacy/AndroidManifest.xml b/pkg/android/phoenix-legacy/AndroidManifest.xml new file mode 100644 index 0000000000..017bc704fa --- /dev/null +++ b/pkg/android/phoenix-legacy/AndroidManifest.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkg/android/phoenix/ant.properties b/pkg/android/phoenix-legacy/ant.properties similarity index 100% rename from pkg/android/phoenix/ant.properties rename to pkg/android/phoenix-legacy/ant.properties diff --git a/pkg/android/phoenix/build.xml b/pkg/android/phoenix-legacy/build.xml similarity index 100% rename from pkg/android/phoenix/build.xml rename to pkg/android/phoenix-legacy/build.xml diff --git a/pkg/android/phoenix/docs/Building in Eclipse.md b/pkg/android/phoenix-legacy/docs/Building in Eclipse.md similarity index 100% rename from pkg/android/phoenix/docs/Building in Eclipse.md rename to pkg/android/phoenix-legacy/docs/Building in Eclipse.md diff --git a/pkg/android/phoenix/libs/googleplay/.classpath b/pkg/android/phoenix-legacy/libs/googleplay/.classpath similarity index 100% rename from pkg/android/phoenix/libs/googleplay/.classpath rename to pkg/android/phoenix-legacy/libs/googleplay/.classpath diff --git a/pkg/android/phoenix/libs/googleplay/.project b/pkg/android/phoenix-legacy/libs/googleplay/.project similarity index 100% rename from pkg/android/phoenix/libs/googleplay/.project rename to pkg/android/phoenix-legacy/libs/googleplay/.project diff --git a/pkg/android/phoenix/libs/googleplay/.settings/org.eclipse.jdt.core.prefs b/pkg/android/phoenix-legacy/libs/googleplay/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from pkg/android/phoenix/libs/googleplay/.settings/org.eclipse.jdt.core.prefs rename to pkg/android/phoenix-legacy/libs/googleplay/.settings/org.eclipse.jdt.core.prefs diff --git a/pkg/android/phoenix/libs/googleplay/AndroidManifest.xml b/pkg/android/phoenix-legacy/libs/googleplay/AndroidManifest.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/AndroidManifest.xml rename to pkg/android/phoenix-legacy/libs/googleplay/AndroidManifest.xml diff --git a/pkg/android/phoenix/libs/googleplay/README.txt b/pkg/android/phoenix-legacy/libs/googleplay/README.txt similarity index 100% rename from pkg/android/phoenix/libs/googleplay/README.txt rename to pkg/android/phoenix-legacy/libs/googleplay/README.txt diff --git a/pkg/android/phoenix/libs/googleplay/build.xml b/pkg/android/phoenix-legacy/libs/googleplay/build.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/build.xml rename to pkg/android/phoenix-legacy/libs/googleplay/build.xml diff --git a/pkg/android/phoenix/libs/googleplay/libs/google-play-services.jar b/pkg/android/phoenix-legacy/libs/googleplay/libs/google-play-services.jar similarity index 100% rename from pkg/android/phoenix/libs/googleplay/libs/google-play-services.jar rename to pkg/android/phoenix-legacy/libs/googleplay/libs/google-play-services.jar diff --git a/pkg/android/phoenix/libs/googleplay/proguard.txt b/pkg/android/phoenix-legacy/libs/googleplay/proguard.txt similarity index 100% rename from pkg/android/phoenix/libs/googleplay/proguard.txt rename to pkg/android/phoenix-legacy/libs/googleplay/proguard.txt diff --git a/pkg/android/phoenix/libs/googleplay/project.properties b/pkg/android/phoenix-legacy/libs/googleplay/project.properties similarity index 100% rename from pkg/android/phoenix/libs/googleplay/project.properties rename to pkg/android/phoenix-legacy/libs/googleplay/project.properties diff --git a/pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_dark.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_dark.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_dark.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_dark.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_light.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_light.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/color/common_signin_btn_text_light.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/color/common_signin_btn_text_light.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_medium_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_small_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_standard_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-hdpi/ic_plusone_tall_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_medium_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_small_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_standard_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-mdpi/ic_plusone_tall_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_medium_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_small_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_standard_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xhdpi/ic_plusone_tall_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_medium_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_small_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_standard_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable-xxhdpi/ic_plusone_tall_off_client.png diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_dark.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_icon_light.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_dark.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_light.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_light.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/drawable/common_signin_btn_text_light.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/drawable/common_signin_btn_text_light.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-af/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-af/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-af/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-af/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-am/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-am/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-am/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-am/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ar/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ar/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ar/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ar/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-be/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-be/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-be/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-be/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-bg/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-bg/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-bg/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-bg/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ca/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ca/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ca/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ca/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-cs/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-cs/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-cs/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-cs/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-da/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-da/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-da/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-da/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-de/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-de/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-de/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-de/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-el/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-el/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-el/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-el/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-en-rGB/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rGB/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-en-rGB/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rGB/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-en-rIN/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rIN/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-en-rIN/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-en-rIN/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-es-rUS/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-es-rUS/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-es-rUS/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-es-rUS/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-es/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-es/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-es/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-es/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-et-rEE/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-et-rEE/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-et-rEE/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-et-rEE/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-et/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-et/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-et/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-et/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-fa/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-fa/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-fa/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-fa/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-fi/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-fi/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-fi/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-fi/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-fr-rCA/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-fr-rCA/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-fr-rCA/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-fr-rCA/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-fr/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-fr/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-fr/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-fr/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-hi/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-hi/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-hi/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-hi/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-hr/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-hr/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-hr/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-hr/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-hu/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-hu/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-hu/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-hu/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-hy-rAM/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-hy-rAM/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-hy-rAM/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-hy-rAM/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-in/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-in/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-in/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-in/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-it/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-it/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-it/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-it/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-iw/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-iw/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-iw/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-iw/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ja/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ja/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ja/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ja/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ka-rGE/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ka-rGE/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ka-rGE/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ka-rGE/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-km-rKH/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-km-rKH/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-km-rKH/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-km-rKH/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ko/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ko/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ko/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ko/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-lo-rLA/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-lo-rLA/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-lo-rLA/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-lo-rLA/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-lt/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-lt/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-lt/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-lt/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-lv/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-lv/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-lv/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-lv/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-mn-rMN/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-mn-rMN/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-mn-rMN/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-mn-rMN/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ms-rMY/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ms-rMY/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ms-rMY/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ms-rMY/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ms/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ms/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ms/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ms/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-nb/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-nb/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-nb/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-nb/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-nl/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-nl/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-nl/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-nl/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-pl/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-pl/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-pl/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-pl/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-pt-rBR/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rBR/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-pt-rBR/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rBR/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-pt-rPT/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rPT/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-pt-rPT/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-pt-rPT/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-pt/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-pt/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-pt/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-pt/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ro/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ro/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ro/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ro/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-ru/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-ru/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-ru/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-ru/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-sk/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-sk/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-sk/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-sk/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-sl/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-sl/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-sl/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-sl/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-sr/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-sr/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-sr/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-sr/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-sv/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-sv/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-sv/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-sv/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-sw/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-sw/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-sw/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-sw/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-th/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-th/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-th/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-th/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-tl/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-tl/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-tl/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-tl/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-tr/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-tr/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-tr/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-tr/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-uk/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-uk/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-uk/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-uk/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-vi/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-vi/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-vi/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-vi/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-zh-rCN/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rCN/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-zh-rCN/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rCN/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-zh-rHK/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rHK/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-zh-rHK/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rHK/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-zh-rTW/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rTW/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-zh-rTW/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-zh-rTW/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values-zu/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values-zu/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values-zu/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values-zu/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values/ads_attrs.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values/ads_attrs.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values/ads_attrs.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values/ads_attrs.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values/colors.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values/colors.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values/colors.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values/colors.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values/maps_attrs.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values/maps_attrs.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values/maps_attrs.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values/maps_attrs.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values/strings.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values/strings.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values/strings.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values/strings.xml diff --git a/pkg/android/phoenix/libs/googleplay/res/values/version.xml b/pkg/android/phoenix-legacy/libs/googleplay/res/values/version.xml similarity index 100% rename from pkg/android/phoenix/libs/googleplay/res/values/version.xml rename to pkg/android/phoenix-legacy/libs/googleplay/res/values/version.xml diff --git a/pkg/android/phoenix/libs/googleplay/src/android/.readme b/pkg/android/phoenix-legacy/libs/googleplay/src/android/.readme similarity index 100% rename from pkg/android/phoenix/libs/googleplay/src/android/.readme rename to pkg/android/phoenix-legacy/libs/googleplay/src/android/.readme diff --git a/pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj b/pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj similarity index 100% rename from pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj rename to pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj diff --git a/pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj.filters b/pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj.filters similarity index 100% rename from pkg/android/phoenix/msvc-2017-android.NativeActivity.vcxproj.filters rename to pkg/android/phoenix-legacy/msvc-2017-android.NativeActivity.vcxproj.filters diff --git a/pkg/android/phoenix/msvc-2017-android.Packaging.androidproj b/pkg/android/phoenix-legacy/msvc-2017-android.Packaging.androidproj similarity index 100% rename from pkg/android/phoenix/msvc-2017-android.Packaging.androidproj rename to pkg/android/phoenix-legacy/msvc-2017-android.Packaging.androidproj diff --git a/pkg/android/phoenix/msvc-2017-android.sln b/pkg/android/phoenix-legacy/msvc-2017-android.sln similarity index 100% rename from pkg/android/phoenix/msvc-2017-android.sln rename to pkg/android/phoenix-legacy/msvc-2017-android.sln diff --git a/pkg/android/phoenix/proguard-project.txt b/pkg/android/phoenix-legacy/proguard-project.txt similarity index 100% rename from pkg/android/phoenix/proguard-project.txt rename to pkg/android/phoenix-legacy/proguard-project.txt diff --git a/pkg/android/phoenix/project.properties b/pkg/android/phoenix-legacy/project.properties similarity index 97% rename from pkg/android/phoenix/project.properties rename to pkg/android/phoenix-legacy/project.properties index 645b855d3c..2bb7b45d10 100644 --- a/pkg/android/phoenix/project.properties +++ b/pkg/android/phoenix-legacy/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-26 +target=android-16 android.library.reference.1=libs/googleplay 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 new file mode 100644 index 0000000000..37a4ee7b37 --- /dev/null +++ b/pkg/android/phoenix-legacy/src/com/retroarch/browser/debug/CoreSideloadActivity.java @@ -0,0 +1,182 @@ +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 new file mode 100644 index 0000000000..996cfa236c --- /dev/null +++ b/pkg/android/phoenix-legacy/src/com/retroarch/browser/mainmenu/MainMenuActivity.java @@ -0,0 +1,191 @@ +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 new file mode 100644 index 0000000000..4125a3e2a8 --- /dev/null +++ b/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java @@ -0,0 +1,315 @@ +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/src/com/retroarch/browser/retroactivity/RetroActivityPast.java b/pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityPast.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityPast.java rename to pkg/android/phoenix-legacy/src/com/retroarch/browser/retroactivity/RetroActivityPast.java diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml index 100057ca7b..86a8963d47 100644 --- a/pkg/android/phoenix/AndroidManifest.xml +++ b/pkg/android/phoenix/AndroidManifest.xml @@ -36,10 +36,6 @@ - - - - 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 76d255c43f..71cbcf5200 100644 --- a/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java +++ b/pkg/android/phoenix/src/com/retroarch/browser/debug/CoreSideloadActivity.java @@ -14,7 +14,6 @@ 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; @@ -153,16 +152,7 @@ public class CoreSideloadActivity extends Activity progressTextView.setText("Done!"); // Run RA with our newly sideloaded core (and content) - Intent retro; - - if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)) - { - retro = new Intent(ctx, RetroActivityFuture.class); - } - else - { - retro = new Intent(ctx, RetroActivityPast.class); - } + Intent retro = new Intent(ctx, RetroActivityFuture.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 537fee43cc..e67799373a 100644 --- a/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java +++ b/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java @@ -2,7 +2,6 @@ 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; @@ -116,16 +115,7 @@ public final class MainMenuActivity extends PreferenceActivity public void finalStartup() { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - Intent retro; - - if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)) - { - retro = new Intent(this, RetroActivityFuture.class); - } - else - { - retro = new Intent(this, RetroActivityPast.class); - } + Intent retro = new Intent(this, RetroActivityFuture.class); retro.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); 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 9fedbf2e7b..4125a3e2a8 100644 --- a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java +++ b/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java @@ -18,8 +18,7 @@ import android.widget.Toast; /** * Class that implements location-based functionality for - * the {@link RetroActivityFuture} and {@link RetroActivityPast} - * activities. + * the {@link RetroActivityFuture} activity. */ public class RetroActivityLocation extends NativeActivity implements ConnectionCallbacks, OnConnectionFailedListener, LocationListener