update calendar-android-sample and delete calendar-preview-android-sa…

…mple https://codereview.appspot.com/6762048/
google · AndrijBohash · Apr 15, 2011 · Apr 27, 2011 · Apr 27, 2011 · May 4, 2011
commit e3d26df71cce494d580570812eace3f9a6f87d49
diff --git a/bigquery-appengine-sample/.classpath b/bigquery-appengine-sample/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="output" path="target/war/WEB-INF/classes"/>
 </classpath>
diff --git a/bigquery-appengine-sample/.settings/com.google.appengine.eclipse.core.prefs b/bigquery-appengine-sample/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-labs.jar|appengine-endpoints.jar|jsr107cache-1.1.jar|appengine-jsr107cache-1.7.1.jar|appengine-api-1.0-sdk-1.7.1.jar|datanucleus-jpa-1.1.5.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
+filesCopiedToWebInfLib=appengine-api-labs.jar|appengine-endpoints.jar|appengine-jsr107cache-1.7.2.1.jar|jsr107cache-1.1.jar|appengine-api-1.0-sdk-1.7.2.1.jar|datanucleus-jpa-1.1.5.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
 gaeDeployDialogSettings=
diff --git a/calendar-android-sample/AndroidManifest.xml b/calendar-android-sample/AndroidManifest.xml
@@ -9,20 +9,26 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="8" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme" >
         <activity
-            android:name="com.google.api.services.samples.calendar.android.CalendarSample"
-            android:label="@string/app_name" >
+            android:name=".CalendarSampleActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".AddOrEditCalendarActivity" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/calendar-android-sample/instructions.html b/calendar-android-sample/instructions.html
@@ -3,14 +3,56 @@
 <body>
   <h2>Instructions for the Calendar V3 Android Sample</h2>
 
+  <h3>Warning</h3>
+
+  This sample is for illustrative purposes only. Please instead use the native
+  Calendar APIs like the
+  <a
+    href="http://developer.android.com/guide/topics/providers/calendar-provider.html">Calendar
+    Provider API</a>.
+
   <h3>Browse Online</h3>
 
   <ul>
     <li><a
       href="http://code.google.com/p/google-api-java-client/source/browse?repo=samples#hg/calendar-android-sample">Browse
         Source</a>, or main file <a
-      href="http://code.google.com/p/google-api-java-client/source/browse/calendar-android-sample/src/main/java/com/google/api/services/samples/calendar/android/CalendarSample.java?repo=samples">CalendarSample.java</a>
+      href="http://code.google.com/p/google-api-java-client/source/browse/calendar-android-sample/src/main/java/com/google/api/services/samples/calendar/android/CalendarSampleActivity.java?repo=samples">CalendarSampleActivity.java</a>
+    </li>
+  </ul>
+
+  <h3>Register Your Application</h3>
+
+  <p>You first need to register your Android application and sign up for
+    access to the Google Calendar API in the Google APIs Console. First, you
+    need the "Signing certificate fingerprint (SHA1)" for the debug and release
+    builds:</p>
+  <pre>
+keytool -exportcert -alias androiddebugkey -keystore ~/.android/debug.keystore | openssl sha1
+Enter keystore password: android
+
+keytool -exportcert -alias androiddebugkey -keystore my-release-key.keystore | openssl sha1
+</pre>
+
+  <p>Next, register in the Google APIs Console:</p>
+
+  <ul>
+    <li>Visit the <a
+      href="https://code.google.com/apis/console/?api=calendar">Google apis
+        console</a>
     </li>
+    <li>If this is your first time, click "Create project..."</li>
+    <li>Otherwise, click on the drop down under the "Google apis" logo at
+      the top left, and click "Create..." under "Other projects"</li>
+    <li>Click on "API Access", and then on "Create an OAuth 2.0 Client
+      ID...".</li>
+    <li>Enter a product name and click "Next".</li>
+    <li>Select "Installed application", select "Android", enter
+      com.google.api.services.samples.calendar.android for "Package name", paste
+      the SHA1 fingerprint for the debug certificate above into "Signing
+      certificate fingerprint (SHA1)", and click "Create client ID".</li>
+    <li>Click "Create an OAuth 2.0 Client ID..." and follow the directions
+      from the previous step for the release certificate.</li>
   </ul>
 
   <h3>Checkout Instructions</h3>
