commit 863d1010d9c8fa4342b1b0ea860bcfb096806acc
author Vladimir Chtchetkine <vchtchetkine@google.com> Fri Mar 16 12:25:23 2012 -0700
committer Vladimir Chtchetkine <vchtchetkine@google.com> Mon Mar 19 08:29:19 2012 -0700
tree 6e6bb1fa3e508f9633586b2a4b9db73ffb97d647
parent a342edc996e079f2d1a913ec19d25fd1c118af4e

Cleanup harware properties.

1. Remove unused hw.camera.maxHorizontalPixels, and hw.camera.maxVerticalPixels parameters.
2. Combine hw.touchScreen, and hw.multiTouch under one property: hw.screen

Change-Id: I3cdf64f7d7e46486110cbc0769f9d98a61f0bea5

android/main.c

diff --git a/android/main.c b/android/main.c
index 5aaf65e..f8ad54b 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1273,26 +1273,16 @@
 
     /* Setup screen emulation */
     if (opts->screen) {
-        if (!strcmp(opts->screen, "touch")) {
-            hw->hw_touchScreen = 1;
-            hw->hw_multiTouch = 0;
-        } else if (!strcmp(opts->screen, "multi-touch")) {
-            hw->hw_multiTouch = 1;
-            hw->hw_touchScreen = 0;
-        } else if (!strcmp(opts->screen, "off")) {
-            hw->hw_touchScreen = 0;
-            hw->hw_multiTouch = 0;
-        } else {
-            derror("Invalid value for -screen <mode> parameter: %s\n", opts->screen);
-            derror("Valid values are: touch, multi-touch, or off\n");
+        if (strcmp(opts->screen, "touch") &&
+            strcmp(opts->screen, "multi-touch") &&
+            strcmp(opts->screen, "no-touch")) {
+
+            derror("Invalid value for -screen <mode> parameter: %s\n"
+                   "Valid values are: touch, multi-touch, or no-touch\n",
+                   opts->screen);
             exit(1);
         }
-    } else {
-        /* If both, touch and multitouch are set in hw.ini, choose multi-touch
-         * for screen emulation. */
-        if (hw->hw_touchScreen && hw->hw_multiTouch) {
-            hw->hw_touchScreen = 0;
-        }
+        hw->hw_screen = ASTRDUP(opts->screen);
     }
 
     while(argc-- > 0) {