am b6bfd839: Adding new samples to build.gradle for april push.
* commit 'b6bfd83929a1db0759c957820938ae06219f9183':
Adding new samples to build.gradle for april push.
diff --git a/build.gradle b/build.gradle
index cf1ed3a..4e3b3c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@
"ui/lists/CustomChoiceList",
"ui/views/TextSwitcher",
"ui/views/HorizontalPaging",
-"ui/actionbarcompat/Basic",
+"ui/actionbarcompat/ActionBarCompat-Basic",
"ui/actionbarcompat/ActionBarCompat-Styled",
"ui/actionbarcompat/ActionBarCompat-ListPopupMenu",
"ui/actionbarcompat/ActionBarCompat-ShareActionProvider",
@@ -31,20 +31,22 @@
"ui/window/AdvancedImmersiveMode",
"ui/window/ImmersiveMode",
"background/alarms/RepeatingAlarm",
-//"renderScript/BasicRenderScript",
-//"renderScript/RenderScriptIntrinsic",
-//"sensors/BatchStepSensor"
+"renderScript/BasicRenderScript",
+"renderScript/RenderScriptIntrinsic",
"ui/views/SlidingTabs/SlidingTabsBasic",
"ui/views/SlidingTabs/SlidingTabsColors",
"connectivity/nfc/CardEmulation",
"connectivity/nfc/CardReader",
-"sensors/BatchStepSensor"
-
+"sensors/BatchStepSensor",
"ui/graphics/DisplayingBitmaps",
"ui/transition/AdapterTransition",
"ui/transition/BasicTransition",
+"ui/transition/CustomTransition",
+"ui/transition/FragmentTransition",
+"ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic",
+"ui/views/SwipeRefreshLayout/SwipeRefreshListFragment",
+"ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews",
"media/MediaRouter"
->>>>>>> 16747963
]
List<String> taskNames = [
diff --git a/connectivity/nfc/CardEmulation/build.gradle b/connectivity/nfc/CardEmulation/build.gradle
index c7f6491..cca9ac3 100644
--- a/connectivity/nfc/CardEmulation/build.gradle
+++ b/connectivity/nfc/CardEmulation/build.gradle
@@ -1,8 +1,10 @@
-
// BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
samplegen {
pathToBuild "../../../../../build"
pathToSamplesCommon "../../../common"
}
+apply from: "../../../../../build/build.gradle"
// END_EXCLUDE
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/.gitignore b/sensors/BatchStepSensor/BatchStepSensorSample/.gitignore
new file mode 100644
index 0000000..6eb878d
--- /dev/null
+++ b/sensors/BatchStepSensor/BatchStepSensorSample/.gitignore
@@ -0,0 +1,16 @@
+# 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.
+src/template/
+src/common/
+build.gradle
