From 35af9a5c87d7e1545a76a7dd8f42feb413eee1eb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 3 Dec 2015 08:50:40 +0100
Subject: [PATCH] (Android) Remove unneeded resource files

---
 pkg/android/phoenix/AndroidManifest.xml       |   2 +-
 .../coremanager_installed_cores_base.xml      |  19 --
 pkg/android/phoenix/res/layout/assets.xml     |  22 --
 .../coremanager_installed_cores_base.xml      |   7 -
 .../res/layout/coremanager_listview.xml       |   7 -
 .../res/layout/coremanager_viewpager.xml      |  14 --
 .../phoenix/res/layout/icon_grid_item.xml     |  23 --
 .../phoenix/res/layout/icon_grid_list.xml     |   8 -
 .../phoenix/res/layout/key_bind_dialog.xml    |  19 --
 pkg/android/phoenix/res/layout/line_list.xml  |   9 -
 .../phoenix/res/layout/line_list_item.xml     |  37 ---
 .../res/layout/mainmenu_activity_layout.xml   |  12 -
 .../res/layout/preference_list_content.xml    |  25 --
 .../res/layout/preference_list_fragment.xml   |  77 ------
 .../res/layout/preference_viewpager.xml       |  14 --
 .../phoenix/res/layout/seek_dialog.xml        |  21 --
 pkg/android/phoenix/res/values-de/strings.xml | 224 ------------------
 pkg/android/phoenix/res/values/array.xml      |  46 ----
 pkg/android/phoenix/res/values/dimens.xml     |  29 ---
 pkg/android/phoenix/res/values/strings.xml    | 224 ------------------
 .../phoenix/res/xml/audio_preferences.xml     |  21 --
 .../phoenix/res/xml/general_preferences.xml   |  26 --
 .../phoenix/res/xml/input_preferences.xml     |  50 ----
 pkg/android/phoenix/res/xml/main_menu.xml     |  14 --
 .../phoenix/res/xml/path_preferences.xml      |  50 ----
 .../phoenix/res/xml/video_preferences.xml     |  37 ---
 26 files changed, 1 insertion(+), 1036 deletions(-)
 delete mode 100644 pkg/android/phoenix/res/layout-large/coremanager_installed_cores_base.xml
 delete mode 100644 pkg/android/phoenix/res/layout/assets.xml
 delete mode 100644 pkg/android/phoenix/res/layout/coremanager_installed_cores_base.xml
 delete mode 100644 pkg/android/phoenix/res/layout/coremanager_listview.xml
 delete mode 100644 pkg/android/phoenix/res/layout/coremanager_viewpager.xml
 delete mode 100644 pkg/android/phoenix/res/layout/icon_grid_item.xml
 delete mode 100644 pkg/android/phoenix/res/layout/icon_grid_list.xml
 delete mode 100644 pkg/android/phoenix/res/layout/key_bind_dialog.xml
 delete mode 100644 pkg/android/phoenix/res/layout/line_list.xml
 delete mode 100644 pkg/android/phoenix/res/layout/line_list_item.xml
 delete mode 100644 pkg/android/phoenix/res/layout/mainmenu_activity_layout.xml
 delete mode 100644 pkg/android/phoenix/res/layout/preference_list_content.xml
 delete mode 100644 pkg/android/phoenix/res/layout/preference_list_fragment.xml
 delete mode 100644 pkg/android/phoenix/res/layout/preference_viewpager.xml
 delete mode 100644 pkg/android/phoenix/res/layout/seek_dialog.xml
 delete mode 100644 pkg/android/phoenix/res/values-de/strings.xml
 delete mode 100644 pkg/android/phoenix/res/values/array.xml
 delete mode 100644 pkg/android/phoenix/res/values/dimens.xml
 delete mode 100644 pkg/android/phoenix/res/values/strings.xml
 delete mode 100644 pkg/android/phoenix/res/xml/audio_preferences.xml
 delete mode 100644 pkg/android/phoenix/res/xml/general_preferences.xml
 delete mode 100644 pkg/android/phoenix/res/xml/input_preferences.xml
 delete mode 100644 pkg/android/phoenix/res/xml/main_menu.xml
 delete mode 100644 pkg/android/phoenix/res/xml/path_preferences.xml
 delete mode 100644 pkg/android/phoenix/res/xml/video_preferences.xml

diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 3cc37ecd32..776ee3ab57 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -20,7 +20,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
+        android:label="RetroArch"
         android:hasCode="true"
         android:banner="@drawable/banner"
     	android:debuggable="false">
