# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1392134006 -3600
# Node ID 0d274f085dacc7c64c490f7e35008570c13d4544
# Parent  ec060bb2b997d08ca58271bd5b7b175503e6070f
Adding profile for Android execution

diff -r ec060bb2b997 -r 0d274f085dac minesweeper/AndroidManifest.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/AndroidManifest.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.apidesign.demo.minesweeper"
+    android:versionCode="1"
+    android:versionName="1.0-SNAPSHOT" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="16" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme">
+        <activity android:name="org.apidesign.html.dlvkbrwsr.DlvkBrwsr" 
+                  android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <meta-data android:name="loadPage" android:value="file:///android_asset/pages/index.html" />
+        <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.Main" />
+        <meta-data android:name="invoke" android:value="onPageLoad" />
+    </application>
+    
+</manifest>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/nbactions-dlvkbrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/nbactions-dlvkbrwsr.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<actions>
+    <action>
+        <actionName>run</actionName>
+        <goals>
+            <goal>package</goal>
+            <goal>android:deploy</goal>
+            <goal>android:run</goal>
+        </goals>
+    </action>
+</actions>
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/pom.xml
--- a/minesweeper/pom.xml	Mon Feb 10 17:22:14 2014 +0100
+++ b/minesweeper/pom.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -78,6 +78,11 @@
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
+        <groupId>org.netbeans.html</groupId>
+        <artifactId>ko4j</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>6.7</version>
@@ -115,12 +120,6 @@
           <dependencies>
             <dependency>
                 <groupId>org.netbeans.html</groupId>
-                <artifactId>ko4j</artifactId>
-                <version>${net.java.html.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.netbeans.html</groupId>
                 <artifactId>net.java.html.boot.fx</artifactId>
                 <version>${net.java.html.version}</version>
                 <scope>runtime</scope>
@@ -205,5 +204,100 @@
               </dependency>
           </dependencies>
       </profile>
+      <profile>
+          <id>dlvkbrwsr</id>
+          <activation>
+              <property>
+                  <name>android.sdk.path</name>
+              </property>
+          </activation>
+          <properties>
+              <platform.version>4.1.1.4</platform.version>
+              <android.plugin.version>3.7.0</android.plugin.version>
+              <debug>false</debug>
+          </properties>
+          <dependencies>
+              <dependency>
+                  <groupId>com.google.android</groupId>
+                  <artifactId>android</artifactId>
+                  <version>${platform.version}</version>
+                  <scope>provided</scope>
+              </dependency>
+              <dependency>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>ko-ws-tyrus</artifactId>
+                  <version>${net.java.html.version}</version>
+                  <exclusions>
+                      <exclusion>
+                          <artifactId>org.json-osgi</artifactId>
+                          <groupId>de.twentyeleven.skysail</groupId>
+                      </exclusion>
+                  </exclusions>
+              </dependency>
+              <dependency>
+                  <groupId>org.apidesign.html</groupId>
+                  <artifactId>dlvkbrwsr</artifactId>
+                  <version>0.1-SNAPSHOT</version>
+                  <type>jar</type>
+              </dependency>
+          </dependencies>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                      <artifactId>android-maven-plugin</artifactId>
+                      <version>${android.plugin.version}</version>
+                      <extensions>true</extensions>
+                      <configuration>
+                          <classifier>apk</classifier>
+                          <attachJar>false</attachJar>
+                          <apkDebug>debug</apkDebug>
+                          <assetsDirectory>src/main/webapp</assetsDirectory>
+                          <sdk>
+                              <platform>16</platform>
+                          </sdk>
+                          <apk>
+                              <metaIncludes>
+                                  <metaInclude>services/org.apidesign.**</metaInclude>
+                              </metaIncludes>
+                          </apk>
+                          <file>${project.build.directory}/${project.build.finalName}.apk</file>
+                      </configuration>
+                      <executions>
+                          <execution>
+                              <id>apk</id>
+                              <goals>
+                                  <goal>apk</goal>
+                                  <goal>dex</goal>
+                              </goals>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-install-plugin</artifactId>
+                      <version>2.5.1</version>
+                      <configuration>
+                          <groupId>${project.groupId}</groupId>
+                          <artifactId>${project.artifactId}</artifactId>
+                          <version>${project.version}</version>
+                          <file>${project.build.directory}/${project.build.finalName}.apk</file>
+                          <packaging>apk</packaging>
+                          <skip>true</skip>
+                      </configuration>
+                      <executions>
+                          <execution>
+                              <id>install-apk</id>
+                              <phase>install</phase>
+                              <goals>
+                                  <goal>install-file</goal>
+                              </goals>
+                          </execution>
+                      </executions>
+                  </plugin>
+              </plugins>
+          </build>
+          
+      </profile>
   </profiles>  
 </project>
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/drawable-hdpi/ic_launcher.png
Binary file minesweeper/res/drawable-hdpi/ic_launcher.png has changed
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/drawable-mdpi/ic_launcher.png
Binary file minesweeper/res/drawable-mdpi/ic_launcher.png has changed
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/drawable-xhdpi/ic_launcher.png
Binary file minesweeper/res/drawable-xhdpi/ic_launcher.png has changed
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/drawable-xxhdpi/ic_launcher.png
Binary file minesweeper/res/drawable-xxhdpi/ic_launcher.png has changed
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/layout/activity_main.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/layout/activity_main.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,40 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin" >
+    
+    <Button android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="@string/hello_world"
+       android:onClick="click"
+    />
+    
+</RelativeLayout>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/menu/main.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/menu/main.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,34 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values-sw600dp/dimens.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values-sw600dp/dimens.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,33 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!--
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw600dp devices (e.g. 7" tablets) here.
+    -->
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values-sw720dp-land/dimens.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values-sw720dp-land/dimens.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,34 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!--
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
+    -->
+    <dimen name="activity_horizontal_margin">128dp</dimen>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values-v11/styles.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values-v11/styles.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,36 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!--
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values-v14/styles.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values-v14/styles.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,37 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!--
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values/dimens.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values/dimens.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,32 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values/strings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values/strings.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <string name="app_name">Minesweeper</string>
+    <string name="hello">Hello m4dlvk!</string>
+    <string name="action_settings">Settings</string>
+    <string name="hello_world">Hello world!</string>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/res/values/styles.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/res/values/styles.xml	Tue Feb 11 16:53:26 2014 +0100
@@ -0,0 +1,45 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff -r ec060bb2b997 -r 0d274f085dac minesweeper/src/main/webapp/pages/mines-phone-small.css
--- a/minesweeper/src/main/webapp/pages/mines-phone-small.css	Mon Feb 10 17:22:14 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/mines-phone-small.css	Tue Feb 11 16:53:26 2014 +0100
@@ -23,8 +23,8 @@
  */
 table.field td {
     padding: 4px;
-    width: 20px;
-    height: 20px;
+    width: 18px;
+    height: 18px;
     font-size: 1.5em;
 }
 h1 {