From f451c5e26fd5a8d4187f7a2abd87f3f4675a6394 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Fri, 20 Jul 2018 15:01:48 -0400 Subject: [PATCH 01/11] Android: friendly internal project name, gradle update --- .../{app => reicast}/build.gradle | 18 +++++++++--------- .../libs/com.bda.controller.jar | Bin .../libs/dropbox-android-sdk-1.6.1.jar | Bin .../{app => reicast}/libs/image-uniload.jar | Bin .../{app => reicast}/libs/ouya-sdk.jar | Bin .../src/main/AndroidManifest.xml | 0 .../reicast/src/main/assets/build | 1 + .../src/main/assets/buttons.png | Bin .../main/java/com/android/util/DreamTime.java | 0 .../main/java/com/android/util/FileUtils.java | 0 .../com/reicast/emulator/AboutFragment.java | 0 .../com/reicast/emulator/CloudFragment.java | 0 .../java/com/reicast/emulator/Emulator.java | 0 .../com/reicast/emulator/FileBrowser.java | 0 .../com/reicast/emulator/GL2JNIActivity.java | 0 .../com/reicast/emulator/GL2JNINative.java | 0 .../com/reicast/emulator/MainActivity.java | 0 .../java/com/reicast/emulator/XMLParser.java | 0 .../com/reicast/emulator/config/Config.java | 0 .../emulator/config/EditVJoyActivity.java | 0 .../emulator/config/InputFragment.java | 0 .../emulator/config/InputModFragment.java | 0 .../emulator/config/OptionsFragment.java | 0 .../reicast/emulator/debug/GenerateLogs.java | 0 .../reicast/emulator/debug/GitAdapter.java | 0 .../com/reicast/emulator/emu/GL2JNIView.java | 0 .../com/reicast/emulator/emu/GLCFactory.java | 0 .../reicast/emulator/emu/GLCFactory14.java | 0 .../java/com/reicast/emulator/emu/JNIdc.java | 0 .../reicast/emulator/emu/OnScreenMenu.java | 0 .../com/reicast/emulator/periph/Gamepad.java | 0 .../reicast/emulator/periph/MOGAInput.java | 0 .../com/reicast/emulator/periph/MogaHack.java | 0 .../reicast/emulator/periph/SipEmulator.java | 0 .../com/reicast/emulator/periph/VJoy.java | 0 .../com/reicast/emulator/periph/VmuLcd.java | 0 .../{app => reicast}/src/main/jni/Android.mk | 0 .../src/main/jni/Application.mk | 0 .../src/main/jni/src/Android.cpp | 0 .../src/main/jni/src/XperiaPlay.c | 0 .../src/main/jni/src/utils.cpp | 0 .../{app => reicast}/src/main/jni/src/utils.h | 0 .../res/drawable-hdpi/ic_action_search.png | Bin .../src/main/res/drawable-hdpi/ic_drawer.png | Bin .../src/main/res/drawable-hdpi/ic_github.png | Bin .../main/res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-hdpi/ic_notification.png | Bin .../src/main/res/drawable-ldpi/ic_drawer.png | Bin .../src/main/res/drawable-ldpi/ic_github.png | Bin .../main/res/drawable-ldpi/ic_launcher.png | Bin .../res/drawable-ldpi/ic_notification.png | Bin .../res/drawable-mdpi/ic_action_search.png | Bin .../src/main/res/drawable-mdpi/ic_drawer.png | Bin .../src/main/res/drawable-mdpi/ic_github.png | Bin .../main/res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-mdpi/ic_notification.png | Bin .../main/res/drawable-mdpi/side_nav_bar.xml | 0 .../res/drawable-xhdpi/ic_action_search.png | Bin .../src/main/res/drawable-xhdpi/ic_github.png | Bin .../main/res/drawable-xhdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_notification.png | Bin .../src/main/res/drawable-xhdpi/ouya_icon.png | Bin .../main/res/drawable-xxhdpi/ic_github.png | Bin .../main/res/drawable-xxhdpi/ic_launcher.png | Bin .../res/drawable-xxhdpi/ic_notification.png | Bin .../src/main/res/drawable/apply.png | Bin .../src/main/res/drawable/background.xml | 0 .../src/main/res/drawable/cd.png | Bin .../src/main/res/drawable/chd.png | Bin .../src/main/res/drawable/clear_cache.png | Bin .../src/main/res/drawable/close.png | Bin .../src/main/res/drawable/cloud.png | Bin .../src/main/res/drawable/cloud_big.png | Bin .../src/main/res/drawable/config.png | Bin .../src/main/res/drawable/debug.png | Bin .../src/main/res/drawable/disc.png | Bin .../src/main/res/drawable/disk_swap.png | Bin .../src/main/res/drawable/disk_unknown.png | Bin .../src/main/res/drawable/enable_sound.png | Bin .../src/main/res/drawable/frames_down.png | Bin .../main/res/drawable/frames_limit_off.png | Bin .../src/main/res/drawable/frames_limit_on.png | Bin .../src/main/res/drawable/frames_up.png | Bin .../src/main/res/drawable/game_selector.xml | 0 .../src/main/res/drawable/gdi.png | Bin .../src/main/res/drawable/gradient_bg.xml | 0 .../main/res/drawable/gradient_bg_hover.xml | 0 .../src/main/res/drawable/ic_banner.png | Bin .../src/main/res/drawable/ic_cloud_queue.xml | 0 .../res/drawable/ic_folder_black_24dp.xml | 0 .../src/main/res/drawable/ic_info_outline.xml | 0 .../src/main/res/drawable/ic_input.xml | 0 .../src/main/res/drawable/ic_rate_review.xml | 0 .../src/main/res/drawable/ic_send.xml | 0 .../src/main/res/drawable/ic_settings.xml | 0 .../drawable/ic_subdirectory_arrow_right.xml | 0 .../src/main/res/drawable/image_bg.xml | 0 .../src/main/res/drawable/input.png | Bin .../main/res/drawable/list_item_border.xml | 0 .../src/main/res/drawable/list_selector.xml | 0 .../src/main/res/drawable/menuback.png | Bin .../src/main/res/drawable/menutile.png | Bin .../src/main/res/drawable/mic_icon.png | Bin .../src/main/res/drawable/mute_sound.png | Bin .../src/main/res/drawable/normal_view.png | Bin .../src/main/res/drawable/open_folder.png | Bin .../src/main/res/drawable/print_stats.png | Bin .../src/main/res/drawable/profiler.png | Bin .../src/main/res/drawable/question.png | Bin .../src/main/res/drawable/reset.png | Bin .../src/main/res/drawable/rounded.xml | 0 .../src/main/res/drawable/shadow.xml | 0 .../src/main/res/drawable/star.png | Bin .../src/main/res/drawable/toggle_a_b.png | Bin .../src/main/res/drawable/toggle_r_l.png | Bin .../src/main/res/drawable/up.png | Bin .../src/main/res/drawable/vmu_swap.png | Bin .../src/main/res/drawable/widescreen.png | Bin .../res/layout-v14/configure_fragment.xml | 0 .../main/res/layout-v14/input_fragment.xml | 0 .../res/layout-v14/input_mod_fragment.xml | 0 .../src/main/res/layout/about_fragment.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/app_bar_main.xml | 0 .../src/main/res/layout/bios_list_item.xml | 0 .../src/main/res/layout/browser_fragment.xml | 0 .../res/layout/browser_fragment_header.xml | 0 .../main/res/layout/browser_fragment_item.xml | 0 .../src/main/res/layout/change_item.xml | 0 .../src/main/res/layout/cloud_fragment.xml | 0 .../main/res/layout/configure_fragment.xml | 0 .../src/main/res/layout/content_main.xml | 0 .../src/main/res/layout/dialog_item.xml | 0 .../src/main/res/layout/input_fragment.xml | 0 .../main/res/layout/input_mod_fragment.xml | 0 .../src/main/res/layout/menu_popup_config.xml | 0 .../src/main/res/layout/menu_popup_debug.xml | 0 .../src/main/res/layout/menu_popup_main.xml | 0 .../src/main/res/layout/nav_header_main.xml | 0 .../src/main/res/layout/spinner_selected.xml | 0 .../src/main/res/layout/webview.xml | 0 .../src/main/res/menu-v23/activity_main.xml | 0 .../src/main/res/menu/activity_main.xml | 0 .../src/main/res/mipmap/menu_cloud.png | Bin .../src/main/res/mipmap/menu_config.png | Bin .../src/main/res/mipmap/menu_debug.png | Bin .../src/main/res/mipmap/menu_disk_unknown.png | Bin .../src/main/res/mipmap/menu_input.png | Bin .../src/main/res/mipmap/menu_question.png | Bin .../src/main/res/mipmap/menu_star.png | Bin .../src/main/res/values-da/strings.xml | 0 .../src/main/res/values-de/strings.xml | 0 .../src/main/res/values-es/strings.xml | 0 .../src/main/res/values-fr/strings.xml | 0 .../src/main/res/values-it/strings.xml | 0 .../src/main/res/values-jp/strings.xml | 0 .../src/main/res/values-ko/strings.xml | 0 .../src/main/res/values-large/dimens.xml | 0 .../src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt/strings.xml | 0 .../src/main/res/values-ru/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh/strings.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/donottranslate.xml | 0 .../src/main/res/values/ids.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 shell/android-studio/settings.gradle | 2 +- 170 files changed, 11 insertions(+), 10 deletions(-) rename shell/android-studio/{app => reicast}/build.gradle (80%) rename shell/android-studio/{app => reicast}/libs/com.bda.controller.jar (100%) rename shell/android-studio/{app => reicast}/libs/dropbox-android-sdk-1.6.1.jar (100%) rename shell/android-studio/{app => reicast}/libs/image-uniload.jar (100%) rename shell/android-studio/{app => reicast}/libs/ouya-sdk.jar (100%) rename shell/android-studio/{app => reicast}/src/main/AndroidManifest.xml (100%) create mode 100644 shell/android-studio/reicast/src/main/assets/build rename shell/android-studio/{app => reicast}/src/main/assets/buttons.png (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/android/util/DreamTime.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/android/util/FileUtils.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/AboutFragment.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/CloudFragment.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/Emulator.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/FileBrowser.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/GL2JNIActivity.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/GL2JNINative.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/MainActivity.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/XMLParser.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/config/Config.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/config/InputFragment.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/config/InputModFragment.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/config/OptionsFragment.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/debug/GenerateLogs.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/debug/GitAdapter.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/emu/GL2JNIView.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/emu/GLCFactory.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/emu/GLCFactory14.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/emu/JNIdc.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/Gamepad.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/MOGAInput.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/MogaHack.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/SipEmulator.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/VJoy.java (100%) rename shell/android-studio/{app => reicast}/src/main/java/com/reicast/emulator/periph/VmuLcd.java (100%) rename shell/android-studio/{app => reicast}/src/main/jni/Android.mk (100%) rename shell/android-studio/{app => reicast}/src/main/jni/Application.mk (100%) rename shell/android-studio/{app => reicast}/src/main/jni/src/Android.cpp (100%) rename shell/android-studio/{app => reicast}/src/main/jni/src/XperiaPlay.c (100%) rename shell/android-studio/{app => reicast}/src/main/jni/src/utils.cpp (100%) rename shell/android-studio/{app => reicast}/src/main/jni/src/utils.h (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-hdpi/ic_action_search.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-hdpi/ic_drawer.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-hdpi/ic_github.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-hdpi/ic_notification.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-ldpi/ic_drawer.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-ldpi/ic_github.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-ldpi/ic_launcher.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-ldpi/ic_notification.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/ic_action_search.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/ic_drawer.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/ic_github.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/ic_notification.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-mdpi/side_nav_bar.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xhdpi/ic_action_search.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xhdpi/ic_github.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xhdpi/ic_notification.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xhdpi/ouya_icon.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xxhdpi/ic_github.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable-xxhdpi/ic_notification.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/apply.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/background.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/cd.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/chd.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/clear_cache.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/close.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/cloud.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/cloud_big.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/config.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/debug.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/disc.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/disk_swap.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/disk_unknown.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/enable_sound.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/frames_down.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/frames_limit_off.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/frames_limit_on.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/frames_up.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/game_selector.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/gdi.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/gradient_bg.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/gradient_bg_hover.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_banner.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_cloud_queue.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_folder_black_24dp.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_info_outline.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_input.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_rate_review.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_send.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_settings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/ic_subdirectory_arrow_right.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/image_bg.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/input.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/list_item_border.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/list_selector.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/menuback.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/menutile.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/mic_icon.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/mute_sound.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/normal_view.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/open_folder.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/print_stats.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/profiler.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/question.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/reset.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/rounded.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/shadow.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/star.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/toggle_a_b.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/toggle_r_l.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/up.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/vmu_swap.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/drawable/widescreen.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout-v14/configure_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout-v14/input_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout-v14/input_mod_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/about_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/activity_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/app_bar_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/bios_list_item.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/browser_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/browser_fragment_header.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/browser_fragment_item.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/change_item.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/cloud_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/configure_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/content_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/dialog_item.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/input_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/input_mod_fragment.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/menu_popup_config.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/menu_popup_debug.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/menu_popup_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/nav_header_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/spinner_selected.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/layout/webview.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/menu-v23/activity_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/menu/activity_main.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_cloud.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_config.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_debug.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_disk_unknown.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_input.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_question.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/mipmap/menu_star.png (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-da/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-de/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-es/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-fr/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-it/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-jp/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-ko/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-large/dimens.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-pl/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-pt/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-ru/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-zh-rCN/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values-zh/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/colors.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/dimens.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/donottranslate.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/ids.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/strings.xml (100%) rename shell/android-studio/{app => reicast}/src/main/res/values/styles.xml (100%) diff --git a/shell/android-studio/app/build.gradle b/shell/android-studio/reicast/build.gradle similarity index 80% rename from shell/android-studio/app/build.gradle rename to shell/android-studio/reicast/build.gradle index 3aae870bb..7279fc337 100644 --- a/shell/android-studio/app/build.gradle +++ b/shell/android-studio/reicast/build.gradle @@ -85,16 +85,16 @@ play { } dependencies { - compile 'com.android.support:support-v4:25.4.0' - compile 'com.android.support:appcompat-v7:25.4.0' - compile 'com.android.support:design:25.4.0' - compile 'com.android.support.constraint:constraint-layout:1.1.2' - compile 'org.bouncycastle:bcprov-jdk16:1.46' - compile 'commons-io:commons-io:2.6' - compile 'org.apache.commons:commons-lang3:3.7' - compile ('com.googlecode.json-simple:json-simple:1.1.1') { + implementation 'com.android.support:support-v4:25.4.0' + implementation 'com.android.support:appcompat-v7:25.4.0' + implementation 'com.android.support:design:25.4.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'org.bouncycastle:bcprov-jdk16:1.46' + implementation 'commons-io:commons-io:2.6' + implementation 'org.apache.commons:commons-lang3:3.7' + implementation ('com.googlecode.json-simple:json-simple:1.1.1') { exclude module: 'junit' } - compile fileTree(include: ['*.jar'], dir: 'libs') + implementation fileTree(include: ['*.jar'], dir: 'libs') } diff --git a/shell/android-studio/app/libs/com.bda.controller.jar b/shell/android-studio/reicast/libs/com.bda.controller.jar similarity index 100% rename from shell/android-studio/app/libs/com.bda.controller.jar rename to shell/android-studio/reicast/libs/com.bda.controller.jar diff --git a/shell/android-studio/app/libs/dropbox-android-sdk-1.6.1.jar b/shell/android-studio/reicast/libs/dropbox-android-sdk-1.6.1.jar similarity index 100% rename from shell/android-studio/app/libs/dropbox-android-sdk-1.6.1.jar rename to shell/android-studio/reicast/libs/dropbox-android-sdk-1.6.1.jar diff --git a/shell/android-studio/app/libs/image-uniload.jar b/shell/android-studio/reicast/libs/image-uniload.jar similarity index 100% rename from shell/android-studio/app/libs/image-uniload.jar rename to shell/android-studio/reicast/libs/image-uniload.jar diff --git a/shell/android-studio/app/libs/ouya-sdk.jar b/shell/android-studio/reicast/libs/ouya-sdk.jar similarity index 100% rename from shell/android-studio/app/libs/ouya-sdk.jar rename to shell/android-studio/reicast/libs/ouya-sdk.jar diff --git a/shell/android-studio/app/src/main/AndroidManifest.xml b/shell/android-studio/reicast/src/main/AndroidManifest.xml similarity index 100% rename from shell/android-studio/app/src/main/AndroidManifest.xml rename to shell/android-studio/reicast/src/main/AndroidManifest.xml diff --git a/shell/android-studio/reicast/src/main/assets/build b/shell/android-studio/reicast/src/main/assets/build new file mode 100644 index 000000000..28a55ddd6 --- /dev/null +++ b/shell/android-studio/reicast/src/main/assets/build @@ -0,0 +1 @@ +9891979f2c0e9e9e8a8975e16aea9b4e943bd3aa \ No newline at end of file diff --git a/shell/android-studio/app/src/main/assets/buttons.png b/shell/android-studio/reicast/src/main/assets/buttons.png similarity index 100% rename from shell/android-studio/app/src/main/assets/buttons.png rename to shell/android-studio/reicast/src/main/assets/buttons.png diff --git a/shell/android-studio/app/src/main/java/com/android/util/DreamTime.java b/shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/android/util/DreamTime.java rename to shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java diff --git a/shell/android-studio/app/src/main/java/com/android/util/FileUtils.java b/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/android/util/FileUtils.java rename to shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/AboutFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/AboutFragment.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/CloudFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/CloudFragment.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/Emulator.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/Emulator.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/GL2JNIActivity.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/GL2JNINative.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/GL2JNINative.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/MainActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/MainActivity.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/XMLParser.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/XMLParser.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/XMLParser.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/XMLParser.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Config.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Config.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/InputFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/InputFragment.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/config/InputFragment.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/InputFragment.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/InputModFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/InputModFragment.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/config/InputModFragment.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/InputModFragment.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/OptionsFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/config/OptionsFragment.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GitAdapter.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GitAdapter.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GL2JNIView.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GLCFactory.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GLCFactory.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GLCFactory14.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/emu/GLCFactory14.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/emu/JNIdc.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/emu/JNIdc.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/Gamepad.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/Gamepad.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/Gamepad.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/Gamepad.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/MOGAInput.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/MOGAInput.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/MOGAInput.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/MOGAInput.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/MogaHack.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/MogaHack.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/MogaHack.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/MogaHack.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/SipEmulator.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/SipEmulator.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/SipEmulator.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/SipEmulator.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/VJoy.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VJoy.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/VJoy.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VJoy.java diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/periph/VmuLcd.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VmuLcd.java similarity index 100% rename from shell/android-studio/app/src/main/java/com/reicast/emulator/periph/VmuLcd.java rename to shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VmuLcd.java diff --git a/shell/android-studio/app/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk similarity index 100% rename from shell/android-studio/app/src/main/jni/Android.mk rename to shell/android-studio/reicast/src/main/jni/Android.mk diff --git a/shell/android-studio/app/src/main/jni/Application.mk b/shell/android-studio/reicast/src/main/jni/Application.mk similarity index 100% rename from shell/android-studio/app/src/main/jni/Application.mk rename to shell/android-studio/reicast/src/main/jni/Application.mk diff --git a/shell/android-studio/app/src/main/jni/src/Android.cpp b/shell/android-studio/reicast/src/main/jni/src/Android.cpp similarity index 100% rename from shell/android-studio/app/src/main/jni/src/Android.cpp rename to shell/android-studio/reicast/src/main/jni/src/Android.cpp diff --git a/shell/android-studio/app/src/main/jni/src/XperiaPlay.c b/shell/android-studio/reicast/src/main/jni/src/XperiaPlay.c similarity index 100% rename from shell/android-studio/app/src/main/jni/src/XperiaPlay.c rename to shell/android-studio/reicast/src/main/jni/src/XperiaPlay.c diff --git a/shell/android-studio/app/src/main/jni/src/utils.cpp b/shell/android-studio/reicast/src/main/jni/src/utils.cpp similarity index 100% rename from shell/android-studio/app/src/main/jni/src/utils.cpp rename to shell/android-studio/reicast/src/main/jni/src/utils.cpp diff --git a/shell/android-studio/app/src/main/jni/src/utils.h b/shell/android-studio/reicast/src/main/jni/src/utils.h similarity index 100% rename from shell/android-studio/app/src/main/jni/src/utils.h rename to shell/android-studio/reicast/src/main/jni/src/utils.h diff --git a/shell/android-studio/app/src/main/res/drawable-hdpi/ic_action_search.png b/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-hdpi/ic_action_search.png rename to shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/shell/android-studio/app/src/main/res/drawable-hdpi/ic_drawer.png b/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-hdpi/ic_drawer.png rename to shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/shell/android-studio/app/src/main/res/drawable-hdpi/ic_github.png b/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_github.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-hdpi/ic_github.png rename to shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_github.png diff --git a/shell/android-studio/app/src/main/res/drawable-hdpi/ic_launcher.png b/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-hdpi/ic_launcher.png rename to shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/shell/android-studio/app/src/main/res/drawable-hdpi/ic_notification.png b/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-hdpi/ic_notification.png rename to shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_notification.png diff --git a/shell/android-studio/app/src/main/res/drawable-ldpi/ic_drawer.png b/shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_drawer.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-ldpi/ic_drawer.png rename to shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_drawer.png diff --git a/shell/android-studio/app/src/main/res/drawable-ldpi/ic_github.png b/shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_github.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-ldpi/ic_github.png rename to shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_github.png diff --git a/shell/android-studio/app/src/main/res/drawable-ldpi/ic_launcher.png b/shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-ldpi/ic_launcher.png rename to shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/shell/android-studio/app/src/main/res/drawable-ldpi/ic_notification.png b/shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_notification.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-ldpi/ic_notification.png rename to shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_notification.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/ic_action_search.png b/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/ic_action_search.png rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/ic_drawer.png b/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/ic_drawer.png rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/ic_github.png b/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_github.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/ic_github.png rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_github.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/ic_launcher.png b/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/ic_launcher.png rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/ic_notification.png b/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/ic_notification.png rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_notification.png diff --git a/shell/android-studio/app/src/main/res/drawable-mdpi/side_nav_bar.xml b/shell/android-studio/reicast/src/main/res/drawable-mdpi/side_nav_bar.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-mdpi/side_nav_bar.xml rename to shell/android-studio/reicast/src/main/res/drawable-mdpi/side_nav_bar.xml diff --git a/shell/android-studio/app/src/main/res/drawable-xhdpi/ic_action_search.png b/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xhdpi/ic_action_search.png rename to shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/shell/android-studio/app/src/main/res/drawable-xhdpi/ic_github.png b/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_github.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xhdpi/ic_github.png rename to shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_github.png diff --git a/shell/android-studio/app/src/main/res/drawable-xhdpi/ic_launcher.png b/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/shell/android-studio/app/src/main/res/drawable-xhdpi/ic_notification.png b/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xhdpi/ic_notification.png rename to shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/shell/android-studio/app/src/main/res/drawable-xhdpi/ouya_icon.png b/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ouya_icon.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xhdpi/ouya_icon.png rename to shell/android-studio/reicast/src/main/res/drawable-xhdpi/ouya_icon.png diff --git a/shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_github.png b/shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_github.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_github.png rename to shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_github.png diff --git a/shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_launcher.png rename to shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_notification.png b/shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable-xxhdpi/ic_notification.png rename to shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/shell/android-studio/app/src/main/res/drawable/apply.png b/shell/android-studio/reicast/src/main/res/drawable/apply.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/apply.png rename to shell/android-studio/reicast/src/main/res/drawable/apply.png diff --git a/shell/android-studio/app/src/main/res/drawable/background.xml b/shell/android-studio/reicast/src/main/res/drawable/background.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/background.xml rename to shell/android-studio/reicast/src/main/res/drawable/background.xml diff --git a/shell/android-studio/app/src/main/res/drawable/cd.png b/shell/android-studio/reicast/src/main/res/drawable/cd.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/cd.png rename to shell/android-studio/reicast/src/main/res/drawable/cd.png diff --git a/shell/android-studio/app/src/main/res/drawable/chd.png b/shell/android-studio/reicast/src/main/res/drawable/chd.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/chd.png rename to shell/android-studio/reicast/src/main/res/drawable/chd.png diff --git a/shell/android-studio/app/src/main/res/drawable/clear_cache.png b/shell/android-studio/reicast/src/main/res/drawable/clear_cache.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/clear_cache.png rename to shell/android-studio/reicast/src/main/res/drawable/clear_cache.png diff --git a/shell/android-studio/app/src/main/res/drawable/close.png b/shell/android-studio/reicast/src/main/res/drawable/close.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/close.png rename to shell/android-studio/reicast/src/main/res/drawable/close.png diff --git a/shell/android-studio/app/src/main/res/drawable/cloud.png b/shell/android-studio/reicast/src/main/res/drawable/cloud.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/cloud.png rename to shell/android-studio/reicast/src/main/res/drawable/cloud.png diff --git a/shell/android-studio/app/src/main/res/drawable/cloud_big.png b/shell/android-studio/reicast/src/main/res/drawable/cloud_big.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/cloud_big.png rename to shell/android-studio/reicast/src/main/res/drawable/cloud_big.png diff --git a/shell/android-studio/app/src/main/res/drawable/config.png b/shell/android-studio/reicast/src/main/res/drawable/config.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/config.png rename to shell/android-studio/reicast/src/main/res/drawable/config.png diff --git a/shell/android-studio/app/src/main/res/drawable/debug.png b/shell/android-studio/reicast/src/main/res/drawable/debug.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/debug.png rename to shell/android-studio/reicast/src/main/res/drawable/debug.png diff --git a/shell/android-studio/app/src/main/res/drawable/disc.png b/shell/android-studio/reicast/src/main/res/drawable/disc.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/disc.png rename to shell/android-studio/reicast/src/main/res/drawable/disc.png diff --git a/shell/android-studio/app/src/main/res/drawable/disk_swap.png b/shell/android-studio/reicast/src/main/res/drawable/disk_swap.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/disk_swap.png rename to shell/android-studio/reicast/src/main/res/drawable/disk_swap.png diff --git a/shell/android-studio/app/src/main/res/drawable/disk_unknown.png b/shell/android-studio/reicast/src/main/res/drawable/disk_unknown.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/disk_unknown.png rename to shell/android-studio/reicast/src/main/res/drawable/disk_unknown.png diff --git a/shell/android-studio/app/src/main/res/drawable/enable_sound.png b/shell/android-studio/reicast/src/main/res/drawable/enable_sound.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/enable_sound.png rename to shell/android-studio/reicast/src/main/res/drawable/enable_sound.png diff --git a/shell/android-studio/app/src/main/res/drawable/frames_down.png b/shell/android-studio/reicast/src/main/res/drawable/frames_down.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/frames_down.png rename to shell/android-studio/reicast/src/main/res/drawable/frames_down.png diff --git a/shell/android-studio/app/src/main/res/drawable/frames_limit_off.png b/shell/android-studio/reicast/src/main/res/drawable/frames_limit_off.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/frames_limit_off.png rename to shell/android-studio/reicast/src/main/res/drawable/frames_limit_off.png diff --git a/shell/android-studio/app/src/main/res/drawable/frames_limit_on.png b/shell/android-studio/reicast/src/main/res/drawable/frames_limit_on.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/frames_limit_on.png rename to shell/android-studio/reicast/src/main/res/drawable/frames_limit_on.png diff --git a/shell/android-studio/app/src/main/res/drawable/frames_up.png b/shell/android-studio/reicast/src/main/res/drawable/frames_up.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/frames_up.png rename to shell/android-studio/reicast/src/main/res/drawable/frames_up.png diff --git a/shell/android-studio/app/src/main/res/drawable/game_selector.xml b/shell/android-studio/reicast/src/main/res/drawable/game_selector.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/game_selector.xml rename to shell/android-studio/reicast/src/main/res/drawable/game_selector.xml diff --git a/shell/android-studio/app/src/main/res/drawable/gdi.png b/shell/android-studio/reicast/src/main/res/drawable/gdi.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/gdi.png rename to shell/android-studio/reicast/src/main/res/drawable/gdi.png diff --git a/shell/android-studio/app/src/main/res/drawable/gradient_bg.xml b/shell/android-studio/reicast/src/main/res/drawable/gradient_bg.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/gradient_bg.xml rename to shell/android-studio/reicast/src/main/res/drawable/gradient_bg.xml diff --git a/shell/android-studio/app/src/main/res/drawable/gradient_bg_hover.xml b/shell/android-studio/reicast/src/main/res/drawable/gradient_bg_hover.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/gradient_bg_hover.xml rename to shell/android-studio/reicast/src/main/res/drawable/gradient_bg_hover.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_banner.png b/shell/android-studio/reicast/src/main/res/drawable/ic_banner.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_banner.png rename to shell/android-studio/reicast/src/main/res/drawable/ic_banner.png diff --git a/shell/android-studio/app/src/main/res/drawable/ic_cloud_queue.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_cloud_queue.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_cloud_queue.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_cloud_queue.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_folder_black_24dp.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_folder_black_24dp.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_folder_black_24dp.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_folder_black_24dp.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_info_outline.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_info_outline.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_info_outline.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_info_outline.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_input.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_input.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_input.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_input.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_rate_review.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_rate_review.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_rate_review.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_rate_review.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_send.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_send.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_send.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_send.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_settings.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_settings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_settings.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_settings.xml diff --git a/shell/android-studio/app/src/main/res/drawable/ic_subdirectory_arrow_right.xml b/shell/android-studio/reicast/src/main/res/drawable/ic_subdirectory_arrow_right.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/ic_subdirectory_arrow_right.xml rename to shell/android-studio/reicast/src/main/res/drawable/ic_subdirectory_arrow_right.xml diff --git a/shell/android-studio/app/src/main/res/drawable/image_bg.xml b/shell/android-studio/reicast/src/main/res/drawable/image_bg.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/image_bg.xml rename to shell/android-studio/reicast/src/main/res/drawable/image_bg.xml diff --git a/shell/android-studio/app/src/main/res/drawable/input.png b/shell/android-studio/reicast/src/main/res/drawable/input.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/input.png rename to shell/android-studio/reicast/src/main/res/drawable/input.png diff --git a/shell/android-studio/app/src/main/res/drawable/list_item_border.xml b/shell/android-studio/reicast/src/main/res/drawable/list_item_border.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/list_item_border.xml rename to shell/android-studio/reicast/src/main/res/drawable/list_item_border.xml diff --git a/shell/android-studio/app/src/main/res/drawable/list_selector.xml b/shell/android-studio/reicast/src/main/res/drawable/list_selector.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/list_selector.xml rename to shell/android-studio/reicast/src/main/res/drawable/list_selector.xml diff --git a/shell/android-studio/app/src/main/res/drawable/menuback.png b/shell/android-studio/reicast/src/main/res/drawable/menuback.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/menuback.png rename to shell/android-studio/reicast/src/main/res/drawable/menuback.png diff --git a/shell/android-studio/app/src/main/res/drawable/menutile.png b/shell/android-studio/reicast/src/main/res/drawable/menutile.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/menutile.png rename to shell/android-studio/reicast/src/main/res/drawable/menutile.png diff --git a/shell/android-studio/app/src/main/res/drawable/mic_icon.png b/shell/android-studio/reicast/src/main/res/drawable/mic_icon.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/mic_icon.png rename to shell/android-studio/reicast/src/main/res/drawable/mic_icon.png diff --git a/shell/android-studio/app/src/main/res/drawable/mute_sound.png b/shell/android-studio/reicast/src/main/res/drawable/mute_sound.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/mute_sound.png rename to shell/android-studio/reicast/src/main/res/drawable/mute_sound.png diff --git a/shell/android-studio/app/src/main/res/drawable/normal_view.png b/shell/android-studio/reicast/src/main/res/drawable/normal_view.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/normal_view.png rename to shell/android-studio/reicast/src/main/res/drawable/normal_view.png diff --git a/shell/android-studio/app/src/main/res/drawable/open_folder.png b/shell/android-studio/reicast/src/main/res/drawable/open_folder.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/open_folder.png rename to shell/android-studio/reicast/src/main/res/drawable/open_folder.png diff --git a/shell/android-studio/app/src/main/res/drawable/print_stats.png b/shell/android-studio/reicast/src/main/res/drawable/print_stats.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/print_stats.png rename to shell/android-studio/reicast/src/main/res/drawable/print_stats.png diff --git a/shell/android-studio/app/src/main/res/drawable/profiler.png b/shell/android-studio/reicast/src/main/res/drawable/profiler.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/profiler.png rename to shell/android-studio/reicast/src/main/res/drawable/profiler.png diff --git a/shell/android-studio/app/src/main/res/drawable/question.png b/shell/android-studio/reicast/src/main/res/drawable/question.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/question.png rename to shell/android-studio/reicast/src/main/res/drawable/question.png diff --git a/shell/android-studio/app/src/main/res/drawable/reset.png b/shell/android-studio/reicast/src/main/res/drawable/reset.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/reset.png rename to shell/android-studio/reicast/src/main/res/drawable/reset.png diff --git a/shell/android-studio/app/src/main/res/drawable/rounded.xml b/shell/android-studio/reicast/src/main/res/drawable/rounded.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/rounded.xml rename to shell/android-studio/reicast/src/main/res/drawable/rounded.xml diff --git a/shell/android-studio/app/src/main/res/drawable/shadow.xml b/shell/android-studio/reicast/src/main/res/drawable/shadow.xml similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/shadow.xml rename to shell/android-studio/reicast/src/main/res/drawable/shadow.xml diff --git a/shell/android-studio/app/src/main/res/drawable/star.png b/shell/android-studio/reicast/src/main/res/drawable/star.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/star.png rename to shell/android-studio/reicast/src/main/res/drawable/star.png diff --git a/shell/android-studio/app/src/main/res/drawable/toggle_a_b.png b/shell/android-studio/reicast/src/main/res/drawable/toggle_a_b.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/toggle_a_b.png rename to shell/android-studio/reicast/src/main/res/drawable/toggle_a_b.png diff --git a/shell/android-studio/app/src/main/res/drawable/toggle_r_l.png b/shell/android-studio/reicast/src/main/res/drawable/toggle_r_l.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/toggle_r_l.png rename to shell/android-studio/reicast/src/main/res/drawable/toggle_r_l.png diff --git a/shell/android-studio/app/src/main/res/drawable/up.png b/shell/android-studio/reicast/src/main/res/drawable/up.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/up.png rename to shell/android-studio/reicast/src/main/res/drawable/up.png diff --git a/shell/android-studio/app/src/main/res/drawable/vmu_swap.png b/shell/android-studio/reicast/src/main/res/drawable/vmu_swap.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/vmu_swap.png rename to shell/android-studio/reicast/src/main/res/drawable/vmu_swap.png diff --git a/shell/android-studio/app/src/main/res/drawable/widescreen.png b/shell/android-studio/reicast/src/main/res/drawable/widescreen.png similarity index 100% rename from shell/android-studio/app/src/main/res/drawable/widescreen.png rename to shell/android-studio/reicast/src/main/res/drawable/widescreen.png diff --git a/shell/android-studio/app/src/main/res/layout-v14/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout-v14/configure_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout-v14/input_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout-v14/input_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout-v14/input_mod_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/input_mod_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout-v14/input_mod_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout-v14/input_mod_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/about_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/about_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/about_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/activity_main.xml b/shell/android-studio/reicast/src/main/res/layout/activity_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/activity_main.xml rename to shell/android-studio/reicast/src/main/res/layout/activity_main.xml diff --git a/shell/android-studio/app/src/main/res/layout/app_bar_main.xml b/shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/app_bar_main.xml rename to shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml diff --git a/shell/android-studio/app/src/main/res/layout/bios_list_item.xml b/shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/bios_list_item.xml rename to shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml diff --git a/shell/android-studio/app/src/main/res/layout/browser_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/browser_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/browser_fragment_header.xml b/shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/browser_fragment_header.xml rename to shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml diff --git a/shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml b/shell/android-studio/reicast/src/main/res/layout/browser_fragment_item.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml rename to shell/android-studio/reicast/src/main/res/layout/browser_fragment_item.xml diff --git a/shell/android-studio/app/src/main/res/layout/change_item.xml b/shell/android-studio/reicast/src/main/res/layout/change_item.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/change_item.xml rename to shell/android-studio/reicast/src/main/res/layout/change_item.xml diff --git a/shell/android-studio/app/src/main/res/layout/cloud_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/cloud_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/configure_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/content_main.xml b/shell/android-studio/reicast/src/main/res/layout/content_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/content_main.xml rename to shell/android-studio/reicast/src/main/res/layout/content_main.xml diff --git a/shell/android-studio/app/src/main/res/layout/dialog_item.xml b/shell/android-studio/reicast/src/main/res/layout/dialog_item.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/dialog_item.xml rename to shell/android-studio/reicast/src/main/res/layout/dialog_item.xml diff --git a/shell/android-studio/app/src/main/res/layout/input_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/input_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/input_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/input_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/input_mod_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/input_mod_fragment.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/input_mod_fragment.xml rename to shell/android-studio/reicast/src/main/res/layout/input_mod_fragment.xml diff --git a/shell/android-studio/app/src/main/res/layout/menu_popup_config.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/menu_popup_config.xml rename to shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml diff --git a/shell/android-studio/app/src/main/res/layout/menu_popup_debug.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/menu_popup_debug.xml rename to shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml diff --git a/shell/android-studio/app/src/main/res/layout/menu_popup_main.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/menu_popup_main.xml rename to shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml diff --git a/shell/android-studio/app/src/main/res/layout/nav_header_main.xml b/shell/android-studio/reicast/src/main/res/layout/nav_header_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/nav_header_main.xml rename to shell/android-studio/reicast/src/main/res/layout/nav_header_main.xml diff --git a/shell/android-studio/app/src/main/res/layout/spinner_selected.xml b/shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/spinner_selected.xml rename to shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml diff --git a/shell/android-studio/app/src/main/res/layout/webview.xml b/shell/android-studio/reicast/src/main/res/layout/webview.xml similarity index 100% rename from shell/android-studio/app/src/main/res/layout/webview.xml rename to shell/android-studio/reicast/src/main/res/layout/webview.xml diff --git a/shell/android-studio/app/src/main/res/menu-v23/activity_main.xml b/shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/menu-v23/activity_main.xml rename to shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml diff --git a/shell/android-studio/app/src/main/res/menu/activity_main.xml b/shell/android-studio/reicast/src/main/res/menu/activity_main.xml similarity index 100% rename from shell/android-studio/app/src/main/res/menu/activity_main.xml rename to shell/android-studio/reicast/src/main/res/menu/activity_main.xml diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_cloud.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_cloud.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_cloud.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_cloud.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_config.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_config.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_config.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_config.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_debug.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_debug.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_debug.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_debug.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_disk_unknown.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_disk_unknown.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_disk_unknown.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_disk_unknown.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_input.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_input.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_input.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_input.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_question.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_question.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_question.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_question.png diff --git a/shell/android-studio/app/src/main/res/mipmap/menu_star.png b/shell/android-studio/reicast/src/main/res/mipmap/menu_star.png similarity index 100% rename from shell/android-studio/app/src/main/res/mipmap/menu_star.png rename to shell/android-studio/reicast/src/main/res/mipmap/menu_star.png diff --git a/shell/android-studio/app/src/main/res/values-da/strings.xml b/shell/android-studio/reicast/src/main/res/values-da/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-da/strings.xml rename to shell/android-studio/reicast/src/main/res/values-da/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-de/strings.xml b/shell/android-studio/reicast/src/main/res/values-de/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-de/strings.xml rename to shell/android-studio/reicast/src/main/res/values-de/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-es/strings.xml b/shell/android-studio/reicast/src/main/res/values-es/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-es/strings.xml rename to shell/android-studio/reicast/src/main/res/values-es/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-fr/strings.xml b/shell/android-studio/reicast/src/main/res/values-fr/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-fr/strings.xml rename to shell/android-studio/reicast/src/main/res/values-fr/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-it/strings.xml b/shell/android-studio/reicast/src/main/res/values-it/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-it/strings.xml rename to shell/android-studio/reicast/src/main/res/values-it/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-jp/strings.xml b/shell/android-studio/reicast/src/main/res/values-jp/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-jp/strings.xml rename to shell/android-studio/reicast/src/main/res/values-jp/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-ko/strings.xml b/shell/android-studio/reicast/src/main/res/values-ko/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-ko/strings.xml rename to shell/android-studio/reicast/src/main/res/values-ko/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-large/dimens.xml b/shell/android-studio/reicast/src/main/res/values-large/dimens.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-large/dimens.xml rename to shell/android-studio/reicast/src/main/res/values-large/dimens.xml diff --git a/shell/android-studio/app/src/main/res/values-pl/strings.xml b/shell/android-studio/reicast/src/main/res/values-pl/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-pl/strings.xml rename to shell/android-studio/reicast/src/main/res/values-pl/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-pt/strings.xml b/shell/android-studio/reicast/src/main/res/values-pt/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-pt/strings.xml rename to shell/android-studio/reicast/src/main/res/values-pt/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-ru/strings.xml b/shell/android-studio/reicast/src/main/res/values-ru/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-ru/strings.xml rename to shell/android-studio/reicast/src/main/res/values-ru/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-zh-rCN/strings.xml b/shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-zh-rCN/strings.xml rename to shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml diff --git a/shell/android-studio/app/src/main/res/values-zh/strings.xml b/shell/android-studio/reicast/src/main/res/values-zh/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values-zh/strings.xml rename to shell/android-studio/reicast/src/main/res/values-zh/strings.xml diff --git a/shell/android-studio/app/src/main/res/values/colors.xml b/shell/android-studio/reicast/src/main/res/values/colors.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/colors.xml rename to shell/android-studio/reicast/src/main/res/values/colors.xml diff --git a/shell/android-studio/app/src/main/res/values/dimens.xml b/shell/android-studio/reicast/src/main/res/values/dimens.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/dimens.xml rename to shell/android-studio/reicast/src/main/res/values/dimens.xml diff --git a/shell/android-studio/app/src/main/res/values/donottranslate.xml b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/donottranslate.xml rename to shell/android-studio/reicast/src/main/res/values/donottranslate.xml diff --git a/shell/android-studio/app/src/main/res/values/ids.xml b/shell/android-studio/reicast/src/main/res/values/ids.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/ids.xml rename to shell/android-studio/reicast/src/main/res/values/ids.xml diff --git a/shell/android-studio/app/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/strings.xml rename to shell/android-studio/reicast/src/main/res/values/strings.xml diff --git a/shell/android-studio/app/src/main/res/values/styles.xml b/shell/android-studio/reicast/src/main/res/values/styles.xml similarity index 100% rename from shell/android-studio/app/src/main/res/values/styles.xml rename to shell/android-studio/reicast/src/main/res/values/styles.xml diff --git a/shell/android-studio/settings.gradle b/shell/android-studio/settings.gradle index e7b4def49..7753ce099 100644 --- a/shell/android-studio/settings.gradle +++ b/shell/android-studio/settings.gradle @@ -1 +1 @@ -include ':app' +include ':reicast' From 5e9ed25c0133e908d117defd542fac8a191bb1d6 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Fri, 20 Jul 2018 15:17:38 -0400 Subject: [PATCH 02/11] Android: establish a service with foreground notification --- .../reicast/src/main/AndroidManifest.xml | 6 +++ .../com/reicast/emulator/emu/EmuService.java | 47 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java diff --git a/shell/android-studio/reicast/src/main/AndroidManifest.xml b/shell/android-studio/reicast/src/main/AndroidManifest.xml index cdee4b7e6..9e00ee9e6 100644 --- a/shell/android-studio/reicast/src/main/AndroidManifest.xml +++ b/shell/android-studio/reicast/src/main/AndroidManifest.xml @@ -121,6 +121,12 @@ android:configChanges="orientation|navigation|screenSize|screenLayout|uiMode|keyboard|keyboardHidden" android:screenOrientation="sensorLandscape" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> + + diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java new file mode 100644 index 000000000..0126c5097 --- /dev/null +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java @@ -0,0 +1,47 @@ +package com.reicast.emulator.emu; + +import android.app.PendingIntent; +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.support.v4.app.NotificationCompat; +import com.reicast.emulator.R; + +public class EmuService extends Service { + + private final static int FOREGROUND_ID = 999; + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (intent != null && intent.getAction() != null + && intent.getAction().equals("com.reicast.emulator.KYS")) { + stopSelf(); + } else { + Intent intentService = new Intent(this, EmuService.class); + intentService.setAction("com.reicast.emulator.KYS"); + PendingIntent pendingIntent = PendingIntent.getService(this, + (int) System.currentTimeMillis(), intentService, + PendingIntent.FLAG_UPDATE_CURRENT); + + NotificationCompat.Builder builder = new NotificationCompat.Builder(this) + .setSmallIcon(R.drawable.ic_launcher) + .setTicker("Emulator ticker message") + .setContentTitle("Emulator notification title") + .setContentText("Emulator notification content") + .setContentIntent(pendingIntent); + startForeground(FOREGROUND_ID, builder.build()); + return START_STICKY_COMPATIBILITY; + } + return START_NOT_STICKY; + } + + @Override + public void onDestroy() { + stopForeground(true); + } +} \ No newline at end of file From 77b8b8fd8a992a14cfcc886521feed500f04d051 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Fri, 20 Jul 2018 17:24:44 -0400 Subject: [PATCH 03/11] Android: simple start and stop for service via JNIActivity --- .../reicast/src/main/AndroidManifest.xml | 1 + .../com/reicast/emulator/GL2JNIActivity.java | 30 ++++++++++++++++++- .../com/reicast/emulator/emu/EmuService.java | 7 +++-- .../reicast/src/main/res/values/strings.xml | 4 +++ 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/shell/android-studio/reicast/src/main/AndroidManifest.xml b/shell/android-studio/reicast/src/main/AndroidManifest.xml index 9e00ee9e6..9f99de1e3 100644 --- a/shell/android-studio/reicast/src/main/AndroidManifest.xml +++ b/shell/android-studio/reicast/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ + javaclass) { + ActivityManager manager = (ActivityManager) + getSystemService(Context.ACTIVITY_SERVICE); + try { + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (javaclass.getName().equals( + service.service.getClassName())) { + return true; + } + } + } catch (NullPointerException e) { + e.printStackTrace(); + } + return false; + } + @Override protected void onPause() { super.onPause(); @@ -547,12 +573,14 @@ public class GL2JNIActivity extends Activity { protected void onDestroy() { super.onDestroy(); moga.onDestroy(); + if (serviceRunning(EmuService.class)) + stopService(serviceIntent); + JNIdc.stop(); } @Override protected void onStop() { // TODO Auto-generated method stub - JNIdc.stop(); mView.onStop(); super.onStop(); } diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java index 0126c5097..05938898e 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java @@ -5,6 +5,7 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.support.v4.app.NotificationCompat; + import com.reicast.emulator.R; public class EmuService extends Service { @@ -30,9 +31,9 @@ public class EmuService extends Service { NotificationCompat.Builder builder = new NotificationCompat.Builder(this) .setSmallIcon(R.drawable.ic_launcher) - .setTicker("Emulator ticker message") - .setContentTitle("Emulator notification title") - .setContentText("Emulator notification content") + .setTicker(getString(R.string.service_ticker)) + .setContentTitle(getString(R.string.service_title)) + .setContentText(getString(R.string.service_content)) .setContentIntent(pendingIntent); startForeground(FOREGROUND_ID, builder.build()); return START_STICKY_COMPATIBILITY; diff --git a/shell/android-studio/reicast/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml index 72ebd42eb..95c6834a7 100644 --- a/shell/android-studio/reicast/src/main/res/values/strings.xml +++ b/shell/android-studio/reicast/src/main/res/values/strings.xml @@ -129,6 +129,10 @@ Download VMU Logcat saved and copied to clipboard\nPlease paste inside the Github issue + + reicast is running... + reicast is running... + Emulator service is currently running Back From ac73de0dea0c357f4973b38237150ac27e49ff50 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Fri, 20 Jul 2018 18:02:18 -0400 Subject: [PATCH 04/11] Travis: update for renamed internal package --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c87503575..fa50ab2f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ script: before_deploy: - cd ../../ - mkdir -p artifacts/$GIT_BUILD/ -- cp shell/android-studio/app/build/outputs/apk/debug/app-debug.apk artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk +- cp shell/android-studio/reicast/build/outputs/apk/debug/reicast-debug.apk artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk deploy: provider: s3 access_key_id: AKIAJR5J3OHAQUP5BHHQ From 7bc764be9b9f743b8745cf2a4b61f0c3c7efb9e7 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Fri, 20 Jul 2018 21:01:50 -0400 Subject: [PATCH 05/11] Android: move stop to destroy to avoid early term --- .../java/com/reicast/emulator/GL2JNIActivity.java | 5 +++-- .../java/com/reicast/emulator/GL2JNINative.java | 5 +++-- .../reicast/emulator/config/EditVJoyActivity.java | 9 +++++++-- .../java/com/reicast/emulator/emu/GL2JNIView.java | 13 ++++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java index e3342763d..df4e0380c 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java @@ -572,17 +572,18 @@ public class GL2JNIActivity extends Activity { @Override protected void onDestroy() { super.onDestroy(); - moga.onDestroy(); if (serviceRunning(EmuService.class)) stopService(serviceIntent); + mView.onDestroy(); JNIdc.stop(); + moga.onDestroy(); } @Override protected void onStop() { // TODO Auto-generated method stub - mView.onStop(); super.onStop(); +// mView.onStop(); } @Override diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java index 7067b4a53..a6f4492ef 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java @@ -573,14 +573,15 @@ public class GL2JNINative extends NativeActivity { @Override protected void onDestroy() { super.onDestroy(); + mView.onDestroy(); + JNIdc.stop(); moga.onDestroy(); } @Override protected void onStop() { - JNIdc.stop(); - mView.onStop(); super.onStop(); +// mView.onStop(); } @Override diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java index cbe3b2cb1..86bee746b 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/EditVJoyActivity.java @@ -76,16 +76,21 @@ public class EditVJoyActivity extends Activity { @Override protected void onStop() { - mView.onStop(); super.onStop(); +// mView.onStop(); } - @Override protected void onResume() { super.onResume(); mView.onResume(); } + + @Override + protected void onDestroy() { + super.onDestroy(); + mView.onDestroy(); + } PopupWindow createVJoyPopup() { final PopupWindow popUp = new PopupWindow(this); diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java index bc4bbc9b4..d98dccec5 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java @@ -693,7 +693,18 @@ public class GL2JNIView extends GLSurfaceView } - public void onStop() { +// public void onStop() { +// // TODO Auto-generated method stub +// System.exit(0); +// try { +// ethd.join(); +// } catch (InterruptedException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// } + + public void onDestroy() { // TODO Auto-generated method stub System.exit(0); try { From e104fdc9e7e38ad0c9d42d1b5cdb48666ff631eb Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Sat, 21 Jul 2018 21:03:55 -0400 Subject: [PATCH 06/11] Android: improve log commands and verify tags --- .../main/java/com/reicast/emulator/debug/GenerateLogs.java | 6 +++--- .../src/main/java/com/reicast/emulator/emu/GL2JNIView.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java index 0ee3e114d..4cdcb5bb4 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java @@ -153,7 +153,7 @@ public class GenerateLogs extends AsyncTask { } try { mLogcatProc = Runtime.getRuntime().exec( - new String[] { "logcat", "-d", "AndroidRuntime:E *:S" }); + new String[] { "logcat", "-ds", "AndroidRuntime:E" }); reader = new BufferedReader(new InputStreamReader( mLogcatProc.getInputStream())); String line; @@ -187,7 +187,7 @@ public class GenerateLogs extends AsyncTask { mLogcatProc = null; reader = null; mLogcatProc = Runtime.getRuntime().exec( - new String[] { "logcat", "-d", "reicast:V *:S" }); + new String[] { "logcat", "-ds", "reicast:V" }); reader = new BufferedReader(new InputStreamReader( mLogcatProc.getInputStream())); log.append(separator); @@ -203,7 +203,7 @@ public class GenerateLogs extends AsyncTask { mLogcatProc = null; reader = null; mLogcatProc = Runtime.getRuntime().exec( - new String[] { "logcat", "-d", "GL2JNIView:E *:S" }); + new String[] { "logcat", "-ds", "GL2JNIView:E" }); reader = new BufferedReader(new InputStreamReader( mLogcatProc.getInputStream())); log.append(separator); diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java index d98dccec5..aaac44d6d 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java @@ -655,7 +655,7 @@ public class GL2JNIView extends GLSurfaceView long used=pos-Player.getPlaybackHeadPosition(); long avail=size-used; - //Log.i("AUD", "u: " + used + " a: " + avail); + //Log.i("audcfg", "u: " + used + " a: " + avail); if (avail Date: Sat, 21 Jul 2018 21:18:08 -0400 Subject: [PATCH 07/11] Android: do not attempt useless rendering --- .../java/com/reicast/emulator/emu/GLCFactory14.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java index ae7fc643c..a44d6a911 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java @@ -95,16 +95,19 @@ public class GLCFactory14 { glAPIToTry = EGL14.EGL_OPENGL_ES2_BIT; } else { renderableType = EGL14.EGL_OPENGL_ES2_BIT; - // If this API does not work, try ES next. - glAPIToTry = EGL14.EGL_OPENGL_ES_API; + // If this API does not work, is a potato. + glAPIToTry = EGL10.EGL_NONE; } + // This EGL config specification is used to specify 2.0 rendering. + // We use a minimum size of 4 bits for red/green/blue, but will + // perform actual matching in chooseConfig() below. configSpec = new int[] { EGL14.EGL_RED_SIZE, 4, EGL14.EGL_GREEN_SIZE, 4, EGL14.EGL_BLUE_SIZE, 4, EGL14.EGL_RENDERABLE_TYPE, renderableType, - EGL14.EGL_DEPTH_SIZE, 24, + EGL14.EGL_DEPTH_SIZE, 16, EGL14.EGL_NONE }; @@ -115,7 +118,7 @@ public class GLCFactory14 { } } - } while (glAPIToTry != EGL14.EGL_OPENGL_ES_API && mValue[0]<=0); + } while (glAPIToTry != EGL10.EGL_NONE && mValue[0]<=0); if (mValue[0]<=0) { throw new IllegalArgumentException("No configs match configSpec"); From 5e377e039afc23c46587b2c6adb6ae16529c18fe Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Wed, 25 Jul 2018 08:25:10 -0400 Subject: [PATCH 08/11] Android: rename stop, since it actually terminates --- .../reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java | 2 +- shell/android-studio/reicast/src/main/jni/src/Android.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java index d85baa30f..716a2f006 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java @@ -8,7 +8,7 @@ public final class JNIdc public static native void config(String dirName); public static native void init(String fileName); public static native void run(Object track); - public static native void stop(); + public static native void terminate(); public static native int send(int cmd, int opt); public static native int data(int cmd, byte[] data); diff --git a/shell/android-studio/reicast/src/main/jni/src/Android.cpp b/shell/android-studio/reicast/src/main/jni/src/Android.cpp index 6f11de1da..0d6b5bddd 100644 --- a/shell/android-studio/reicast/src/main/jni/src/Android.cpp +++ b/shell/android-studio/reicast/src/main/jni/src/Android.cpp @@ -25,7 +25,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_run(JNIEnv *env,jobject obj,jobject emu_thread) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_stop(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_terminate(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_send(JNIEnv *env,jobject obj,jint id, jint v) __attribute__((visibility("default"))); JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_data(JNIEnv *env,jobject obj,jint id, jbyteArray d) __attribute__((visibility("default"))); @@ -368,7 +368,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupVmu(JNIEnv *env, //jpix=env->NewByteArray(1536); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_stop(JNIEnv *env,jobject obj) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_terminate(JNIEnv *env,jobject obj) { dc_term(); } From 6e86fcdf6e982009537e205f3b8045808d3c0ff6 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Wed, 25 Jul 2018 10:14:14 -0400 Subject: [PATCH 09/11] Android: relabel additional instances of stop --- .../src/main/java/com/reicast/emulator/GL2JNIActivity.java | 2 +- .../src/main/java/com/reicast/emulator/GL2JNINative.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java index df4e0380c..089fbbb4b 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java @@ -575,7 +575,7 @@ public class GL2JNIActivity extends Activity { if (serviceRunning(EmuService.class)) stopService(serviceIntent); mView.onDestroy(); - JNIdc.stop(); + JNIdc.terminate(); moga.onDestroy(); } diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java index a6f4492ef..22e94a230 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java @@ -574,7 +574,7 @@ public class GL2JNINative extends NativeActivity { protected void onDestroy() { super.onDestroy(); mView.onDestroy(); - JNIdc.stop(); + JNIdc.terminate(); moga.onDestroy(); } From 7c3e7fb161ba0e8b24d1325a827eb3b5512b8dbb Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Sat, 28 Jul 2018 21:30:39 -0400 Subject: [PATCH 10/11] Android: overcome Windows build limitations LOCAL_SHORT_COMMANDS applies to a single module and will resolve error 87, while APP_SHORT_COMMANDS := true can be added to the Application.mk in its place to apply to all modules. Both have a performance cost, so it is recommended to limit the scope sparingly. --- shell/android-studio/reicast/src/main/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/android-studio/reicast/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk index fff94d333..eb93b00eb 100644 --- a/shell/android-studio/reicast/src/main/jni/Android.mk +++ b/shell/android-studio/reicast/src/main/jni/Android.mk @@ -69,6 +69,7 @@ LOCAL_PRELINK_MODULE := false LOCAL_MODULE := dc LOCAL_DISABLE_FORMAT_STRING_CHECKS=true +LOCAL_SHORT_COMMANDS := true LOCAL_ASFLAGS := -fPIC -fvisibility=hidden LOCAL_LDLIBS := -llog -lGLESv2 -lEGL -lz #-Wl,-Map,./res/raw/syms.mp3 From feb8d7a321d96129c2ac40faa747a20f1112e9cc Mon Sep 17 00:00:00 2001 From: Abandoned Cart <1173913+AbandonedCart@users.noreply.github.com> Date: Thu, 2 Aug 2018 12:25:02 -0400 Subject: [PATCH 11/11] Android: Disable service until pause is supported --- .../java/com/reicast/emulator/GL2JNIActivity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java index 089fbbb4b..d7ddc7fc2 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java @@ -61,10 +61,10 @@ public class GL2JNIActivity extends Activity { WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); } - serviceIntent = new Intent(this, EmuService.class); - serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_FROM_BACKGROUND); - serviceIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES | Intent.FLAG_ACTIVITY_NO_ANIMATION); - startService(serviceIntent); + //serviceIntent = new Intent(this, EmuService.class); + //serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_FROM_BACKGROUND); + //serviceIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES | Intent.FLAG_ACTIVITY_NO_ANIMATION); + //startService(serviceIntent); Emulator app = (Emulator)getApplicationContext(); app.getConfigurationPrefs(prefs); @@ -572,8 +572,8 @@ public class GL2JNIActivity extends Activity { @Override protected void onDestroy() { super.onDestroy(); - if (serviceRunning(EmuService.class)) - stopService(serviceIntent); + //if (serviceRunning(EmuService.class)) + // stopService(serviceIntent); mView.onDestroy(); JNIdc.terminate(); moga.onDestroy();