Fixes test code that don't compile.

- Removed the double license.
- Removed non-existent classes such as ?????Fragment or ?????Activity which
  seemed to be created through the template but haven't been executed.
- Changed the wrong index of the Fragment from 1 to 0.
- Fixes the targetPackage name consistent with the application package.

Change-Id: Id4e5924687ac2320f8ffc4319c4fbadd8523b42e

15 files changed, 32 insertions, 301 deletions

diff --git a/ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java b/ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
index 0c9a152f..18a144df 100644
--- a/ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
+++ b/ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicAccessibilityFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicAccessibilityFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java b/ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
index c019ef8a..b9b8443a 100644
--- a/ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
+++ b/ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private DoneBarFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (DoneBarFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
index 8c1b2be8..767dbbb0 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
index c91ae2ef..adc025af 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,7 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ListPopupMenuFragment mTestFragment;
+    private PopupListFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +40,8 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ListPopupMenuFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (PopupListFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -76,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
index 9e592f5b..a6ee4ae7 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,7 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ActionBarCompat-ListViewModalSelectFragment mTestFragment;
+    private CheeseListFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +40,8 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ActionBarCompat-ListViewModalSelectFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (CheeseListFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -76,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
index e655bcf9..2d56881f 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
+++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ShareActionProviderFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ShareActionProviderFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
index 204afdc7..1e99f202 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private StyledFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (StyledFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
index f06d1aed..09dd1a17 100644
--- a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
+++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
@@ -25,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ActivitySceneTransitionBasicFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -40,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ActivitySceneTransitionBasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -51,7 +48,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
diff --git a/ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java b/ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
index f2958564..2d2ca68e 100644
--- a/ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
+++ b/ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,20 +15,19 @@
 */
 package com.example.android.displayingbitmaps.tests;
 
-import com.example.android.displayingbitmaps.*;
+import com.example.android.displayingbitmaps.ui.ImageGridActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
 * Tests for DisplayingBitmaps sample.
 */
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+public class SampleTests extends ActivityInstrumentationTestCase2<ImageGridActivity> {
 
-    private MainActivity mTestActivity;
-    private DisplayingBitmapsFragment mTestFragment;
+    private ImageGridActivity mTestActivity;
 
     public SampleTests() {
-        super(MainActivity.class);
+        super(ImageGridActivity.class);
     }
 
     @Override
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (DisplayingBitmapsFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java b/ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
index 5e7acc0e..47272332 100644
--- a/ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
+++ b/ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -110,4 +92,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
index a9004853..976e71c6 100644
--- a/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
+++ b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
@@ -17,16 +17,17 @@
 package com.example.android.floatingactionbuttonbasic.tests;
 
 import com.example.android.floatingactionbuttonbasic.*;
+import com.example.android.common.logger.LogFragment;
 
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
-* Tests for FloatingActionButtonBasic sample.
+* Tests for FloatingActionButton sample.
 */
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private FloatingActionButton mTestFragment;
+    private LogFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -41,8 +42,8 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (FloatingActionButton)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (LogFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -59,4 +60,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java b/ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
index 206eea96..ba4d76cf 100644
--- a/ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
+++ b/ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2;
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private HorizontalPagingFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (HorizontalPagingFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java b/ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
index eca6b61f..e945d2ca 100644
--- a/ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
+++ b/ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,13 +22,12 @@ import android.test.ActivityInstrumentationTestCase2;
 /**
 * Tests for NavigationDrawer sample.
 */
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+public class SampleTests extends ActivityInstrumentationTestCase2<NavigationDrawerActivity> {
 
-    private MainActivity mTestActivity;
-    private NavigationDrawerFragment mTestFragment;
+    private NavigationDrawerActivity mTestActivity;
 
     public SampleTests() {
-        super(MainActivity.class);
+        super(NavigationDrawerActivity.class);
     }
 
     @Override
@@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (NavigationDrawerFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java b/ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
index 249f1ef9..de858515 100644
--- a/ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
+++ b/ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -72,4 +54,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
         assertNotNull("mTestFragment is null", mTestFragment);
         assertNotNull("Circle view is null", mTestActivity.findViewById(R.id.circle));
     }
-}
\ No newline at end of file
+}
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java b/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
index 6ab9c733..3206049a 100644
--- a/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
+++ b/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -76,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}