Stubbing Android vector
This is mostly Android Bootcamp material adapted for the Travel App.
It contains very little actual Travel App logic.
Change-Id: Ic514832c5a8febfc76923db14d11201d7747756c
diff --git a/.gitignore b/.gitignore
index f9f8d06..2f15d7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
+*.iml
+/.gradle
+/.idea
/.jiri
#TODO(nlacasse): Get rid of .v23 below once v23->jiri transition is complete.
/.v23
+/account_manager-release.apk
/bin
-/ifc
+/browser/ifc
+/build
+/generated-src
+/local.properties
/node_modules
/server-root
/tmp
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..82355b2
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,51 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ maven {
+ // This repository contains the Gradle VDL plugin.
+ url 'https://maven.v.io/'
+ }
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.3.0'
+ // Our project is going to use VDL, so we need to depend on the Vanadium
+ // Gradle plugin.
+ classpath 'io.v:gradle-plugin:0.1-SNAPSHOT'
+ classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+ }
+}
+
+apply plugin: 'android-sdk-manager'
+apply plugin: 'com.android.application'
+apply plugin: 'io.v.vdl'
+
+repositories {
+ mavenCentral()
+ maven {
+ url 'https://maven.v.io/'
+ }
+}
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "21.0.2"
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
+ packagingOptions {
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE.txt'
+ }
+}
+
+dependencies {
+ compile 'io.v:vanadium:0.1-SNAPSHOT'
+ compile 'io.v:vanadium-android:0.1-SNAPSHOT'
+}
+
+vdl {
+ // This is where the VDL tool will look for VDL definitions.
+ inputPaths += 'common'
+}
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..8b5c2a7
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Sep 21 11:13:19 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..055fa9a
--- /dev/null
+++ b/src/main/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="io.v.baku.sample.travel"
+ android:versionCode="1"
+ android:versionName="1.0" >
+
+ <uses-sdk
+ android:minSdkVersion="19"
+ android:targetSdkVersion="19" />
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+ <application>
+ <activity
+ android:name=".TravelActivity"
+ android:label="Travel Service" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <service
+ android:name=".TravelService"
+ android:exported="false"
+ android:label="Travel Service"
+ android:process=":TravelService">
+ </service>
+ </application>
+</manifest>
diff --git a/src/main/java/io/v/baku/sample/travel/TravelActivity.java b/src/main/java/io/v/baku/sample/travel/TravelActivity.java
new file mode 100644
index 0000000..2019e4e
--- /dev/null
+++ b/src/main/java/io/v/baku/sample/travel/TravelActivity.java
@@ -0,0 +1,41 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io.v.baku.sample.travel;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class TravelActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_travel);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.menu_travel, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/src/main/java/io/v/baku/sample/travel/TravelService.java b/src/main/java/io/v/baku/sample/travel/TravelService.java
new file mode 100644
index 0000000..097247e
--- /dev/null
+++ b/src/main/java/io/v/baku/sample/travel/TravelService.java
@@ -0,0 +1,140 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io.v.baku.sample.travel;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.widget.Toast;
+
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+import io.v.android.v23.V;
+import io.v.v23.context.VContext;
+import io.v.v23.rpc.ListenSpec;
+import io.v.v23.rpc.Server;
+import io.v.v23.security.BlessingPattern;
+import io.v.v23.security.Blessings;
+import io.v.v23.security.VCertificate;
+import io.v.v23.security.VPrincipal;
+import io.v.v23.verror.VException;
+import io.v.v23.vom.VomUtil;
+
+import ifc.TravelServer;
+
+public class TravelService extends Service {
+ public static final String BLESSINGS_KEY = "Blessings";
+ private VContext baseContext;
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null; // Binding not allowed
+ }
+
+ /**
+ * This method decodes the passed-in blessings and calls
+ * startLocationServer to actually start and mount the
+ * Vanadium server.
+ */
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ // Initialize Vanadium.
+ baseContext = V.init(this);
+
+ // Fetch the blessings from the intent. The activity that is starting
+ // the service must populate this field.
+ String blessingsVom = intent.getStringExtra(BLESSINGS_KEY);
+
+ if (blessingsVom == null || blessingsVom.isEmpty()) {
+ String msg = "Couldn't start TravelService: "
+ + "null or empty encoded blessings.";
+ Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+ return START_REDELIVER_INTENT;
+ }
+
+ try {
+ Blessings blessings = (Blessings) VomUtil.decodeFromString(
+ blessingsVom, Blessings.class);
+ if (blessings == null) {
+ String msg = "Couldn't start TravelService: "
+ + "null blessings.";
+ Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+ return START_REDELIVER_INTENT;
+ }
+
+ // We have blessings, start the server!
+ startTravelServer(blessings);
+ } catch (VException e) {
+ String msg = "Couldn't start TravelService: " + e.getMessage();
+ Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+ }
+ return START_REDELIVER_INTENT;
+ }
+
+ /**
+ * This method starts and mounts the Vanadium location server with the given
+ * blessings.
+ */
+ public void startTravelServer(Blessings blessings) throws VException {
+ // Principal represents our identity within the Vanadium system.
+ VPrincipal principal = V.getPrincipal(baseContext);
+
+ // Provide the given blessings when anybody connects to us.
+ principal.blessingStore().setDefaultBlessings(blessings);
+
+ // Also, provide these blessings when we connect to other services (for
+ // example, when we talk to the mounttable).
+ principal.blessingStore().set(blessings, new BlessingPattern("..."));
+
+ // Trust these blessings and all the "parent" blessings.
+ principal.addToRoots(blessings);
+
+ // Our security environment is now set-up. Let's find a home in the
+ // namespace for our service.
+ String mountPoint;
+ String prefix = mountNameFromBlessings(blessings);
+
+ if (prefix.isEmpty()) {
+ throw new VException("Could not determine mount point: "
+ + "no username in blessings.");
+ } else {
+ mountPoint = "users/" + prefix + "/travel/mobile";
+ String msg = "Mounting server at " + mountPoint;
+ Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+ }
+
+ // Now create the server and mount it.
+ final TravelServer sync = new TravelSync();
+
+ // Use Vanadium's production proxy server for NAT traversal. None of
+ // your data is visible to the proxy server because it's all encrypted.
+ ListenSpec spec = V.getListenSpec(baseContext).withProxy("proxy");
+
+ // Finally, the magic moment!
+ Server server = V.getServer(
+ V.withNewServer(V.withListenSpec(baseContext, spec),
+ mountPoint, sync, null));
+
+ Toast.makeText(this, "Success!", Toast.LENGTH_SHORT).show();
+ }
+
+ /**
+ * This method finds the last certificate in our blessing's certificate
+ * chains whose extension contains an '@'. We will assume that extension to
+ * represent our username.
+ */
+ private static String mountNameFromBlessings(Blessings blessings) {
+ for (List<VCertificate> chain : blessings.getCertificateChains()) {
+ for (VCertificate certificate : Lists.reverse(chain)) {
+ if (certificate.getExtension().contains("@")) {
+ return certificate.getExtension();
+ }
+ }
+ }
+ return "";
+ }
+}
diff --git a/src/main/java/io/v/baku/sample/travel/TravelSync.java b/src/main/java/io/v/baku/sample/travel/TravelSync.java
new file mode 100644
index 0000000..79d5183
--- /dev/null
+++ b/src/main/java/io/v/baku/sample/travel/TravelSync.java
@@ -0,0 +1,44 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io.v.baku.sample.travel;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import io.v.v23.V;
+import io.v.v23.context.VContext;
+import io.v.v23.naming.Endpoint;
+import io.v.v23.rpc.Server;
+import io.v.v23.rpc.ServerCall;
+import io.v.v23.security.VSecurity;
+import io.v.v23.verror.VException;
+
+import ifc.*;
+
+public class TravelSync implements TravelServer {
+ @Override
+ public void cast(final VContext ctx, final ServerCall call,
+ final CastSpec spec) throws VException {
+ }
+
+ public Endpoint[] startServer() throws VException {
+ // Initialize the Vanadium runtime and load its native shared library
+ // implementation. This is required before we can do anything involving
+ // Vanadium.
+ final VContext context = V.init();
+
+ // Serve a new InMemoryFortuneServer with an allow-everyone authorizer.
+ // This call will return immediately, serving is done in a separate
+ // thread.
+ final Server server = V.getServer(V.withNewServer(context, "",
+ this,
+ VSecurity.newAllowEveryoneAuthorizer()));
+
+ return server.getStatus().getEndpoints();
+ }
+}
diff --git a/src/main/res/layout/activity_travel.xml b/src/main/res/layout/activity_travel.xml
new file mode 100644
index 0000000..9e257d9
--- /dev/null
+++ b/src/main/res/layout/activity_travel.xml
@@ -0,0 +1,12 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+ android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context="io.v.baku.sample.travel.TravelActivity">
+
+ <TextView android:text="@string/hello_world" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/src/main/res/menu/menu_travel.xml b/src/main/res/menu/menu_travel.xml
new file mode 100644
index 0000000..cf20812
--- /dev/null
+++ b/src/main/res/menu/menu_travel.xml
@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="io.v.baku.sample.travel.TravelActivity">
+ <item android:id="@+id/action_settings" android:title="@string/action_settings"
+ android:orderInCategory="100" android:showAsAction="never" />
+</menu>
diff --git a/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
new file mode 100644
index 0000000..2ae366b
--- /dev/null
+++ b/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+ <string name="title_activity_travel">TravelActivity</string>
+
+ <string name="hello_world">Hello world!</string>
+ <string name="action_settings">Settings</string>
+
+</resources>