@@ -19,37 +61,31 @@ <h3>Checkout Instructions</h3>
     <b>Prerequisites:</b> install <a href="http://java.com">Java 6</a>, <a
       href="http://mercurial.selenic.com/">Mercurial</a> (requires 1.6 or
     higher). You may need to set your
-    <code>JAVA_HOME</code> and <code>ANDROID_HOME</code>.
+    <code>JAVA_HOME</code>
+    and
+    <code>ANDROID_HOME</code>
     .
   </p>
 
-  <p>
-    <b>Important:</b> after checking out the project, and before compiling and
-    running it, you need to edit
-    <code>ClientCredentials.java</code>
-    to enter the required API key generated from <a
-      href="https://code.google.com/apis/console/?api=calendar">Google APIs Console</a>.
-    Otherwise, without a valid key, you will only be able to make a small number of
-    queries. When you exceed this limit, you will receive a
-    <code>403 Forbidden</code>
-    error with the message
-    <code>Daily Limit Exceeded. Please sign up</code>
-    .
-   </p>
   <pre>
-    <code>
 cd <i>[someDirectory]</i>
 hg clone https://code.google.com/p/google-api-java-client.samples/ google-api-java-client-samples
 cd google-api-java-client-samples/calendar-android-sample
-<i>[editor]</i> src/main/java/com/google/api/services/samples/calendar/android/ClientCredentials.java
-</code>
   </pre>
 
-  <h3>Setup Project in Eclipse 3.7 (Indigo)</h3>
+  <p>To enable logging of HTTP requests and responses (highly recommended
+    when developing):</p>
+
+  <pre>
+adb shell setprop log.tag.HttpTransport DEBUG
+</pre>
+
+  <h3>Setup Project in Eclipse</h3>
 
   <p>
     <b>Prerequisites:</b> install <a href="http://www.eclipse.org/downloads/">Eclipse</a>,
-    the <a href="http://javaforge.com/project/HGE">Mercurial plugin</a> (optional), and the <a
+    the <a href="http://javaforge.com/project/HGE">Mercurial plugin</a>
+    (optional), and the <a
       href="http://developer.android.com/sdk/eclipse-adt.html#installing">Android
       plugin</a>.
   </p>
@@ -58,41 +94,51 @@ <h3>Setup Project in Eclipse 3.7 (Indigo)</h3>
     <li>Preferences:
       <ul>
         <li>Android: setup SDK location</li>
-      </ul></li>
-    <li>Window &gt; Android SDK and AVD Manager
+      </ul>
+    </li>
+    <li>Window &gt; Android SDK Manager
       <ul>
-        <li>Follow instructions to install Package "Google API's by Google
-          Inc., Android API 8"</li>
-        <li>Follow instructions to create a new Android Virtual Device
-          based on target "Google API's (Google Inc.) - API Level 8"</li>
-        <li>Click "Start..." (wait a while...)</li>
-        <li>On home screen in emulator, click Menu button, Settings</li>
-        <li>Click on "Accounts and Sync"</li>
-        <li>Click on "Add Account"</li>
-        <li>Click "Google" and follow instructions</li>
-      </ul></li>
+        <li>Check on "Google APIs" under "Android 4.1.6 (API Level 16)"</li>
+        <li>Check on "Google Play services" under "Extras".</li>
+        <li>Click on "Install X packages..."</li>
+      </ul>
+    </li>
     <li>Import <code>calendar-android-sample</code> project
       <ul>
         <li>File &gt; Import...</li>
         <li>Select "General &gt; Existing Project into Workspace" and click
           "Next"</li>
         <li>Click "Browse" next to "Select root directory", find <code>
             <i>[someDirectory]</i>/google-api-java-client-samples/calendar-android-sample
-          </code> and click "Next"</li>
+          </code> and click "Next"
+        </li>
         <li>Click "Finish"</li>
       </ul></li>
     <li>Clean Project (if compile error about missing gen directory)
       <ul>