diff --git a/pkg/android/phoenix/res/layout-large/coremanager_installed_cores_base.xml b/pkg/android/phoenix/res/layout-large/coremanager_installed_cores_base.xml
deleted file mode 100644
index 2fd9803ee3..0000000000
--- a/pkg/android/phoenix/res/layout-large/coremanager_installed_cores_base.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:baselineAligned="false"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-
-    <FrameLayout
-        android:layout_weight="1"
-        android:id="@+id/installed_cores_fragment_container1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content" />
-
-    <FrameLayout
-        android:layout_weight="1"
-        android:id="@+id/installed_cores_fragment_container2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/pkg/android/phoenix/res/layout/assets.xml b/pkg/android/phoenix/res/layout/assets.xml
deleted file mode 100644
index afb702997c..0000000000
--- a/pkg/android/phoenix/res/layout/assets.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical" >
-    
-    <TextView 
-        android:id="@+id/assets_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/extracting_assets_please_wait_" />
-    
-    <ProgressBar
-        android:id="@+id/assets_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-    
-
-</LinearLayout>
diff --git a/pkg/android/phoenix/res/layout/coremanager_installed_cores_base.xml b/pkg/android/phoenix/res/layout/coremanager_installed_cores_base.xml
deleted file mode 100644
index 43f47f627b..0000000000
--- a/pkg/android/phoenix/res/layout/coremanager_installed_cores_base.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_weight="1"
-    android:id="@+id/installed_cores_fragment_container1"
-    android:layout_width="0dp"
-    android:layout_height="match_parent" />
-
-
diff --git a/pkg/android/phoenix/res/layout/coremanager_listview.xml b/pkg/android/phoenix/res/layout/coremanager_listview.xml
deleted file mode 100644
index 10b564b375..0000000000
--- a/pkg/android/phoenix/res/layout/coremanager_listview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:choiceMode="singleChoice"
-    android:id="@android:id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" />
diff --git a/pkg/android/phoenix/res/layout/coremanager_viewpager.xml b/pkg/android/phoenix/res/layout/coremanager_viewpager.xml
deleted file mode 100644
index 6ca1467ee0..0000000000
--- a/pkg/android/phoenix/res/layout/coremanager_viewpager.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coreviewer_viewPager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.view.PagerTabStrip
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:paddingBottom="10dp"
-        android:paddingTop="10dp" />
-
-</android.support.v4.view.ViewPager>
diff --git a/pkg/android/phoenix/res/layout/icon_grid_item.xml b/pkg/android/phoenix/res/layout/icon_grid_item.xml
deleted file mode 100644
index 1109ae5f48..0000000000
--- a/pkg/android/phoenix/res/layout/icon_grid_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="192dp"
-        android:layout_height="192dp"
-        android:layout_gravity="center"
-        android:contentDescription="@string/file_type_icon"
-        android:padding="8dp" />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="0.5"
-        android:textSize="18sp" />
-
-</LinearLayout>
diff --git a/pkg/android/phoenix/res/layout/icon_grid_list.xml b/pkg/android/phoenix/res/layout/icon_grid_list.xml
deleted file mode 100644
index 272ecf43f8..0000000000
--- a/pkg/android/phoenix/res/layout/icon_grid_list.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:numColumns="2" >
-
-</GridView>
\ No newline at end of file
diff --git a/pkg/android/phoenix/res/layout/key_bind_dialog.xml b/pkg/android/phoenix/res/layout/key_bind_dialog.xml
deleted file mode 100644
index 41b54cde67..0000000000
--- a/pkg/android/phoenix/res/layout/key_bind_dialog.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/key_bind_dialog"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <EditText
-        android:id="@+id/key_bind_value"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/key_bind_title"
-        android:layout_below="@+id/key_bind_title"
-        android:ems="10"
-        android:inputType="text" >
-
-        <requestFocus />
-    </EditText>
-
-</RelativeLayout>
diff --git a/pkg/android/phoenix/res/layout/line_list.xml b/pkg/android/phoenix/res/layout/line_list.xml
deleted file mode 100644
index 27d11ed953..0000000000
--- a/pkg/android/phoenix/res/layout/line_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:fastScrollEnabled="true" >
-
-</ListView>
-
diff --git a/pkg/android/phoenix/res/layout/line_list_item.xml b/pkg/android/phoenix/res/layout/line_list_item.xml
deleted file mode 100644
index 6c9d14e3d3..0000000000
--- a/pkg/android/phoenix/res/layout/line_list_item.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:contentDescription="@string/file_type_icon"
-        android:padding="8dp" />
-    
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:textSize="18sp" />
-
-        <TextView
-            android:id="@+id/sub_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:visibility="gone"
-            android:textSize="12sp" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/pkg/android/phoenix/res/layout/mainmenu_activity_layout.xml b/pkg/android/phoenix/res/layout/mainmenu_activity_layout.xml
deleted file mode 100644
index e5c7370437..0000000000
--- a/pkg/android/phoenix/res/layout/mainmenu_activity_layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
diff --git a/pkg/android/phoenix/res/layout/preference_list_content.xml b/pkg/android/phoenix/res/layout/preference_list_content.xml
deleted file mode 100644
index ef443a0bb3..0000000000
--- a/pkg/android/phoenix/res/layout/preference_list_content.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/layout/list_content.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:drawSelectorOnTop="false"
-    android:scrollbarAlwaysDrawVerticalTrack="true"
-    />
\ No newline at end of file
diff --git a/pkg/android/phoenix/res/layout/preference_list_fragment.xml b/pkg/android/phoenix/res/layout/preference_list_fragment.xml
deleted file mode 100644
index 009a61483a..0000000000
--- a/pkg/android/phoenix/res/layout/preference_list_fragment.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
-    android:background="@android:color/transparent">
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
-        android:paddingTop="0dip"
-        android:paddingBottom="@dimen/preference_fragment_padding_bottom"
-        android:paddingLeft="@dimen/preference_fragment_padding_side"
-        android:paddingRight="@dimen/preference_fragment_padding_side"
-        android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="false"
-        android:cacheColorHint="@android:color/transparent"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="@dimen/preference_fragment_padding_side"
-        android:gravity="center"
-        android:visibility="gone" />
-
-    <RelativeLayout android:id="@+id/button_bar"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_weight="0"
-        android:visibility="gone">
-
-        <Button android:id="@+id/back_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true">
-
-            <Button android:id="@+id/skip_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:visibility="gone"/>
-
-            <Button android:id="@+id/next_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"/>
-        </LinearLayout>
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/pkg/android/phoenix/res/layout/preference_viewpager.xml b/pkg/android/phoenix/res/layout/preference_viewpager.xml
deleted file mode 100644
index 1a53c2e661..0000000000
--- a/pkg/android/phoenix/res/layout/preference_viewpager.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/viewPager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.view.PagerTabStrip
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:paddingBottom="10dp"
-        android:paddingTop="10dp" />
-
-</android.support.v4.view.ViewPager>
diff --git a/pkg/android/phoenix/res/layout/seek_dialog.xml b/pkg/android/phoenix/res/layout/seek_dialog.xml
deleted file mode 100644
index 0adf292cbd..0000000000
--- a/pkg/android/phoenix/res/layout/seek_dialog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/seekbar_dialog"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <SeekBar
-        android:id="@+id/seekbar_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="100" />
-
-    <TextView
-        android:id="@+id/seekbar_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:layout_gravity="center" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/pkg/android/phoenix/res/values-de/strings.xml b/pkg/android/phoenix/res/values-de/strings.xml
deleted file mode 100644
index d291d2b918..0000000000
--- a/pkg/android/phoenix/res/values-de/strings.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<resources>
-
-    <string name="app_name">RetroArch</string>
-    <string name="input_method">Eingabemethode</string>
-    <string name="file_type_icon">Dateityp-Icon</string>
-    <string name="optimal_settings_device">Optimale Geräteeinstellungen</string>
-    <string name="extracting_assets_please_wait_">Entpacke Assets, bitte warten …</string>
-
-    <!-- Main Menu Strings -->
-    <string name="mainmenu_title">RetroArch - Hauptmenü</string>
-    <string name="resume_content">Lade RetroArch</string>
-    <string name="load_core">Core auswählen</string>
-    <string name="load_content">Lade Content</string>
-    <string name="load_content_auto">Lade Content (Core erkennen)</string>
-    <string name="settings">Einstellungen</string>
-    <string name="about">Über</string>
-    <string name="quit_retroarch">RetroArch beenden</string>
-
-    <!-- Core Selection Class -->
-    <string name="select_libretro_core">Wähle einen Libretro-Core aus</string>
-
-    <!-- Display Refresh Rate Test Class -->
-    <string name="refresh_rate_calibration">Bildwiederholrate kalibrieren</string>
-    <string name="touch_screen_with_fingers">Berühre den Bildschirm mit deinen Fingern für genauere Messungen.</string>
-    <string name="refresh_rate_measured_to">Gemessene Bildwiederholrate beträgt: %1$s Hz.</string>
-
-    <!-- History Selection Class -->
-    <string name="loading_gamepath">Lade [%1$s]…</string>
-    
-    <!-- Key Bind Preference Class -->
-    <string name="current_binding">Aktuell: %1$s</string>
-    <string name="press_key_to_use">Drücke Taste zum verwenden</string>
-
-    <!-- Core Autodetect strings -->
-    <string name="multiple_cores_detected">Mehrere Cores erkannt</string>
-    <string name="no_cores_detected">Keine unterstützten Cores erkannt</string>
-
-    <!-- Main Menu Class -->
-    <string name="welcome_to_retroarch">Willkommen bei RetroArch</string>
-    <string name="welcome_to_retroarch_desc">Dies ist dein erster Start von Retroarch. RetroArch wird nun vorkonfiguriert, um dás bestmögliche Nutzungserlebnis zu ermöglichen.</string>
-    <string name="detect_device_msg_ouya">Die idealen Konfigurationsoptionen für dein Gerät werden nun vorkonfiguriert.\n\nHINWEIS: Für optimale Leistung solltest du die Google-Konto-Synchronisierung, GPS und Wi-Fi in den Android-Einstellungen deaktivieren.</string>
-    <string name="detect_device_msg_general">Die idealen Konfigurationsoptionen für dein Gerät werden nun vorkonfiguriert.\n\nHINWEIS: Für optimale Leistung solltest du die Google-Konto-Synchronisierung, automatische Google-Play-Store-Updates, GPS und Wi-Fi in den Android-Einstellungen deaktivieren.</string>
-    <string name="nvidia_shield_detected">NVidia Shield erkannt</string>
-    <string name="game_mid_detected">GameMID erkannt</string>
-    <string name="ouya_detected">OUYA erkannt</string>
-    <string name="xperia_play_detected">Xperia Play erkannt</string>
-    <string name="nexus_7_2013_detected">Nexus 7 2013 erkannt</string>
-    <string name="no_optimal_settings">Das Gerät wurde entweder nicht erkannt oder hat keine optimalen Einstellungen in unserer Datenbank.</string>
-    <string name="load_a_core_first">Gehe zu \'Lade Core\' und wähle zunächst einen Core aus.</string>
-    <string name="loading_data">Lade [%1$s]…</string>
-
-    <!-- Asset extraction dialog -->
-    <string name="asset_extraction">Asset-Entpacken</string>
-
-    <!-- GPL cores AlertDialog -->
-    <string name="keep_cores">Behalte Cores</string>
-    <string name="remove_cores">Entferne Cores, die nicht unter GPL-Lizenz stehen</string>
-    
-    <!-- Refresh Rate Set OS Class -->
-    <string name="using_os_reported_refresh_rate">Verwende vom Betriebssystem gemeldete Wiederholrate von %1$s Hz.</string>
-    
-    <!-- Settings Based Strings -->
-
-    <!-- Back Options -->
-    <string name="quit">Verlassen</string>
-    <string name="gui_toggle">GUI ein/aus</string>
-    <string name="menu_toggle">Menu ein/aus</string>
-    
-    <!-- Audio Settings -->
-    <string name="audio_options">Sound</string>
-    <string name="enable_audio">Schalte Sound ein</string>
-    <string name="dynamic_rate_control">Dynamic rate control</string>
-    <string name="dynamic_rate_control_desc">Schalte Dynamic Rate Control ein (empfohlen).</string>
-    <string name="audio_latency">Audio-Latenz</string>
-    <string name="audio_latency_desc">Stelle die Audio-Latenz ein. Der Wert hängt von dem Gerät ab, das du benutzt.</string>
-    <string name="auto_audio_latency">Audio-Latenz automatisch erkennen</string>
-    <string name="auto_audio_latency_desc">Verwende automatische Audio-Latenz-Erkennung. Dies ist nur unter Android 4.1 oder höher verfügbar - der Wert hängt von dem Gerät ab, das du benutzt.</string>
-    <string name="sixty_four_ms">64ms (Niedrig)</string>
-    <string name="ninety_six_ms">96ms (Mittel)</string>
-    <string name="one_twenty_eight_ms">128ms (Mittel)</string>
-    <string name="one_sixty_ms">160ms (Hoch)</string>
-
-    <!-- Input Settings -->
-    <string name="input_options">Eingabe</string>
-    <string name="back_behavior">Zurück-Knopf-Verhalten</string>
-    <string name="back_behavior_desc">Stelle ein, wie sich der Zurück-Knopf verhalten soll.</string>
-    <string name="ime">IME</string>
-    <string name="ime_method">Setze Eingabemethode</string>
-    <string name="ime_method_desc">Verwende IME im Spiel.</string>
-    <string name="config_autodetect">Konfigurations-Autoerkennung</string>
-    <string name="config_autodetect_desc">Dies wird versuchen, verschiedene Gamepads und/oder IME-Apps, die du verwendest, vorzukonfigurieren.</string>
-    <string name="list_autodetected">Liste von automatisch erkannten Geräten</string>
-    <string name="autodetected_pads">Konfigurations-Autoerkennung - Unterstützte Pads</string>
-    <string name="icade_profile_pad_one">iCade-Profil Pad 1</string>
-    <string name="icade_profile_pad_one_desc">Wähle das iCade-Profil für Controller 1.</string>
-    <string name="icade_profile_pad_two">iCade-Profil Pad 2</string>
-    <string name="icade_profile_pad_two_desc">Wähle das iCade-Profil für Controller 2.</string>
-    <string name="icade_profile_pad_three">iCade-Profil Pad 3</string>
-    <string name="icade_profile_pad_three_desc">Wähle das iCade-Profil für Controller 3.</string>
-    <string name="icade_profile_pad_four">iCade-Profil Pad 4</string>
-    <string name="icade_profile_pad_four_desc">Wähle das iCade-Profil für Controller 4.</string>
-    <string name="debug_input_reporting">Debugge Eingabe</string>
-    <string name="debug_input_reporting_desc">Blende von den Eingabegeräten empfangene Keycodes an. Nützlich zum Debuggen.</string>
-    <string name="touchscreen_overlay">Touchscreen-Overlay</string>
-    <string name="touchscreen_overlay_desc">Schalte Touchscreen-Overlays ein (WARNUNG: Niedriger aufgelöste Overlays können sich für Geräte mit wenig Leistung besser eignen.</string>
-    <string name="input_overlay">Eingabe-Overlay</string>
-    <string name="input_overlay_desc">Aktiviert eine Touchscreen-Overlay-Konfiguration.</string>
-    <string name="input_overlay_select">Wähle ein Eingabe-Overlay</string>
-    <string name="overlay_opacity">Overlay-Transparenz</string>
-    <string name="overlay_opacity_desc">Setzt die Transparenz der Touch-Overlays.</string>
-    <string name="custom_binds">Eigene Tastenbelegung</string>
-    <string name="player_1_custom_binds">Spieler 1 Tastenbelegung</string>
-    <string name="player_2_custom_binds">Spieler 2 Tastenbelegung</string>
-    <string name="player_3_custom_binds">Spieler 3 Tastenbelegung</string>
-    <string name="player_4_custom_binds">Spieler 4 Tastenbelegung</string>
-    <string name="up_button">Oben-Knopf</string>
-    <string name="down_button">Unten-Knopf</string>
-    <string name="left_button">Links-Knopf</string>
-    <string name="right_button">Rechts-Knopf</string>
-    <string name="a_button">A-Knopf</string>
-    <string name="b_button">B-Knopf</string>
-    <string name="x_button">X-Knopf</string>
-    <string name="y_button">Y-Knopf</string>
-    <string name="start_button">Start-Knopf</string>
-    <string name="select_button">Select-Knopf</string>
-    <string name="l1_button">L1-Knopf</string>
-    <string name="l2_button">L2-Knopf</string>
-    <string name="l3_button">L3-Knopf</string>
-    <string name="r1_button">R1-Knopf</string>
-    <string name="r2_button">R2-Knopf</string>
-    <string name="r3_button">R3-Knopf</string>
-    <string name="diagnostics">Diagnose</string>
-    <string name="current_ime">Akueller IME</string>
-    <string name="report_ime">IME melden</string>
-    <string name="report_ime_desc">Meldet den Namen des aktuellen IME (Input Method Editor).</string>
-
-    <!-- Path Settings -->
-    <string name="path_options">Pfade</string>
-    <string name="rom_paths">ROM-Pfade</string>
-    <string name="rom_directory">ROM-Verzeichnis</string>
-    <string name="rom_directory_desc">Setzt das Startverzeichnis für den ROM-Browser.</string>
-    <string name="rom_directory_select">Wähle ein ROM-Verzeichnis</string>
-    <string name="save_files">Spielstand-Dateien</string>
-    <string name="enable_custom_dir">Eigenes Verzeichnis verwenden</string>
-    <string name="savefiles_custom_dir">Aktiviert die Verwendung eines eigenen Verzeichnisses für Spielstand-Dateien (*.srm). Spielstände werden aus diesem Verzeichnis geladen und dort gespeichert. Ist diese Option ausgeschaltet, wird stattdessen das ROM-Verzeichnis für Spielstände mitgenutzt.</string>
-    <string name="savefile_directory">Spielstand-Verzeichnis</string>
-    <string name="savefile_directory_desc">Setzt das Verzeichnis, aus dem Spielstände geladen und in dem sie gespeichert werden.</string>
-    <string name="savefile_directory_select">Wähle ein Spielstand-Verzeichnis</string>
-    <string name="save_states">Savestates</string>
-    <string name="save_states_custom_dir">Aktiviert die Verwendung eines eigenen Verzeichnisses für Savestate-Dateien (*.state). Savestates werden aus diesem Verzeichnis geladen und dort gespeichert. Ist diese Option ausgeschaltet, wird stattdessen das ROM-Verzeichnis für Savestates mitgenutzt.</string>
-    <string name="save_state_directory">Savestate-Verzeichnis</string>
-    <string name="save_state_directory_desc">Setzt das Verzeichnis, aus dem Savestates geladen und in dem sie gespeichert werden.</string>
-    <string name="save_state_directory_select">Wähle ein Savestate-Verzeichnis</string>
-    <string name="system">System</string>
-    <string name="system_custom_dir">Aktiviert die Verwendung eines eigenen System-Verzeichnisses. Cores werden in diesem Ordner nach systemspezifischen Dateien (z.B. BIOS-Dateien) suchen. Ist diese Option ausgeschaltet, wird stattdessen das ROM-Verzeichnis durchsucht.</string>
-    <string name="system_directory">System-Verzeichnis</string>
-    <string name="system_directory_desc">Setzt das Verzeichnis, aus dem Systemdateien geladen werden.</string>
-    <string name="system_directory_select">Wähle ein System-Verzeichnis</string>
-
-    <!-- General Settings -->
-    <string name="general_options">Allgemein</string>
-    <string name="config_style">Konfigurationsart</string>
-    <string name="global_config">Globale Konfiguration</string>
-    <string name="global_config_desc">Verwende globale Einstellungen für alle Cores. Lasse dies ausgeschaltet, wenn du Cores einzeln konfigurieren willst.</string>
-    <string name="auto_load_state">Savestates automatisch laden</string>
-    <string name="auto_load_state_desc">Lädt einen automatisch erstellten Savestate (*.state.auto) beim Starten.</string>
-    <string name="auto_save_state">Savestates automatisch speichern</string>
-    <string name="auto_save_state_desc">Einen automatischen Savestate (*.state.auto) speichern, wenn ein Spiel beendet wird.</string>
-    <string name="rewinding">Zurückspulen</string>
-    <string name="rewinding_desc">Erlaube Echtzeit-Zurückspulen von Spielen. (WARNUNG: Sehr CPU-intensiv - wird Spiel-Leistung stark verringern - nur auf einem leistungsfähigen Gerät verwenden).</string>
-    <string name="rewind_granularity">Zurückspul-Genauigkeit</string>
-    <string name="rewind_granularity_desc">Anzahl von Frames festlegen, die auf einen Schlag zurückgespult werden sollen.</string>
-
-    <!-- Video Settings -->
-    <string name="video_options">Video</string>
-    <string name="fullscreen">Vollbild</string>
-    <string name="automatic">Automatisch</string>
-    <string name="square_pixel">Pixelquadrat</string>
-    <string name="vsync">Vertikale Synchronisation (VSync)</string>
-    <string name="vsync_desc">Verhindert Darstellungsfehler (Tearing).</string>
-    <string name="auto_rotate">Auto-Rotation</string>
-    <string name="auto_rotate_desc">Der Bildschirm wird für Spiele im Hochformat automatisch gedreht.</string>
-    <string name="scale_integer">Ganzzahlskalierung</string>
-    <string name="scale_integer_desc">Skaliert das Bild nur in ganzzahligen Vielfachen der Spielauflösung. Nützlich, wenn ohne Bilineare Filterung gespielt wird.</string>
-    <string name="aspect_ratio">Seitenverhältnis</string>
-    <string name="aspect_ratio_desc">Das zu erzwingende Bildseitenverhältnis.</string>
-    <string name="synchronization">Synchronisierung</string>
-    <string name="threaded_video_driver">Threaded-Grafiktreiber</string>
-    <string name="threaded_video_driver_desc">Verwendet einen Multi-Threading-Grafiktreiber. Dies führt sehr wahrscheinlich zu mehr Leistung, aber verursacht auch etwas mehr Latenz und Flimmern. Schalte dies ein, wenn du Probleme mit Video/Audio hast.</string>
-    <string name="forced_refresh_rate">Erzwinge Wiederholrate (Hz)</string>
-    <string name="forced_refresh_rate_desc">Erzwinge die Erkennung einer spezifische Wiederholrate. Nur dann manuell setzen, wenn die Kalibrierung eine falsche Wiederholrate meldet.</string>
-    <string name="calibrate_refresh_rate">Wiederholrate kalibrieren</string>
-    <string name="calibrate_refresh_rate_desc">Versucht, die echte Wiederholrate deines Monitors zu ermitteln. Aktualisiert den Wert der \'Erzwinge Wiederholrate (Hz)\'-Option. Um die Genauigkeit sicherzustellen, beende bitte aufwendige Hintergrunddienste und vermeide es, den Bildschirmschoner auszulösen.</string>
-    <string name="set_os_reported_refresh_rate">Nutze vom Betriebssystem gemeldete Widerholrate</string>
-    <string name="set_os_reported_refresh_rate_desc">Setzt die Wiederholrate auf den Wert, der vom Betriebssystem gemeldet wurde. Es kann sein, dass dieser Wert auf deinem Gerät ungenau ist.</string>
-    <string name="bilinear_filter">Bilinearer Filter</string>
-    <string name="bilinear_filter_desc">Wendet bilineare Filterung an und glättet Kanten (auch, wenn kein Shader ausgewählt wurde).</string>
-    <string name="fonts">Schriftarten</string>
-    <string name="onscreen_fonts">OSD-Schriftart</string>
-    <string name="onscreen_fonts_desc">Aktiviere das Rendern von OSD-Schriftarten für Nachrichten.</string>
-
-    <!-- Help Menu -->
-    <string name="websites">Webseiten</string>
-    <string name="retro_website">RetroArch/libretro-Homepage</string>
-    <string name="retro_website_desc">Die offizielle Homepage des RetroArch/libretro-Projekts.</string>
-    <string name="manuals">Handbücher</string>
-    <string name="retroarch_guide">RetroArch-Endbenutzer-Leitfaden (PDF)</string>
-    <string name="retroarch_guide_desc">Der Endbenutzer-Leitfaden für RetroArch im PDF-Format (in Englisch).</string>
-    <string name="development">Entwicklung</string>
-    <string name="overlay_guide">Overlay-Guide (PDF)</string>
-    <string name="overlay_guide_desc">Erklärt, wie du deine eigenen Overlays herstellen kannst (in Englisch).</string>
-    <string name="libretro_guide">Libretro-Guide (PDF)</string>
-    <string name="libretro_guide_desc">Entwickler-Leitfaden zum Verwenden von Libretro (in Englisch).</string>
-    
-    <!-- Miscellaneous -->
-    <string name="ok">OK</string>
-    <string name="close">Schließen</string>
-    <string name="enable">Aktivieren</string>
-    <string name="general">Allgemein</string>
-    <string name="no">Nein</string>
-    <string name="yes">Ja</string>
-
-    
-</resources>
diff --git a/pkg/android/phoenix/res/values/array.xml b/pkg/android/phoenix/res/values/array.xml
deleted file mode 100644
index 25b76f35bd..0000000000
--- a/pkg/android/phoenix/res/values/array.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="back_options" translatable="false">
-        <item>@string/quit</item>
-        <item>@string/gui_toggle</item>
-        <item>@string/menu_toggle</item>
-    </string-array>
-
-    <string-array name="back_options_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
-    <string-array name="audio_latency_options" translatable="false">
-        <item>@string/sixty_four_ms</item>
-        <item>@string/ninety_six_ms</item>
-        <item>@string/one_twenty_eight_ms</item>
-        <item>@string/one_sixty_ms</item>
-    </string-array>
-
-    <string-array name="audio_latency_options_values" translatable="false">
-       <item>64</item>
-       <item>96</item>
-       <item>128</item>
-       <item>160</item>
-    </string-array>
-
-    <string-array name="icade_profiles" translatable="false">
-        <item>Red Samurai</item>
-        <item>iPega PG-9017</item>
-        <item>iPega PG-9017 (Mode 2)</item>
-        <item>Gamestop Wireless</item>
-        <item>G910</item>
-        <item >Moga Hero Power</item>
-    </string-array>
-
-    <string-array name="icade_profiles_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item >5</item>
-    </string-array>
-</resources>
diff --git a/pkg/android/phoenix/res/values/dimens.xml b/pkg/android/phoenix/res/values/dimens.xml
deleted file mode 100644
index 89e0f5c9d8..0000000000
--- a/pkg/android/phoenix/res/values/dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/dimens.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Preference fragment padding, bottom -->
-    <dimen name="preference_fragment_padding_bottom">0dp</dimen>
-    <!-- Preference fragment padding, sides -->
-    <dimen name="preference_fragment_padding_side">16dp</dimen>
-
-    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
-
-</resources>
diff --git a/pkg/android/phoenix/res/values/strings.xml b/pkg/android/phoenix/res/values/strings.xml
deleted file mode 100644
index e49ca084ac..0000000000
--- a/pkg/android/phoenix/res/values/strings.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<resources>
-
-    <string name="app_name">RetroArch</string>
-    <string name="input_method">Input Method</string>
-    <string name="file_type_icon">File type icon</string>
-    <string name="optimal_settings_device">Optimal device settings</string>
-    <string name="extracting_assets_please_wait_">Extracting assets, please wait …</string>
-
-    <!-- Main Menu Strings -->
-    <string name="mainmenu_title">RetroArch - Main Menu</string>
-    <string name="resume_content">Load RetroArch</string>
-    <string name="load_core">Core Selection</string>
-    <string name="load_content">Load Content</string>
-    <string name="load_content_auto">Load Content (Detect Core)</string>
-    <string name="settings">Settings</string>
-    <string name="about">About</string>
-    <string name="quit_retroarch">Quit RetroArch</string>
-
-    <!-- Core Selection Class -->
-    <string name="select_libretro_core">Select a libretro core</string>
-
-    <!-- Display Refresh Rate Test Class -->
-    <string name="refresh_rate_calibration">Refresh rate calibration</string>
-    <string name="touch_screen_with_fingers">Touch the screen with your fingers for more accurate measurements.</string>
-    <string name="refresh_rate_measured_to">Refresh rate measured to: %1$s Hz.</string>
-
-    <!-- History Selection Class -->
-    <string name="loading_gamepath">Loading [%1$s]…</string>
-    
-    <!-- Key Bind Preference Class -->
-    <string name="current_binding">Current: %1$s</string>
-    <string name="press_key_to_use">Press key to use</string>
-
-    <!-- Core Autodetect strings -->
-    <string name="multiple_cores_detected">Multiple cores detected</string>
-    <string name="no_cores_detected">No supported cores detected</string>
-
-    <!-- Main Menu Class -->
-    <string name="welcome_to_retroarch">Welcome to RetroArch</string>
-    <string name="welcome_to_retroarch_desc">This is your first time starting up RetroArch. RetroArch will now be preconfigured for the best possible user experience.</string>
-    <string name="detect_device_msg_ouya">The ideal configuration options for your device will now be preconfigured.\n\nNOTE: For optimal performance, turn off Google Account sync, GPS and Wi-Fi in your Android settings menu.</string>
-    <string name="detect_device_msg_general">The ideal configuration options for your device will now be preconfigured.\n\nNOTE: For optimal performance, turn off Google Account sync, Google Play Store auto-updates, GPS and Wi-Fi in your Android settings menu.</string>
-    <string name="nvidia_shield_detected">NVidia Shield detected</string>
-    <string name="game_mid_detected">GameMID detected</string>
-    <string name="ouya_detected">OUYA detected</string>
-    <string name="xperia_play_detected">Xperia Play detected</string>
-    <string name="nexus_7_2013_detected">Nexus 7 2013 detected</string>
-    <string name="no_optimal_settings">Device either not detected in list or doesn\'t have any optimal settings in our database.</string>
-    <string name="load_a_core_first">Go to \'Load Core\' and select a core first.</string>
-    <string name="loading_data">Loading [%1$s]…</string>
-
-    <!-- Asset extraction dialog -->
-    <string name="asset_extraction">Asset Extraction</string>
-
-    <!-- GPL cores AlertDialog -->
-    <string name="keep_cores">Keep cores</string>
-    <string name="remove_cores">Remove non-GPL cores</string>
-    
-    <!-- Refresh Rate Set OS Class -->
-    <string name="using_os_reported_refresh_rate">Using OS-reported refresh rate of: %1$s Hz.</string>
-    
-    <!-- Settings Based Strings -->
-
-    <!-- Back Options -->
-    <string name="quit">Quit</string>
-    <string name="gui_toggle">GUI toggle</string>
-    <string name="menu_toggle">Menu toggle</string>
-    
-    <!-- Audio Settings -->
-    <string name="audio_options">Audio</string>
-    <string name="enable_audio">Enable audio</string>
-    <string name="dynamic_rate_control">Dynamic rate control</string>
-    <string name="dynamic_rate_control_desc">Enable dynamic rate control (recommended).</string>
-    <string name="audio_latency">Audio latency</string>
-    <string name="audio_latency_desc">Set the amount of desired audio latency. Your mileage may vary on the device you are using.</string>
-    <string name="auto_audio_latency">Automatically detect audio latency</string>
-    <string name="auto_audio_latency_desc">Use automatic audio latency detection. Only available for Android 4.1 and up - your mileage may vary based on the device you are using.</string>
-    <string name="sixty_four_ms">64ms (Low)</string>
-    <string name="ninety_six_ms">96ms (Medium)</string>
-    <string name="one_twenty_eight_ms">128ms (Medium)</string>
-    <string name="one_sixty_ms">160ms (High)</string>
-
-    <!-- Input Settings -->
-    <string name="input_options">Input</string>
-    <string name="back_behavior">Back behavior</string>
-    <string name="back_behavior_desc">Select how you want the Back button to behave.</string>
-    <string name="ime">IME</string>
-    <string name="ime_method">Set Input Method</string>
-    <string name="ime_method_desc">Sets IME to be used in-game.</string>
-    <string name="config_autodetect">Configuration autodetection</string>
-    <string name="config_autodetect_desc">This will attempt to preconfigure various gamepads and/or IME apps that you connect.</string>
-    <string name="list_autodetected">List of autodetected devices</string>
-    <string name="autodetected_pads">Configuration Autodetect - Supported Pads</string>
-    <string name="icade_profile_pad_one">iCade profile Pad 1</string>
-    <string name="icade_profile_pad_one_desc">Select the iCade profile to use for controller 1.</string>
-    <string name="icade_profile_pad_two">iCade profile Pad 2</string>
-    <string name="icade_profile_pad_two_desc">Select the iCade profile to use for controller 2.</string>
-    <string name="icade_profile_pad_three">iCade profile Pad 3</string>
-    <string name="icade_profile_pad_three_desc">Select the iCade profile to use for controller 3.</string>
-    <string name="icade_profile_pad_four">iCade profile Pad 4</string>
-    <string name="icade_profile_pad_four_desc">Select the iCade profile to use for controller 4.</string>
-    <string name="debug_input_reporting">Debug input reporting</string>
-    <string name="debug_input_reporting_desc">This will report keycodes on-screen generated by your input device(s). Useful for debugging.</string>
-    <string name="touchscreen_overlay">Touchscreen Overlay</string>
-    <string name="touchscreen_overlay_desc">Enable touchscreen overlays (WARNING: Lower-resolution overlays might be more suitable for less powerful devices).</string>
-    <string name="input_overlay">Input overlay</string>
-    <string name="input_overlay_desc">Sets touchscreen overlay config.</string>
-    <string name="input_overlay_select">Select an input overlay</string>
-    <string name="overlay_opacity">Overlay opacity</string>
-    <string name="overlay_opacity_desc">Set the opacity of the touch overlay.</string>
-    <string name="custom_binds">Custom Binds</string>
-    <string name="player_1_custom_binds">User 1 Custom Binds</string>
-    <string name="player_2_custom_binds">User 2 Custom Binds</string>
-    <string name="player_3_custom_binds">User 3 Custom Binds</string>
-    <string name="player_4_custom_binds">User 4 Custom Binds</string>
-    <string name="up_button">Up Button</string>
-    <string name="down_button">Down Button</string>
-    <string name="left_button">Left Button</string>
-    <string name="right_button">Right Button</string>
-    <string name="a_button">A Button</string>
-    <string name="b_button">B Button</string>
-    <string name="x_button">X Button</string>
-    <string name="y_button">Y Button</string>
-    <string name="start_button">Start Button</string>
-    <string name="select_button">Select Button</string>
-    <string name="l1_button">L1 Button</string>
-    <string name="l2_button">L2 Button</string>
-    <string name="l3_button">L3 Button</string>
-    <string name="r1_button">R1 Button</string>
-    <string name="r2_button">R2 Button</string>
-    <string name="r3_button">R3 Button</string>
-    <string name="diagnostics">Diagnostics</string>
-    <string name="current_ime">Current IME</string>
-    <string name="report_ime">Report IME</string>
-    <string name="report_ime_desc">Reports the current IME (Input Method Editor) name.</string>
-
-    <!-- Path Settings -->
-    <string name="path_options">Paths</string>
-    <string name="rom_paths">ROM paths</string>
-    <string name="rom_directory">ROM directory</string>
-    <string name="rom_directory_desc">Sets directory where ROM browser will first browse for ROM files.</string>
-    <string name="rom_directory_select">Select a ROM directory</string>
-    <string name="save_files">Save files</string>
-    <string name="enable_custom_dir">Enable custom directory</string>
-    <string name="savefiles_custom_dir">Enables use of custom save file folder. (.srm) save files will be saved and loaded to configured directory. If not enabled, save files will reside in ROM folder.</string>
-    <string name="savefile_directory">Savefile directory</string>
-    <string name="savefile_directory_desc">Sets directory where to save and load game save files.</string>
-    <string name="savefile_directory_select">Select a savefile directory</string>
-    <string name="save_states">Save states</string>
-    <string name="save_states_custom_dir">Enables use of custom save state folder. (.state) save states will be saved and loaded to configured directory. If not enabled, save states will reside in ROM folder.</string>
-    <string name="save_state_directory">Save state directory</string>
-    <string name="save_state_directory_desc">Sets directory where to save and load game save states.</string>
-    <string name="save_state_directory_select">Select a savestate directory</string>
-    <string name="system">System</string>
-    <string name="system_custom_dir">Enables use of custom system folder. Cores will look for system specific files, like BIOSes, in this folder. If not enabled, it will look in the ROM folder.</string>
-    <string name="system_directory">System directory</string>
-    <string name="system_directory_desc">Sets directory where system files are loaded from.</string>
-    <string name="system_directory_select">Select a system directory</string>
-
-    <!-- General Settings -->
-    <string name="general_options">General</string>
-    <string name="config_style">Configuration style</string>
-    <string name="global_config">Global configuration</string>
-    <string name="global_config_desc">Enable global settings for all cores. Leave disabled if you want per-core settings.</string>
-    <string name="auto_load_state">Auto load state</string>
-    <string name="auto_load_state_desc">Loads an automatically created savestate (*.state.auto) at startup.</string>
-    <string name="auto_save_state">Auto save state</string>
-    <string name="auto_save_state_desc">Automatically saves state (*.state.auto) when exiting game.</string>
-    <string name="rewinding">Rewinding</string>
-    <string name="rewinding_desc">Enable real-time rewinding of gameplay. (WARNING: Very CPU intensive - will decrease ingame performance by a lot - only use this option on a powerful device).</string>
-    <string name="rewind_granularity">Rewind Granularity</string>
-    <string name="rewind_granularity_desc">Number of frames to rewind at a time.</string>
-
-    <!-- Video Settings -->
-    <string name="video_options">Video</string>
-    <string name="fullscreen">Full screen</string>
-    <string name="automatic">Auto</string>
-    <string name="square_pixel">Square pixel</string>
-    <string name="vsync">VSync</string>
-    <string name="vsync_desc">When set to enabled, prevents screen tearing.</string>
-    <string name="auto_rotate">Auto-rotate</string>
-    <string name="auto_rotate_desc">Will auto-rotate the screen for vertically oriented games.</string>
-    <string name="scale_integer">Scale integer</string>
-    <string name="scale_integer_desc">Scales video only in whole steps of game resolution. Useful when playing without bilinear filtering.</string>
-    <string name="aspect_ratio">Aspect ratio</string>
-    <string name="aspect_ratio_desc">Aspect ratio to enforce.</string>
-    <string name="synchronization">Synchronization</string>
-    <string name="threaded_video_driver">Threaded video driver</string>
-    <string name="threaded_video_driver_desc">Uses a multi-threaded video driver. Is likely to improve performance at the expense of slightly more latency and jitter. Use this if you have troubles getting good video and audio.</string>
-    <string name="forced_refresh_rate">Forced refresh rate (Hz)</string>
-    <string name="forced_refresh_rate_desc">Force a specific refresh rate to be detected. Only set manually if calibration reports wrong refresh rate.</string>
-    <string name="calibrate_refresh_rate">Calibrate refresh rate</string>
-    <string name="calibrate_refresh_rate_desc">Attempts to find the true refresh rate of monitor. Updates value in \'Force refresh rate (Hz)\' option. To help ensure accuracy, make sure no intense background services are running, and avoid triggering screensaver.</string>
-    <string name="set_os_reported_refresh_rate">Set OS-reported refresh rate</string>
-    <string name="set_os_reported_refresh_rate_desc">Sets refresh rate equal to OS-reported value. This might not be accurate for your device.</string>
-    <string name="bilinear_filter">Bilinear filter</string>
-    <string name="bilinear_filter_desc">Applies Bilinear filtering, smooths out edges (settings still apply even if no shader is selected).</string>
-    <string name="fonts">Fonts</string>
-    <string name="onscreen_fonts">On-screen fonts</string>
-    <string name="onscreen_fonts_desc">Enable rendering of on-screen fonts for messages.</string>
-
-    <!-- Help Menu -->
-    <string name="websites">Websites</string>
-    <string name="retro_website">RetroArch/libretro homepage</string>
-    <string name="retro_website_desc">The official homepage of the RetroArch/libretro project.</string>
-    <string name="manuals">Manuals</string>
-    <string name="retroarch_guide">RetroArch Enduser Guide (PDF)</string>
-    <string name="retroarch_guide_desc">The enduser guide to RetroArch in PDF format.</string>
-    <string name="development">Development</string>
-    <string name="overlay_guide">Overlay Guide (PDF)</string>
-    <string name="overlay_guide_desc">Explains howto make your own overlays.</string>
-    <string name="libretro_guide">Libretro Guide (PDF)</string>
-    <string name="libretro_guide_desc">Guide to using libretro for developers.</string>
-    
-    <!-- Miscellaneous -->
-    <string name="ok">OK</string>
-    <string name="close">Close</string>
-    <string name="enable">Enable</string>
-    <string name="general">General</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-
-    
-</resources>
diff --git a/pkg/android/phoenix/res/xml/audio_preferences.xml b/pkg/android/phoenix/res/xml/audio_preferences.xml
deleted file mode 100644
index 1a42da4399..0000000000
--- a/pkg/android/phoenix/res/xml/audio_preferences.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="audio_enable"
-        android:title="@string/enable_audio" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="audio_rate_control"
-        android:summary="@string/dynamic_rate_control_desc"
-        android:title="@string/dynamic_rate_control"
-        android:dependency="audio_enable" />
-    <ListPreference
-        android:entries="@array/audio_latency_options"
-        android:entryValues="@array/audio_latency_options_values"
-        android:defaultValue="64"
-        android:key="audio_latency"
-        android:summary="@string/audio_latency_desc"
-        android:title="@string/audio_latency"
-        android:dependency="audio_enable" />
-</PreferenceScreen>
diff --git a/pkg/android/phoenix/res/xml/general_preferences.xml b/pkg/android/phoenix/res/xml/general_preferences.xml
deleted file mode 100644
index 493173e660..0000000000
--- a/pkg/android/phoenix/res/xml/general_preferences.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Configuration Style -->
-    <PreferenceCategory android:title="@string/config_style" >
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="global_config_enable"
-            android:summary="@string/global_config_desc"
-            android:title="@string/global_config" />
-    </PreferenceCategory>
-
-    <!-- General -->
-    <PreferenceCategory android:title="@string/general" >
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="savestate_auto_load"
-            android:summary="@string/auto_load_state_desc"
-            android:title="@string/auto_load_state" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="savestate_auto_save"
-            android:summary="@string/auto_save_state_desc"
-            android:title="@string/auto_save_state" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/pkg/android/phoenix/res/xml/input_preferences.xml b/pkg/android/phoenix/res/xml/input_preferences.xml
deleted file mode 100644
index 152ee08058..0000000000
--- a/pkg/android/phoenix/res/xml/input_preferences.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- IME -->
-    <PreferenceCategory android:title="@string/ime" >
-         <Preference
-             android:key="set_ime_pref"
-             android:summary="@string/ime_method_desc"
-             android:title="@string/ime_method" />
-    </PreferenceCategory>
-
-    <!-- Configuration Autodetection -->
-    <PreferenceCategory android:title="@string/config_autodetect" >
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="input_autodetect_enable"
-            android:summary="@string/config_autodetect_desc"
-            android:title="@string/enable"
-            android:disableDependentsState="true" />
-    </PreferenceCategory>
-
-    <!-- Touchscreen Overlay -->
-    <PreferenceCategory android:title="@string/touchscreen_overlay" >
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="input_overlay_enable"
-            android:summary="@string/touchscreen_overlay_desc"
-            android:title="@string/enable" />
-
-        <Preference
-            android:key="inputOverlayDirPref"
-            android:summary="@string/input_overlay_desc"
-            android:title="@string/input_overlay"
-            android:dependency="input_overlay_enable"/>
-
-        <com.retroarch.browser.preferences.util.SeekbarPreference
-            android:summary="@string/overlay_opacity_desc"
-            android:title="@string/overlay_opacity"
-            android:key="input_overlay_opacity"
-            android:dependency="input_overlay_enable" />
-    </PreferenceCategory>
-
-    <!-- Diagnostics -->
-    <PreferenceCategory android:title="@string/diagnostics" >
-        <Preference
-            android:key="report_ime_pref"
-            android:title="@string/report_ime"
-            android:summary="@string/report_ime_desc"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/pkg/android/phoenix/res/xml/main_menu.xml b/pkg/android/phoenix/res/xml/main_menu.xml
deleted file mode 100644
index a2e5416101..0000000000
--- a/pkg/android/phoenix/res/xml/main_menu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/mainmenu_title" >
-
-    <!-- Resume Content -->
-    <Preference
-        android:key="resumeContentPref"
-        android:title="@string/resume_content"/>
-
-    <!-- Quit RetroArch -->
-    <Preference
-        android:key="quitRetroArch"
-        android:title="@string/quit_retroarch"/>
-</PreferenceScreen>
diff --git a/pkg/android/phoenix/res/xml/path_preferences.xml b/pkg/android/phoenix/res/xml/path_preferences.xml
deleted file mode 100644
index 2450628a84..0000000000
--- a/pkg/android/phoenix/res/xml/path_preferences.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- ROM Paths -->
-    <PreferenceCategory android:title="@string/rom_paths">
-        <Preference
-            android:key="romDirPref"
-            android:title="@string/rom_directory"
-            android:summary="@string/rom_directory_desc"/>
-    </PreferenceCategory>
-
-    <!-- Save Files -->
-    <PreferenceCategory android:title="@string/save_files">
-        <CheckBoxPreference android:title="@string/enable_custom_dir"
-            android:summary="@string/savefiles_custom_dir"
-            android:key="savefile_directory_enable"
-            android:defaultValue="false"/>
-        <Preference
-            android:key="srmDirPref"
-            android:title="@string/savefile_directory"
-            android:summary="@string/savefile_directory_desc"
-            android:dependency="savefile_directory_enable"/>
-    </PreferenceCategory>
-
-    <!-- Save States -->
-    <PreferenceCategory android:title="@string/save_states">
-        <CheckBoxPreference android:title="@string/enable_custom_dir"
-            android:summary="@string/save_states_custom_dir"
-            android:key="savestate_directory_enable"
-            android:defaultValue="false"/>
-        <Preference
-            android:key="saveStateDirPref"
-            android:title="@string/save_state_directory"
-            android:summary="@string/save_state_directory_desc"
-            android:dependency="savestate_directory_enable"/>
-    </PreferenceCategory>
-
-    <!-- System -->
-    <PreferenceCategory android:title="@string/system">
-        <CheckBoxPreference android:title="@string/enable_custom_dir"
-            android:summary="@string/system_custom_dir"
-            android:key="system_directory_enable"
-            android:defaultValue="false"/>
-        <Preference
-            android:key="systemDirPref"
-            android:title="@string/system_directory"
-            android:summary="@string/system_directory_desc"
-            android:dependency="system_directory_enable"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/pkg/android/phoenix/res/xml/video_preferences.xml b/pkg/android/phoenix/res/xml/video_preferences.xml
deleted file mode 100644
index 2f20369611..0000000000
--- a/pkg/android/phoenix/res/xml/video_preferences.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-        <!-- General -->
-        <PreferenceCategory android:title="@string/general" >
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="video_vsync"
-                android:summary="@string/vsync_desc"
-                android:title="@string/vsync" />
-        </PreferenceCategory>
-
-        <!-- Synchronization -->
-        <PreferenceCategory android:title="@string/synchronization" >
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="video_threaded"
-                android:summary="@string/threaded_video_driver_desc"
-                android:title="@string/threaded_video_driver" />
-            <EditTextPreference
-                android:key="video_refresh_rate"
-                android:numeric="decimal"
-                android:summary="@string/forced_refresh_rate_desc"
-                android:title="@string/forced_refresh_rate" />
-            <Preference
-                android:summary="@string/calibrate_refresh_rate_desc"
-                android:title="@string/calibrate_refresh_rate" >
-                <intent
-                    android:targetClass="com.retroarch.browser.DisplayRefreshRateTest"
-                    android:targetPackage="com.retroarch" />
-            </Preference>
-            <Preference
-                android:key="set_os_reported_ref_rate_pref"
-                android:summary="@string/set_os_reported_refresh_rate_desc"
-                android:title="@string/set_os_reported_refresh_rate" />
-        </PreferenceCategory>
-    </PreferenceScreen>