On-screen keyboard visible size - buttons are smaller but touch area is still big

2011-07-27 11:55:52 +03:00
parent da5072109f
commit a62403da1d
11 changed files with 92 additions and 17 deletions
--- a/project/java/Globals.java
+++ b/project/java/Globals.java
@@ -60,6 +60,7 @@ class Globals {
 	public static boolean UseAccelerometerAsArrowKeys = false;
 	public static boolean UseTouchscreenKeyboard = true;
 	public static int TouchscreenKeyboardSize = 0;
+	public static int TouchscreenKeyboardDrawSize = 1;
 	public static int TouchscreenKeyboardTheme = 2;
 	public static int TouchscreenKeyboardTransparency = 2;
 	public static int AccelerometerSensitivity = 2;
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -142,6 +142,7 @@ class Settings
 			for(int i = 0; i < Globals.OptionalDataDownload.length; i++)
 				out.writeBoolean(Globals.OptionalDataDownload[i]);
 			out.writeBoolean(Globals.BrokenLibCMessageShown);
+			out.writeInt(Globals.TouchscreenKeyboardDrawSize);

 			out.close();
 			settingsLoaded = true;
@@ -277,6 +278,7 @@ class Settings
 			for(int i = 0; i < Globals.OptionalDataDownload.length; i++)
 				Globals.OptionalDataDownload[i] = settingsFile.readBoolean();
 			Globals.BrokenLibCMessageShown = settingsFile.readBoolean();
+			Globals.TouchscreenKeyboardDrawSize = settingsFile.readInt();
 			
 			settingsLoaded = true;

@@ -604,6 +606,7 @@ class Settings
 			{
 				new ScreenKeyboardThemeConfig(),
 				new ScreenKeyboardSizeConfig(),
+				new ScreenKeyboardDrawSizeConfig(),
 				new ScreenKeyboardTransparencyConfig(),
 				new RemapScreenKbConfig(),
 				new CustomizeScreenKbLayout(),
@@ -994,6 +997,44 @@ class Settings
 		}
 	}

+	static class ScreenKeyboardDrawSizeConfig extends Menu
+	{
+		String title(final MainActivity p)
+		{
+			return p.getResources().getString(R.string.controls_screenkb_drawsize);
+		}
+		void run (final MainActivity p)
+		{
+			final CharSequence[] items = {	p.getResources().getString(R.string.controls_screenkb_large),
+											p.getResources().getString(R.string.controls_screenkb_medium),
+											p.getResources().getString(R.string.controls_screenkb_small),
+											p.getResources().getString(R.string.controls_screenkb_tiny) };
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(p);
+			builder.setTitle(p.getResources().getString(R.string.controls_screenkb_drawsize));
+			builder.setSingleChoiceItems(items, Globals.TouchscreenKeyboardDrawSize, new DialogInterface.OnClickListener() 
+			{
+				public void onClick(DialogInterface dialog, int item) 
+				{
+					Globals.TouchscreenKeyboardDrawSize = item;
+
+					dialog.dismiss();
+					goBack(p);
+				}
+			});
+			builder.setOnCancelListener(new DialogInterface.OnCancelListener()
+			{
+				public void onCancel(DialogInterface dialog)
+				{
+					goBack(p);
+				}
+			});
+			AlertDialog alert = builder.create();
+			alert.setOwnerActivity(p);
+			alert.show();
+		}
+	}
+
 	static class ScreenKeyboardThemeConfig extends Menu
 	{
 		String title(final MainActivity p)
@@ -2358,6 +2399,7 @@ class Settings
 			{
 				nativeSetTouchscreenKeyboardUsed();
 				nativeSetupScreenKeyboard(	Globals.TouchscreenKeyboardSize,
+											Globals.TouchscreenKeyboardDrawSize,
 											Globals.TouchscreenKeyboardTheme,
 											Globals.AppTouchscreenKeyboardKeysAmountAutoFire,
 											Globals.TouchscreenKeyboardTransparency );
@@ -2446,7 +2488,7 @@ class Settings
 	private static native void nativeSetSmoothVideo();
 	private static native void nativeSetCompatibilityHacks();
 	private static native void nativeSetVideoMultithreaded();
-	private static native void nativeSetupScreenKeyboard(int size, int theme, int nbuttonsAutoFire, int transparency);
+	private static native void nativeSetupScreenKeyboard(int size, int drawsize, int theme, int nbuttonsAutoFire, int transparency);
 	private static native void nativeSetupScreenKeyboardButtons(byte[] img);
 	private static native void nativeInitKeymap();
 	private static native int  nativeGetKeymapKey(int key);
--- a/project/java/translations/values-de/strings.xml
+++ b/project/java/translations/values-de/strings.xml
@@ -133,4 +133,5 @@
 <string name="display_size_small">Klein (Telefon)</string>
 <string name="display_size_tiny">Uberklein (Xperia Mini)</string>
 <string name="show_more_options">Weitere Optionen</string>
+<string name="controls_screenkb_drawsize">Größe der Schaltfläche Bilder</string>
 </resources>
--- a/project/java/translations/values-fi/strings.xml
+++ b/project/java/translations/values-fi/strings.xml
@@ -133,4 +133,5 @@
 <string name="display_size_small">Pieni (puhelin)</string>
 <string name="display_size_tiny">Tiny (Xperia Mini)</string>
 <string name="show_more_options">Näytä enemmän vaihtoehtoja</string>
+<string name="controls_screenkb_drawsize">Koko painike kuvia</string>
 </resources>
--- a/project/java/translations/values-fr/strings.xml
+++ b/project/java/translations/values-fr/strings.xml
@@ -136,4 +136,5 @@
 <string name="display_size_small">Petit (téléphone)</string>
 <string name="display_size_tiny">Très petit (Xperia Mini)</string>
 <string name="show_more_options">Afficher plus d\u0026#39;options</string>
+<string name="controls_screenkb_drawsize">Taille des images de bouton</string>
 </resources>
--- a/project/java/translations/values-ru/strings.xml
+++ b/project/java/translations/values-ru/strings.xml
@@ -128,4 +128,5 @@
 <string name="show_more_options">Показать больше параметров</string>
 <string name="broken_libc_title">Обнаружена бракованная прошивка</string>
 <string name="broken_libc_text">Ваше устройство содержит дефективные системные библиотеки, данное приложение скорее всего не будет работать. Пожалуйста, установите обновление, либо установите неофициальную прошивку, либо скопируйте /system/lib/libc.so с другого устройства (только для специалистов!)</string>
+<string name="controls_screenkb_drawsize">Размер изображения кнопок</string>
 </resources>
--- a/project/java/translations/values-uk/strings.xml
+++ b/project/java/translations/values-uk/strings.xml
@@ -126,4 +126,5 @@
 <string name="display_size_small">Маленький (телефон)</string>
 <string name="display_size_tiny">Крихiтний (Xperia Mini)</string>
 <string name="show_more_options">Показати більше параметрів</string>
+<string name="controls_screenkb_drawsize">Розмір зображення кнопок</string>
 </resources>
--- a/project/java/translations/values/strings.xml
+++ b/project/java/translations/values/strings.xml
@@ -39,6 +39,7 @@
    <string name="controls_accelnav">Accelerometer</string>

    <string name="controls_screenkb_size">On-screen keyboard size</string>
+    <string name="controls_screenkb_drawsize">Size of button images</string>
    <string name="controls_screenkb_large">Large</string>
    <string name="controls_screenkb_medium">Medium</string>
    <string name="controls_screenkb_small">Small</string>