-        <li>Select <code>calendar-android-sample</code> project</li>
+        <li>Select <code>calendar-android-sample</code> project
+        </li>
         <li>Project &gt; Clean...</li>
         <li>Select "Clean projects selected below"</li>
         <li>Click on "OK"</li>
-      </ul></li>
+      </ul>
+    </li>
+    <li>NOTE: you must use a physical device for developing and testing
+      because Google Play services cannot be installed on an emulator.</li>
     <li>Run
       <ul>
         <li>Right-click on project calendar-android-sample</li>
         <li>Run As &gt; Android Application</li>
-      </ul></li>
+        <li>Select the physical device and click OK.</li>
+        <li>Sample the app by creating a new calendar using the Menu and
+          updating/deleting a calendar using a long-press. <b>Be careful!</b>
+          You are making real changes to the Google account used, so you may
+          want to use a test account. As you make changes in the app, you can
+          see the effect online at <a href="http://google.com/calendar">google.com/calendar</a>.
+          Make sure you have Google Calendar set up beforehand for this account.
+        </li>
+      </ul>
+    </li>
   </ul>
 </body>
 </html>
diff --git a/calendar-android-sample/libs-sources/google-api-client-1.11.0-beta-sources.jar b/calendar-android-sample/libs-sources/google-api-client-1.11.0-beta-sources.jar
diff --git a/calendar-android-sample/libs-sources/google-api-client-1.12.0-beta-SNAPSHOT-sources.jar b/calendar-android-sample/libs-sources/google-api-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs-sources/google-api-client-android-1.11.0-beta-sources.jar b/calendar-android-sample/libs-sources/google-api-client-android-1.11.0-beta-sources.jar
diff --git a/...ar-android-sample/libs-sources/google-api-client-android-1.12.0-beta-SNAPSHOT-sources.jar b/...ar-android-sample/libs-sources/google-api-client-android-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/...-android-sample/libs-sources/google-api-services-calendar-v3-rev16-1.8.0-beta-sources.jar b/...-android-sample/libs-sources/google-api-services-calendar-v3-rev16-1.8.0-beta-sources.jar
diff --git a/...id-sample/libs-sources/google-api-services-calendar-v3-rev20120831-1.9.0-beta-sources.jar b/...id-sample/libs-sources/google-api-services-calendar-v3-rev20120831-1.9.0-beta-sources.jar
diff --git a/calendar-android-sample/libs-sources/google-http-client-1.11.0-beta-sources.jar b/calendar-android-sample/libs-sources/google-http-client-1.11.0-beta-sources.jar
diff --git a/...oogle-http-client-1.11.0-beta-sources.jar → ...p-client-1.12.0-beta-SNAPSHOT-sources.jar b/...oogle-http-client-1.11.0-beta-sources.jar → ...p-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/...tp-client-android-1.11.0-beta-sources.jar → ...-android-1.12.0-beta-SNAPSHOT-sources.jar b/...tp-client-android-1.11.0-beta-sources.jar → ...-android-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs-sources/google-http-client-gson-1.11.0-beta-sources.jar b/calendar-android-sample/libs-sources/google-http-client-gson-1.11.0-beta-sources.jar
diff --git a/...-http-client-gson-1.11.0-beta-sources.jar → ...ent-gson-1.12.0-beta-SNAPSHOT-sources.jar b/...-http-client-gson-1.11.0-beta-sources.jar → ...ent-gson-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/...ogle-oauth-client-1.11.0-beta-sources.jar → ...h-client-1.12.0-beta-SNAPSHOT-sources.jar b/...ogle-oauth-client-1.11.0-beta-sources.jar → ...h-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs-sources/gson-2.1-sources.jar b/calendar-android-sample/libs-sources/gson-2.1-sources.jar
diff --git a/calendar-android-sample/libs-sources/guava-11.0.1-sources.jar b/calendar-android-sample/libs-sources/guava-11.0.1-sources.jar
diff --git a/calendar-android-sample/libs-sources/guava-jdk5-13.0-sources.jar b/calendar-android-sample/libs-sources/guava-jdk5-13.0-sources.jar
diff --git a/calendar-android-sample/libs/google-api-client-1.11.0-beta.jar b/calendar-android-sample/libs/google-api-client-1.11.0-beta.jar
diff --git a/calendar-android-sample/libs/google-api-client-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-api-client-1.11.0-beta.jar.properties
diff --git a/calendar-android-sample/libs/google-api-client-1.12.0-beta-SNAPSHOT.jar b/calendar-android-sample/libs/google-api-client-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-api-client-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-api-client-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-api-client-android-1.11.0-beta.jar b/calendar-android-sample/libs/google-api-client-android-1.11.0-beta.jar
diff --git a/calendar-android-sample/libs/google-api-client-android-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-api-client-android-1.11.0-beta.jar.properties
diff --git a/calendar-android-sample/libs/google-api-client-android-1.12.0-beta-SNAPSHOT.jar b/calendar-android-sample/libs/google-api-client-android-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-api-client-android-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-api-client-android-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-client-android-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-api-services-calendar-v3-rev16-1.8.0-beta.jar b/calendar-android-sample/libs/google-api-services-calendar-v3-rev16-1.8.0-beta.jar
diff --git a/calendar-android-sample/libs/google-api-services-calendar-v3-rev16-1.8.0-beta.jar.properties b/calendar-android-sample/libs/google-api-services-calendar-v3-rev16-1.8.0-beta.jar.properties
diff --git a/calendar-android-sample/libs/google-api-services-calendar-v3-rev20120831-1.9.0-beta.jar b/calendar-android-sample/libs/google-api-services-calendar-v3-rev20120831-1.9.0-beta.jar
diff --git a/...android-sample/libs/google-api-services-calendar-v3-rev20120831-1.9.0-beta.jar.properties b/...android-sample/libs/google-api-services-calendar-v3-rev20120831-1.9.0-beta.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-services-calendar-v3-rev20120831-1.9.0-beta-sources.jar
diff --git a/calendar-android-sample/libs/google-http-client-1.11.0-beta.jar b/calendar-android-sample/libs/google-http-client-1.11.0-beta.jar
diff --git a/calendar-android-sample/libs/google-http-client-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-http-client-1.11.0-beta.jar.properties
diff --git a/...e/libs/google-http-client-1.11.0-beta.jar → ...ogle-http-client-1.12.0-beta-SNAPSHOT.jar b/...e/libs/google-http-client-1.11.0-beta.jar → ...ogle-http-client-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-http-client-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-http-client-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-http-client-android-1.11.0-beta.jar b/calendar-android-sample/libs/google-http-client-android-1.11.0-beta.jar
diff --git a/calendar-android-sample/libs/google-http-client-android-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-http-client-android-1.11.0-beta.jar.properties
diff --git a/...oogle-http-client-android-1.11.0-beta.jar → ...p-client-android-1.12.0-beta-SNAPSHOT.jar b/...oogle-http-client-android-1.11.0-beta.jar → ...p-client-android-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-http-client-android-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-http-client-android-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-android-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-http-client-gson-1.11.0-beta.jar b/calendar-android-sample/libs/google-http-client-gson-1.11.0-beta.jar
diff --git a/calendar-android-sample/libs/google-http-client-gson-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-http-client-gson-1.11.0-beta.jar.properties
diff --git a/...s/google-http-client-gson-1.11.0-beta.jar → ...http-client-gson-1.12.0-beta-SNAPSHOT.jar b/...s/google-http-client-gson-1.11.0-beta.jar → ...http-client-gson-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-http-client-gson-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-http-client-gson-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-gson-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-oauth-client-1.11.0-beta.jar.properties b/calendar-android-sample/libs/google-oauth-client-1.11.0-beta.jar.properties
diff --git a/.../libs/google-oauth-client-1.11.0-beta.jar → ...gle-oauth-client-1.12.0-beta-SNAPSHOT.jar b/.../libs/google-oauth-client-1.11.0-beta.jar → ...gle-oauth-client-1.12.0-beta-SNAPSHOT.jar
diff --git a/calendar-android-sample/libs/google-oauth-client-1.12.0-beta-SNAPSHOT.jar.properties b/calendar-android-sample/libs/google-oauth-client-1.12.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-oauth-client-1.12.0-beta-SNAPSHOT-sources.jar
diff --git a/calendar-android-sample/libs/google-play-services.jar b/calendar-android-sample/libs/google-play-services.jar
diff --git a/...droid-sample/libs/gson-2.1.jar.properties → ...droid-sample/libs/gson-2.1.jar.properties b/...droid-sample/libs/gson-2.1.jar.properties → ...droid-sample/libs/gson-2.1.jar.properties
diff --git a/calendar-android-sample/libs/guava-11.0.1.jar b/calendar-android-sample/libs/guava-11.0.1.jar
diff --git a/calendar-android-sample/libs/guava-jdk5-13.0.jar b/calendar-android-sample/libs/guava-jdk5-13.0.jar
diff --git a/calendar-android-sample/libs/guava-jdk5-13.0.jar.properties b/calendar-android-sample/libs/guava-jdk5-13.0.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/guava-jdk5-13.0-sources.jar
diff --git a/calendar-android-sample/libs/jsr305-1.3.9.jar b/calendar-android-sample/libs/jsr305-1.3.9.jar
diff --git a/calendar-preview-android-sample/lint.xml → calendar-android-sample/lint.xml b/calendar-preview-android-sample/lint.xml → calendar-android-sample/lint.xml
diff --git a/calendar-android-sample/project.properties b/calendar-android-sample/project.properties
@@ -3,11 +3,12 @@
 #
 # This file must be checked in Version Control Systems.
 #
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
 # "ant.properties", and override values to adapt the script to your
 # project structure.
