Adding demo for the CardBuilder and switching to Android Studio format.

Author: alainv

Diff for: README

@@ -0,0 +1,28 @@
+apply plugin: 'com.android.application'
+
+repositories {
+    jcenter()
+    flatDir {
+        dirs 'prebuilt-libs'
+    }
+}
+
+android {
+    compileSdkVersion "Google Inc.:Glass Development Kit Preview:19"
+    buildToolsVersion "20.0.0"
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 19
+    }
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}

Diff for: app/build.gradle

@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package com.google.android.glass.sample.apidemo;
+
+import com.google.android.glass.sample.apidemo.card.CardsActivity;
+import com.google.android.glass.sample.apidemo.theming.ThemingActivity;
+import com.google.android.glass.sample.apidemo.touchpad.SelectGestureDemoActivity;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.SmallTest;
+
+/**
+ * Unit tests for {@link ApiDemoActivity}.
+ */
+@SmallTest
+public class ApiDemoActivityTest extends ActivityInstrumentationTestCase2<ApiDemoActivity> {
+
+    private static final int MONITOR_TIMEOUT = 5 * 1000;
+    private Instrumentation.ActivityMonitor mCardsActivityMonitor;
+    private Instrumentation.ActivityMonitor mDetectorActivityMonitor;
+    private Instrumentation.ActivityMonitor mThemingActivityMonitor;
+
+    public ApiDemoActivityTest() {
+        super(ApiDemoActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mCardsActivityMonitor = new Instrumentation.ActivityMonitor(
+            CardsActivity.class.getName(), null, false);
+        mDetectorActivityMonitor = new Instrumentation.ActivityMonitor(
+            SelectGestureDemoActivity.class.getName(), null, false);
+        mThemingActivityMonitor = new Instrumentation.ActivityMonitor(
+            ThemingActivity.class.getName(), null, false);
+        getInstrumentation().addMonitor(mCardsActivityMonitor);
+        getInstrumentation().addMonitor(mDetectorActivityMonitor);
+        getInstrumentation().addMonitor(mThemingActivityMonitor);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Tests if the "Cards" API demo can be started when the card was tapped.
+     */
+    public void testTapFirstCard() throws Exception {
+         final ApiDemoActivity activity = getActivity();
+         assertNotNull(activity);
+         activity.runOnUiThread(new Runnable() {
+
+              @Override
+              public void run() {
+                  activity.getScroller().performItemClick(null /* not used */,
+                          ApiDemoActivity.CARD_BUILDER, -1 /* not used */);
+              }
+         });
+
+         Activity cardsActivity = mCardsActivityMonitor.waitForActivityWithTimeout(MONITOR_TIMEOUT);
+         assertNotNull("Activity was not started", cardsActivity);
+         cardsActivity.finish();
+    }
+
+    /**
+     * Tests if the "GestureDetector" API demo can be started when the card was tapped.
+     */
+    public void testTapSecondCard() throws Exception {
+        final ApiDemoActivity activity = getActivity();
+        assertNotNull(activity);
+        activity.runOnUiThread(new Runnable() {
+
+             @Override
+             public void run() {
+                 activity.getScroller().performItemClick(null /* not used */,
+                         ApiDemoActivity.GESTURE_DETECTOR, -1 /* not used */);
+             }
+        });
+
+        Activity touchActivity = mDetectorActivityMonitor.waitForActivityWithTimeout(MONITOR_TIMEOUT);
+        assertNotNull("Activity was not started", touchActivity);
+        touchActivity.finish();
+   }
+
+    /**
+     * Tests if the "Theming" API demo can be started when the card was tapped.
+     */
+    public void testTapThirdCard() throws Exception {
+        final ApiDemoActivity activity = getActivity();
+        assertNotNull(activity);
+        activity.runOnUiThread(new Runnable() {
+
+             @Override
+             public void run() {
+                 activity.getScroller().performItemClick(null /* not used */,
+                         ApiDemoActivity.THEMING, -1 /* not used */);
+             }
+        });
+
+        Activity themeActivity = mThemingActivityMonitor.waitForActivityWithTimeout(MONITOR_TIMEOUT);
+        assertNotNull("Activity was not started", themeActivity);
+        themeActivity.finish();
+   }
+}

Diff for: app/src/androidTest/java/com/google/android/glass/sample/apidemo/ApiDemoActivityTest.java

@@ -16,14 +16,14 @@
 
 package com.google.android.glass.sample.apidemo;
 
-import com.google.android.glass.app.Card;
 import com.google.android.glass.media.Sounds;
 import com.google.android.glass.sample.apidemo.card.CardsActivity;
 import com.google.android.glass.sample.apidemo.card.CardAdapter;
 import com.google.android.glass.sample.apidemo.opengl.OpenGlService;
 import com.google.android.glass.sample.apidemo.theming.ThemingActivity;
 import com.google.android.glass.sample.apidemo.touchpad.SelectGestureDemoActivity;
 import com.google.android.glass.sample.apidemo.voicemenu.VoiceMenuActivity;
+import com.google.android.glass.widget.CardBuilder;
 import com.google.android.glass.widget.CardScrollAdapter;
 import com.google.android.glass.widget.CardScrollView;
 
@@ -56,7 +56,7 @@ public class ApiDemoActivity extends Activity {
 
     // Index of api demo cards.
     // Visible for testing.
-    static final int CARDS = 0;
+    static final int CARD_BUILDER = 0;
     static final int GESTURE_DETECTOR = 1;
     static final int THEMING = 2;
     static final int OPENGL = 3;
@@ -84,13 +84,18 @@ protected void onCreate(Bundle bundle) {
     /**
      * Create list of API demo cards.
      */
-    private List<Card> createCards(Context context) {
-        ArrayList<Card> cards = new ArrayList<Card>();
-        cards.add(CARDS, new Card(context).setText(R.string.text_cards));
-        cards.add(GESTURE_DETECTOR, new Card(context).setText(R.string.text_gesture_detector));
-        cards.add(THEMING, new Card(context).setText(R.string.text_theming));
-        cards.add(OPENGL, new Card(context).setText(R.string.text_opengl));
-        cards.add(VOICE_MENU, new Card(context).setText(R.string.text_voice_menu));
+    private List<CardBuilder> createCards(Context context) {
+        ArrayList<CardBuilder> cards = new ArrayList<CardBuilder>();
+        cards.add(CARD_BUILDER, new CardBuilder(context, CardBuilder.Layout.TEXT)
+                .setText(R.string.text_cards));
+        cards.add(GESTURE_DETECTOR, new CardBuilder(context, CardBuilder.Layout.TEXT)
+                .setText(R.string.text_gesture_detector));
+        cards.add(THEMING, new CardBuilder(context, CardBuilder.Layout.TEXT)
+                .setText(R.string.text_theming));
+        cards.add(OPENGL, new CardBuilder(context, CardBuilder.Layout.TEXT)
+                .setText(R.string.text_opengl));
+        cards.add(VOICE_MENU, new CardBuilder(context, CardBuilder.Layout.TEXT)
+                .setText(R.string.text_voice_menu));
         return cards;
     }
 
@@ -117,7 +122,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 Log.d(TAG, "Clicked view at position " + position + ", row-id " + id);
                 int soundEffect = Sounds.TAP;
                 switch (position) {
-                    case CARDS:
+                    case CARD_BUILDER:
                         startActivity(new Intent(ApiDemoActivity.this, CardsActivity.class));
                         break;
 

Diff for: AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
 package com.google.android.glass.sample.apidemo.card;
 
-import com.google.android.glass.app.Card;
+import com.google.android.glass.widget.CardBuilder;
 import com.google.android.glass.widget.CardScrollAdapter;
 
 import android.view.View;
@@ -30,9 +30,9 @@
  */
 public class CardAdapter extends CardScrollAdapter {
 
-    private final List<Card> mCards;
+    private final List<CardBuilder> mCards;
 
-    public CardAdapter(List<Card> cards) {
+    public CardAdapter(List<CardBuilder> cards) {
         mCards = cards;
     }
 
@@ -53,7 +53,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
     @Override
     public int getViewTypeCount() {
-        return Card.getViewTypeCount();
+        return CardBuilder.getViewTypeCount();
     }
 
     @Override
@@ -70,4 +70,12 @@ public int getPosition(Object item) {
         }
         return AdapterView.INVALID_POSITION;
     }
+
+    /**
+     * A non-adapter method to append a card at the end without notifying the adapter
+     * of the data change yet ({@link #notifyDataSetChanged}).
+     */
+    public void appendCardWithoutNotification(CardBuilder card) {
+        mCards.add(card);
+    }
 }