Merge pull request #5947 from mahdihijazi/cleanup

[Android] Cleanup unused resources & code

24 files changed, 0 insertions, 88 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Pixels.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Pixels.java
deleted file mode 100644
index 527badd090..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Pixels.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.dolphinemu.dolphinemu.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.DisplayMetrics;
-
-public final class Pixels
-{
-	private Pixels()
-	{
-	}
-
-	public static float convertDpToPx(float original, Context context)
-	{
-		Resources resources = context.getResources();
-		DisplayMetrics metrics = resources.getDisplayMetrics();
-
-		return original * metrics.density;
-	}
-
-	public static float convertPxToDp(float original, Context context)
-	{
-		Resources resources = context.getResources();
-		DisplayMetrics metrics = resources.getDisplayMetrics();
-
-		return original / metrics.density;
-	}
-}
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_cancel.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_cancel.png
deleted file mode 100644
index de2043e6e1..0000000000
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_cancel.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png
deleted file mode 100644
index 82055ae1d6..0000000000
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index 23b76c0f6f..0000000000
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png
deleted file mode 100644
index 5cf2b19bd6..0000000000
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png
deleted file mode 100644
index 6b3042e829..0000000000
--- a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_cancel.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_cancel.png
deleted file mode 100644
index 0e5efa1ad7..0000000000
--- a/Source/Android/app/src/main/res/drawable-mdpi/ic_cancel.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
deleted file mode 100644
index f9af37f874..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_cancel.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_cancel.png
deleted file mode 100644
index b02fdd573c..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_cancel.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png
deleted file mode 100644
index d1e4eeca9b..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index 18bbcccab3..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png
deleted file mode 100644
index 23d43594b3..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png
deleted file mode 100644
index 5417d1b10f..0000000000
--- a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
deleted file mode 100644
index 05af18d58b..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_cancel.png
deleted file mode 100644
index ba11631dd2..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_cancel.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png
deleted file mode 100644
index 31c36fa329..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index d9712cc93f..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png
deleted file mode 100644
index 13dcf24ccf..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png
deleted file mode 100644
index f541fa544a..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
deleted file mode 100644
index a595593dc0..0000000000
--- a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
+++ /dev/null
diff --git a/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml b/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
deleted file mode 100644
index 01f167dc6b..0000000000
--- a/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                           android:layout_width="match_parent"
-                                                           android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:background="@android:color/white"
-        android:elevation="@dimen/elevation_high"
-        android:orientation="vertical">
-
-        <include
-            android:id="@+id/list_item_controller_one"
-            layout="@layout/list_item_setting"/>
-
-        <include
-            android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"/>
-
-        <include
-            android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"/>
-
-        <include
-            android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"/>
-
-    </LinearLayout>
-
-</org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/transition/change_image_transform.xml b/Source/Android/app/src/main/res/transition/change_image_transform.xml
deleted file mode 100644
index 3ee92bd7c4..0000000000
--- a/Source/Android/app/src/main/res/transition/change_image_transform.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<transitionSet>
-    <changeImageTransform/>
-</transitionSet>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
index ba98e10607..0798c90a96 100644
--- a/Source/Android/app/src/main/res/values/dimens.xml
+++ b/Source/Android/app/src/main/res/values/dimens.xml
@@ -1,19 +1,11 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <dimen name="diameter">48dp</dimen>
     <dimen name="elevation_low">1dp</dimen>
     <dimen name="elevation_high">4dp</dimen>
-    <dimen name="add_button_margin">16dp</dimen>
 
-    <dimen name="main_appbar_height">128dp</dimen>
-
-    <dimen name="spacing_xsmall">2dp</dimen>
     <dimen name="spacing_small">4dp</dimen>
-    <dimen name="spacing_medium">8dp</dimen>
     <dimen name="spacing_medlarge">12dp</dimen>
     <dimen name="spacing_large">16dp</dimen>
-    <dimen name="spacing_xlarge">32dp</dimen>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index ae7a869223..1728bb8bcd 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -52,23 +52,8 @@
     </style>
 
     <!-- Themes for Dialogs -->
-    <style name="DolphinDialogBase" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-    </style>
 
     <!-- Inherit from the Base Dolphin Dialog Theme -->
-    <style name="DolphinDialogWii" parent="DolphinDialogBase">
-        <item name="colorAccent">@color/dolphin_accent_wii</item>
-    </style>
-
-    <style name="DolphinDialogGamecube" parent="DolphinDialogBase">
-        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
-    </style>
-
-    <style name="DolphinDialogWiiware" parent="DolphinDialogBase">
-        <item name="colorAccent">@color/dolphin_accent_wiiware</item>
-    </style>
 
     <style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/dolphin_blue</item>