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/TextLinkify | |
| 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/TextLinkify')
4 files changed, 29 insertions, 18 deletions
diff --git a/samples/browseable/TextLinkify/AndroidManifest.xml b/samples/browseable/TextLinkify/AndroidManifest.xml index 49b4eae0b..eb55f205b 100644 --- a/samples/browseable/TextLinkify/AndroidManifest.xml +++ b/samples/browseable/TextLinkify/AndroidManifest.xml @@ -22,9 +22,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="4" - android:targetSdkVersion="17" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/samples/browseable/TextLinkify/_index.jd b/samples/browseable/TextLinkify/_index.jd index 36aa07515..5b4c000b8 100644 --- a/samples/browseable/TextLinkify/_index.jd +++ b/samples/browseable/TextLinkify/_index.jd @@ -1,16 +1,10 @@ - - - page.tags="TextLinkify" sample.group=Views @jd:body -<p>This sample demonstrates how to add clickable links to a -{@link android.widget.TextView}, by using these techniques: -<ul> -<li>Setting the {@link android.R.styleable#TextView_autoLink} property -to automatically convert the text to a link.</li> -<li>Parsing a String as HTML</li> -<li>Manually by constructing a {@link android.text.SpannableString}.</li> -</ul> -</p> +<p> + + This sample illustrates how links can be added to a TextView. This can be done either + automatically by setting the "autoLink" property or explicitly. + + </p> diff --git a/samples/browseable/TextLinkify/res/values-v21/template-styles.xml b/samples/browseable/TextLinkify/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/TextLinkify/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/TextLinkify/res/values/base-strings.xml b/samples/browseable/TextLinkify/res/values/base-strings.xml index f2eb104c4..831f4b2a2 100644 --- a/samples/browseable/TextLinkify/res/values/base-strings.xml +++ b/samples/browseable/TextLinkify/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">TextLinkify</string> <string name="intro_message"> |