-
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt:proguard-google-api-client.txt
 
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:16
diff --git a/...le/res/drawable-hdpi/btn_bg_pressed.9.png → ...le/res/drawable-hdpi/btn_bg_pressed.9.png b/...le/res/drawable-hdpi/btn_bg_pressed.9.png → ...le/res/drawable-hdpi/btn_bg_pressed.9.png
diff --git a/...e/res/drawable-hdpi/btn_bg_selected.9.png → ...e/res/drawable-hdpi/btn_bg_selected.9.png b/...e/res/drawable-hdpi/btn_bg_selected.9.png → ...e/res/drawable-hdpi/btn_bg_selected.9.png
diff --git a/...-sample/res/drawable-hdpi/ic_launcher.png → ...-sample/res/drawable-hdpi/ic_launcher.png b/...-sample/res/drawable-hdpi/ic_launcher.png → ...-sample/res/drawable-hdpi/ic_launcher.png
diff --git a/...s/drawable-hdpi/ic_mailboxes_accounts.png → ...s/drawable-hdpi/ic_mailboxes_accounts.png b/...s/drawable-hdpi/ic_mailboxes_accounts.png → ...s/drawable-hdpi/ic_mailboxes_accounts.png
diff --git a/...ple/res/drawable-hdpi/ic_menu_refresh.png → ...ple/res/drawable-hdpi/ic_menu_refresh.png b/...ple/res/drawable-hdpi/ic_menu_refresh.png → ...ple/res/drawable-hdpi/ic_menu_refresh.png
diff --git a/...le/res/drawable-hdpi/ic_title_add_alt.png → ...le/res/drawable-hdpi/ic_title_add_alt.png b/...le/res/drawable-hdpi/ic_title_add_alt.png → ...le/res/drawable-hdpi/ic_title_add_alt.png
diff --git a/...es/drawable-hdpi/ic_title_add_default.png → ...es/drawable-hdpi/ic_title_add_default.png b/...es/drawable-hdpi/ic_title_add_default.png → ...es/drawable-hdpi/ic_title_add_default.png
diff --git a/calendar-android-sample/res/drawable-hdpi/icon.png b/calendar-android-sample/res/drawable-hdpi/icon.png
diff --git a/...-sample/res/drawable-ldpi/ic_launcher.png → ...-sample/res/drawable-ldpi/ic_launcher.png b/...-sample/res/drawable-ldpi/ic_launcher.png → ...-sample/res/drawable-ldpi/ic_launcher.png
diff --git a/...ple/res/drawable-ldpi/ic_menu_refresh.png → ...ple/res/drawable-ldpi/ic_menu_refresh.png b/...ple/res/drawable-ldpi/ic_menu_refresh.png → ...ple/res/drawable-ldpi/ic_menu_refresh.png
diff --git a/calendar-android-sample/res/drawable-ldpi/icon.png b/calendar-android-sample/res/drawable-ldpi/icon.png
diff --git a/...-sample/res/drawable-mdpi/ic_launcher.png → ...-sample/res/drawable-mdpi/ic_launcher.png b/...-sample/res/drawable-mdpi/ic_launcher.png → ...-sample/res/drawable-mdpi/ic_launcher.png
diff --git a/...s/drawable-mdpi/ic_mailboxes_accounts.png → ...s/drawable-mdpi/ic_mailboxes_accounts.png b/...s/drawable-mdpi/ic_mailboxes_accounts.png → ...s/drawable-mdpi/ic_mailboxes_accounts.png
diff --git a/...ple/res/drawable-mdpi/ic_menu_refresh.png → ...ple/res/drawable-mdpi/ic_menu_refresh.png b/...ple/res/drawable-mdpi/ic_menu_refresh.png → ...ple/res/drawable-mdpi/ic_menu_refresh.png
diff --git a/calendar-android-sample/res/drawable-mdpi/icon.png b/calendar-android-sample/res/drawable-mdpi/icon.png
diff --git a/...sample/res/drawable-xhdpi/ic_launcher.png → ...sample/res/drawable-xhdpi/ic_launcher.png b/...sample/res/drawable-xhdpi/ic_launcher.png → ...sample/res/drawable-xhdpi/ic_launcher.png
diff --git a/...le/res/drawable-xhdpi/ic_menu_refresh.png → ...le/res/drawable-xhdpi/ic_menu_refresh.png b/...le/res/drawable-xhdpi/ic_menu_refresh.png → ...le/res/drawable-xhdpi/ic_menu_refresh.png
diff --git a/...roid-sample/res/drawable/ic_title_add.xml → ...roid-sample/res/drawable/ic_title_add.xml b/...roid-sample/res/drawable/ic_title_add.xml → ...roid-sample/res/drawable/ic_title_add.xml
diff --git a/...ample/res/drawable/ic_title_add_light.xml → ...ample/res/drawable/ic_title_add_light.xml b/...ample/res/drawable/ic_title_add_light.xml → ...ample/res/drawable/ic_title_add_light.xml
diff --git a/...roid-sample/res/drawable/title_button.xml → ...roid-sample/res/drawable/title_button.xml b/...roid-sample/res/drawable/title_button.xml → ...roid-sample/res/drawable/title_button.xml
diff --git a/...android-sample/res/layout/addcalendar.xml → ...android-sample/res/layout/addcalendar.xml b/...android-sample/res/layout/addcalendar.xml → ...android-sample/res/layout/addcalendar.xml
diff --git a/...ndroid-sample/res/layout/calendarlist.xml → ...ndroid-sample/res/layout/calendarlist.xml b/...ndroid-sample/res/layout/calendarlist.xml → ...ndroid-sample/res/layout/calendarlist.xml
diff --git a/...iew-android-sample/res/menu/main_menu.xml → ...dar-android-sample/res/menu/main_menu.xml b/...iew-android-sample/res/menu/main_menu.xml → ...dar-android-sample/res/menu/main_menu.xml
diff --git a/...view-android-sample/res/values/colors.xml → ...ndar-android-sample/res/values/colors.xml b/...view-android-sample/res/values/colors.xml → ...ndar-android-sample/res/values/colors.xml
diff --git a/...view-android-sample/res/values/dimens.xml → ...ndar-android-sample/res/values/dimens.xml b/...view-android-sample/res/values/dimens.xml → ...ndar-android-sample/res/values/dimens.xml
diff --git a/calendar-android-sample/res/values/strings.xml b/calendar-android-sample/res/values/strings.xml
@@ -1,4 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2012 Google Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <resources>
+
     <string name="app_name">Google Calendar Sample</string>
