diff options
author | Trevor Johns <trevorjohns@google.com> | 2014-11-12 11:39:30 -0800 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2014-11-12 11:39:30 -0800 |
commit | 527a4f30a69aaa54fc9654539f0b6d839e37af3c (patch) | |
tree | 38f816a286e672e8f00caed6a0344c3c18632a78 /samples/browseable/BasicGestureDetect | |
parent | fcd28181a15ebe95724fe096a8b5198c964b0d7f (diff) | |
download | android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.gz android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.bz2 android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.zip |
Update browseable samples for lmp-docs
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes
new samples for Android Auto.
Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
Diffstat (limited to 'samples/browseable/BasicGestureDetect')
6 files changed, 29 insertions, 18 deletions
diff --git a/samples/browseable/BasicGestureDetect/AndroidManifest.xml b/samples/browseable/BasicGestureDetect/AndroidManifest.xml index 87ed60345..aaa4f41c1 100644 --- a/samples/browseable/BasicGestureDetect/AndroidManifest.xml +++ b/samples/browseable/BasicGestureDetect/AndroidManifest.xml @@ -22,7 +22,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="17" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" android:label="@string/app_name" diff --git a/samples/browseable/BasicGestureDetect/_index.jd b/samples/browseable/BasicGestureDetect/_index.jd index 762217ad6..1e5d0d26c 100644 --- a/samples/browseable/BasicGestureDetect/_index.jd +++ b/samples/browseable/BasicGestureDetect/_index.jd @@ -1,12 +1,10 @@ - - - page.tags="BasicGestureDetect" sample.group=Input @jd:body -<p>This sample demonstrates how to use the {@link android.view.GestureDetector} -API to detect simple dragging and tapping gestures.</p> -<p>To learn more about detecting basic touch gestures such as scrolling, -flinging, and double-tapping, see -<a href="{@docRoot}training/gestures/detector.html">Detecting Common Gestures</a>.</p> +<p> + + Welcome to Basic Gesture Detect! + In order to try this sample out, try dragging or tapping this text to see what happens! + + </p> diff --git a/samples/browseable/BasicGestureDetect/res/values-v21/template-styles.xml b/samples/browseable/BasicGestureDetect/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/BasicGestureDetect/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 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. + --> + +<resources> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/BasicGestureDetect/res/values/base-strings.xml b/samples/browseable/BasicGestureDetect/res/values/base-strings.xml index e9ce7cd0d..8b96af7a1 100644 --- a/samples/browseable/BasicGestureDetect/res/values/base-strings.xml +++ b/samples/browseable/BasicGestureDetect/res/values/base-strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="app_name">BasicGestureDetect</string> <string name="intro_message"> diff --git a/samples/browseable/BasicGestureDetect/res/values/strings.xml b/samples/browseable/BasicGestureDetect/res/values/strings.xml index c047c4fcc..826d90f15 100644 --- a/samples/browseable/BasicGestureDetect/res/values/strings.xml +++ b/samples/browseable/BasicGestureDetect/res/values/strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="sample_action">Clear Text</string> </resources> diff --git a/samples/browseable/BasicGestureDetect/src/com.example.android.basicgesturedetect/MainActivity.java b/samples/browseable/BasicGestureDetect/src/com.example.android.basicgesturedetect/MainActivity.java index de4a39f82..57d935447 100644 --- a/samples/browseable/BasicGestureDetect/src/com.example.android.basicgesturedetect/MainActivity.java +++ b/samples/browseable/BasicGestureDetect/src/com.example.android.basicgesturedetect/MainActivity.java @@ -14,9 +14,6 @@ * limitations under the License. */ - - - package com.example.android.basicgesturedetect; import android.graphics.Color; |