aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/android/android.mk8
-rw-r--r--dists/android/res/drawable-hdpi/ic_action_keyboard.pngbin0 -> 395 bytes
-rwxr-xr-xdists/android/res/drawable-hdpi/ic_action_settings.pngbin437 -> 0 bytes
-rw-r--r--dists/android/res/drawable-mdpi/ic_action_keyboard.pngbin0 -> 394 bytes
-rwxr-xr-xdists/android/res/drawable-mdpi/ic_action_settings.pngbin310 -> 0 bytes
-rw-r--r--dists/android/res/drawable-xhdpi/ic_action_keyboard.pngbin0 -> 553 bytes
-rwxr-xr-xdists/android/res/drawable-xhdpi/ic_action_settings.pngbin471 -> 0 bytes
-rw-r--r--dists/android/res/drawable-xxhdpi/ic_action_keyboard.pngbin0 -> 628 bytes
-rwxr-xr-xdists/android/res/drawable-xxhdpi/ic_action_settings.pngbin672 -> 0 bytes
-rw-r--r--dists/android/res/layout/main.xml2
10 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index eaae5dd3dd..42fc718754 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -22,10 +22,10 @@ RESOURCES = \
$(PATH_BUILD_RES)/drawable/scummvm_big.png \
$(PATH_BUILD_RES)/drawable-xhdpi/leanback_icon.png \
$(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png \
- $(PATH_BUILD_RES)/drawable-hdpi/ic_action_settings.png \
- $(PATH_BUILD_RES)/drawable-mdpi/ic_action_settings.png \
- $(PATH_BUILD_RES)/drawable-xhdpi/ic_action_settings.png \
- $(PATH_BUILD_RES)/drawable-xxhdpi/ic_action_settings.png
+ $(PATH_BUILD_RES)/drawable-hdpi/ic_action_keyboard.png \
+ $(PATH_BUILD_RES)/drawable-mdpi/ic_action_keyboard.png \
+ $(PATH_BUILD_RES)/drawable-xhdpi/ic_action_keyboard.png \
+ $(PATH_BUILD_RES)/drawable-xxhdpi/ic_action_keyboard.png
DIST_ANDROID_MK = $(PATH_DIST)/jni/Android.mk
DIST_BUILD_XML = $(PATH_DIST)/custom_rules.xml
diff --git a/dists/android/res/drawable-hdpi/ic_action_keyboard.png b/dists/android/res/drawable-hdpi/ic_action_keyboard.png
new file mode 100644
index 0000000000..69491c9a8c
--- /dev/null
+++ b/dists/android/res/drawable-hdpi/ic_action_keyboard.png
Binary files differ
diff --git a/dists/android/res/drawable-hdpi/ic_action_settings.png b/dists/android/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100755
index d9733250f5..0000000000
--- a/dists/android/res/drawable-hdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/dists/android/res/drawable-mdpi/ic_action_keyboard.png b/dists/android/res/drawable-mdpi/ic_action_keyboard.png
new file mode 100644
index 0000000000..3c3b3ca7be
--- /dev/null
+++ b/dists/android/res/drawable-mdpi/ic_action_keyboard.png
Binary files differ
diff --git a/dists/android/res/drawable-mdpi/ic_action_settings.png b/dists/android/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100755
index 8987358021..0000000000
--- a/dists/android/res/drawable-mdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/dists/android/res/drawable-xhdpi/ic_action_keyboard.png b/dists/android/res/drawable-xhdpi/ic_action_keyboard.png
new file mode 100644
index 0000000000..6acead08ac
--- /dev/null
+++ b/dists/android/res/drawable-xhdpi/ic_action_keyboard.png
Binary files differ
diff --git a/dists/android/res/drawable-xhdpi/ic_action_settings.png b/dists/android/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100755
index fb8f3343c8..0000000000
--- a/dists/android/res/drawable-xhdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png b/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png
new file mode 100644
index 0000000000..dae5aa6684
--- /dev/null
+++ b/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png
Binary files differ
diff --git a/dists/android/res/drawable-xxhdpi/ic_action_settings.png b/dists/android/res/drawable-xxhdpi/ic_action_settings.png
deleted file mode 100755
index 51f7527789..0000000000
--- a/dists/android/res/drawable-xxhdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index fa4bb66af9..79ce4b67d6 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -19,7 +19,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_settings"
+ android:src="@drawable/ic_action_keyboard"
android:id="@+id/show_keyboard"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"