Merge pull request #9058 from Ebola16/T

Android: Remove unused files
dolphin-emu · Sep 1, 2020 · 39a849a · 39a849a
2 parents e0b64e0 + 05f3c4d
commit 39a849a
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 213 deletions.
diff --git a/...oid/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java b/...oid/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java
diff --git a/...rc/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java b/...rc/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java
diff --git a/...app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java b/...app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
@@ -2,15 +2,15 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- This animation is used ONLY when a submenu is replaced. -->
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    <objectAnimator
         android:propertyName="translationX"
         android:valueType="floatType"
         android:valueFrom="0"
         android:valueTo="-1280dp"
         android:interpolator="@android:interpolator/decelerate_quad"
         android:duration="200"/>
 
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    <objectAnimator
         android:propertyName="alpha"
         android:valueType="floatType"
         android:valueFrom="1"

diff --git a/Source/Android/app/src/main/res/animator/button_elevation.xml b/Source/Android/app/src/main/res/animator/button_elevation.xml
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
@@ -2,20 +2,20 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- This animation is used ONLY when a submenu is replaced. -->
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="translationX"
-                    android:valueType="floatType"
-                    android:valueFrom="0"
-                    android:valueTo="1280dp"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="200"/>
+    <objectAnimator
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1280dp"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
 
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="alpha"
-                    android:valueType="floatType"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="200"/>
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="1"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
 
-</set>
+</set>
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
diff --git a/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
@@ -7,7 +7,6 @@
 
     <!-- Places the emulation surface to the top half of the screen -->
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"

diff --git a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
@@ -17,7 +17,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <FrameLayout
             android:id="@+id/frame_menu"

diff --git a/Source/Android/app/src/main/res/layout/activity_add_directory.xml b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
diff --git a/Source/Android/app/src/main/res/layout/list_item_file.xml b/Source/Android/app/src/main/res/layout/list_item_file.xml
diff --git a/Source/Android/app/src/main/res/layout/list_item_settings_header.xml b/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
@@ -14,6 +14,6 @@
         android:layout_marginBottom="@dimen/spacing_small"
         android:textColor="?android:colorAccent"
         android:textStyle="bold"
-        android:layout_gravity="left|bottom"/>
+        android:layout_gravity="start|bottom"/>
 
-</FrameLayout>
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/tv_title.xml b/Source/Android/app/src/main/res/layout/tv_title.xml
@@ -12,7 +12,7 @@
             android:visibility="gone"
             android:layout_alignTop="@+id/badge"
             android:layout_alignBottom="@+id/badge"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:id="@+id/title"
             android:gravity="center_vertical"
             android:layout_width="wrap_content"
@@ -21,7 +21,7 @@
 
         <ImageView
             android:visibility="gone"
-            android:layout_toLeftOf="@id/title"
+            android:layout_toStartOf="@id/title"
             android:id="@+id/badge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
@@ -9,8 +9,6 @@
     <color name="dolphin_accent_wiiware">#2979ff</color>
     <color name="dolphin_accent_gamecube">#651fff</color>
 
-    <color name="circle_grey">#bdbdbd</color>
-
     <color name="tv_card_unselected">#444444</color>
 
-</resources>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
@@ -2,9 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
 
-    <dimen name="elevation_low">1dp</dimen>
-    <dimen name="elevation_high">4dp</dimen>
-
     <dimen name="spacing_small">4dp</dimen>
     <dimen name="spacing_medlarge">12dp</dimen>
     <dimen name="spacing_large">16dp</dimen>

diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
@@ -302,6 +302,7 @@
     <string name="other">Other</string>
 
     <!-- Game Grid Screen-->
+    <string name="add_directory_title">Add Folder to Library</string>
     <string name="grid_menu_config">Config</string>
     <string name="grid_menu_graphics_settings">Graphics Settings</string>
     <string name="grid_menu_gcpad_settings">GameCube Input</string>
@@ -312,11 +313,6 @@
     <string name="wad_install_success">Successfully installed this title to the NAND.</string>
     <string name="wad_install_failure">Failed to install this title to the NAND.</string>
 
-    <!-- Add Directory Screen-->
-    <string name="add_directory_title">Add Folder to Library</string>
-    <string name="add_directory_up_one_level">Up one level</string>
-    <string name="add_directory_empty_folder">That folder is empty.</string>
-
     <!-- Preferences Screen -->
     <string name="preferences_save_exit">Save and Exit</string>
     <string name="preferences_settings">Settings</string>