+    <string name="accounts">Accounts</string>
+    <string name="description_add">Add Calendar</string>
+    <string name="summary">Title</string>
+    <string name="summary_hint">Enter the calendar title</string>
+    <string name="cancel">Cancel</string>
+    <string name="save">Save</string>
+    <string name="icon_desc">Application icon</string>
+    <string name="title_separator_desc">Title separator</string>
+    <string name="refresh">Refresh</string>
+    <string name="batchadd">Copy Calendar x3 (Batch)</string>
+    <string name="edit">Edit Calendar</string>
+    <string name="delete">Delete Calendar</string>
+    <string name="delete_title">Delete Calendar?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="error">Error</string>
+    <string name="error_format">[Error] %s</string>
+
 </resources>
diff --git a/...view-android-sample/res/values/styles.xml → ...ndar-android-sample/res/values/styles.xml b/...view-android-sample/res/values/styles.xml → ...ndar-android-sample/res/values/styles.xml
diff --git a/...ar/android/AddOrEditCalendarActivity.java → ...ar/android/AddOrEditCalendarActivity.java b/...ar/android/AddOrEditCalendarActivity.java → ...ar/android/AddOrEditCalendarActivity.java
diff --git a/...ar/android/AsyncBatchInsertCalendars.java → ...ar/android/AsyncBatchInsertCalendars.java b/...ar/android/AsyncBatchInsertCalendars.java → ...ar/android/AsyncBatchInsertCalendars.java
diff --git a/...e/src/main/java/com/google/api/services/samples/calendar/android/AsyncDeleteCalendar.java b/...e/src/main/java/com/google/api/services/samples/calendar/android/AsyncDeleteCalendar.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2012 Google Inc.
- *
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -14,53 +14,34 @@
 
 package com.google.api.services.samples.calendar.android;
 
-import android.app.ProgressDialog;
-import android.os.AsyncTask;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 
 import java.io.IOException;
 
 /**
- * Asynchronously delete a calendar with a progress dialog.
- *
- * @author Ravi Mistry
+ * Asynchronously delete a calendar.
+ * 
+ * @author Yaniv Inbar
  */
-class AsyncDeleteCalendar extends AsyncTask<Void, Void, Void> {
+class AsyncDeleteCalendar extends CalendarAsyncTask {
 
-  private final CalendarSample calendarSample;
-  private final ProgressDialog dialog;
-  private final int calendarIndex;
-  private com.google.api.services.calendar.Calendar client;
+  private final String calendarId;
 
-  AsyncDeleteCalendar(CalendarSample calendarSample, int calendarIndex) {
-    this.calendarSample = calendarSample;
-    client = calendarSample.client;
-    this.calendarIndex = calendarIndex;
-    dialog = new ProgressDialog(calendarSample);
+  AsyncDeleteCalendar(CalendarSampleActivity calendarSample, CalendarInfo calendarInfo) {
+    super(calendarSample);
+    calendarId = calendarInfo.id;
   }
 
   @Override
-  protected void onPreExecute() {
-    dialog.setMessage("Deleting calendar...");
-    dialog.show();
-  }
-
-  @Override
-  protected Void doInBackground(Void... arg0) {
-    String calendarId = calendarSample.calendars.get(calendarIndex).id;
+  protected void doInBackground() throws IOException {
     try {
       client.calendars().delete(calendarId).execute();
-      calendarSample.calendars.remove(calendarIndex);
-    } catch (IOException e) {
-      calendarSample.handleGoogleException(e);
-    } finally {
-      calendarSample.onRequestCompleted();
+    } catch (GoogleJsonResponseException e) {
+      // 404 Not Found would happen if user tries to delete an already deleted calendar
+      if (e.getStatusCode() != 404) {
+        throw e;
+      }
     }
-    return null;
-  }
-
-  @Override
-  protected void onPostExecute(Void result) {
-    dialog.dismiss();
-    calendarSample.refresh();
+    model.remove(calendarId);
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-api-client-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-api-client-android-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-api-services-calendar-v3-rev20120831-1.9.0-beta-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-http-client-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-http-client-android-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-http-client-gson-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/google-oauth-client-1.12.0-beta-SNAPSHOT-sources.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src=../libs-sources/guava-jdk5-13.0-sources.jar