diff options
author | Trevor Johns <trevorjohns@google.com> | 2013-10-30 21:57:35 +0000 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2013-10-30 21:57:35 +0000 |
commit | ec985147ec781dfff9a229c6b794ee4eac0ced91 (patch) | |
tree | e2a89c3e427d9af663d0399b5aa0f61e7ffa3f7a /views | |
parent | bc6fe0f65025563ab50af193b099a8fca95ff0a2 (diff) | |
download | android-ec985147ec781dfff9a229c6b794ee4eac0ced91.tar.gz |
Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"
Undoing recent merge to get a clean klp-dev samples release without
template code. Will un-revert for followup release with templates after
that build has been cut.
This reverts commit bc6fe0f65025563ab50af193b099a8fca95ff0a2.
Change-Id: Icd2b9772986de7c4978a92e7e22bb2c2cef20bd0
Diffstat (limited to 'views')
29 files changed, 200 insertions, 539 deletions
diff --git a/views/TextLinkify/AndroidManifest.xml b/views/TextLinkify/AndroidManifest.xml new file mode 100644 index 00000000..0bf9b973 --- /dev/null +++ b/views/TextLinkify/AndroidManifest.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.example.android.views.textlinkify" + android:versionCode="1" + android:versionName="1.0" > + + <uses-sdk + android:minSdkVersion="4" + android:targetSdkVersion="17" /> + + <application + android:allowBackup="true" + android:icon="@drawable/ic_launcher" + android:label="@string/app_name" + android:theme="@style/AppTheme" > + <activity + android:name="com.example.android.views.textlinkify.MainActivity" + android:label="@string/app_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/views/TextLinkify/TextLinkify/build.gradle b/views/TextLinkify/TextLinkify/build.gradle new file mode 100644 index 00000000..5bef5eeb --- /dev/null +++ b/views/TextLinkify/TextLinkify/build.gradle @@ -0,0 +1,18 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} +apply plugin: 'android' + +dependencies { + compile "com.android.support:support-v4:18.0.+" +} + +android { + compileSdkVersion 18 + buildToolsVersion "18.0.0" +} diff --git a/views/TextLinkify/TextLinkify/src/main/AndroidManifest.xml b/views/TextLinkify/TextLinkify/src/main/AndroidManifest.xml new file mode 100644 index 00000000..0bf9b973 --- /dev/null +++ b/views/TextLinkify/TextLinkify/src/main/AndroidManifest.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.example.android.views.textlinkify" + android:versionCode="1" + android:versionName="1.0" > + + <uses-sdk + android:minSdkVersion="4" + android:targetSdkVersion="17" /> + + <application + android:allowBackup="true" + android:icon="@drawable/ic_launcher" + android:label="@string/app_name" + android:theme="@style/AppTheme" > + <activity + android:name="com.example.android.views.textlinkify.MainActivity" + android:label="@string/app_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/views/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java b/views/TextLinkify/TextLinkify/src/main/java/com/example/android/views/textlinkify/MainActivity.java index c9325a95..9e5a7c9d 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java +++ b/views/TextLinkify/TextLinkify/src/main/java/com/example/android/views/textlinkify/MainActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.android.textlinkify; +package com.example.android.views.textlinkify; import android.app.Activity; import android.graphics.Typeface; @@ -29,7 +29,7 @@ import android.widget.TextView; /** * This sample demonstrates how clickable links can be added to a - * {@link android.widget.TextView}. + * {@link TextView}. * * <p>This can be done in three ways: * <ul> @@ -38,7 +38,7 @@ import android.widget.TextView; * {@link android.widget.TextView#setAutoLinkMask(int)} using an option from * {@link android.text.util.Linkify}</li> * - * <li><b>Parsing a String as HTML:</b> See {@link android.text.Html#fromHtml(String)})</li> + * <li><b>Parsing a String as HTML:</b> See {@link Html#fromHtml(String)})</li> * * <li><b>Manually by constructing a {@link android.text.SpannableString}:</b> Consisting of * {@link android.text.style.StyleSpan} and {@link android.text.style.URLSpan} objects that @@ -52,7 +52,7 @@ public class MainActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.sample_main); + setContentView(R.layout.activity_main); // BEGIN_INCLUDE(text_auto_linkify) /* diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png b/views/TextLinkify/TextLinkify/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex eae36bc1..eae36bc1 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png +++ b/views/TextLinkify/TextLinkify/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png b/views/TextLinkify/TextLinkify/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex f727f489..f727f489 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png +++ b/views/TextLinkify/TextLinkify/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png b/views/TextLinkify/TextLinkify/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 51199d30..51199d30 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/views/TextLinkify/TextLinkify/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png b/views/TextLinkify/TextLinkify/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex c49ec6a7..c49ec6a7 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/views/TextLinkify/TextLinkify/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml b/views/TextLinkify/TextLinkify/src/main/res/layout/activity_main.xml index 8f35a705..8f35a705 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml +++ b/views/TextLinkify/TextLinkify/src/main/res/layout/activity_main.xml diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml b/views/TextLinkify/TextLinkify/src/main/res/values-sw600dp/dimens.xml index 29c42306..686fe891 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml +++ b/views/TextLinkify/TextLinkify/src/main/res/values-sw600dp/dimens.xml @@ -14,9 +14,11 @@ limitations under the License. --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="LinkText"> - <item name="android:paddingTop">9dp</item> - <item name="android:paddingBottom">9dp</item> - </style> +<resources> + + <!-- + Customize dimensions originally defined in res/values/dimens.xml (such as + screen margins) for sw600dp devices (e.g. 7" tablets) here. + --> + </resources> diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml b/views/TextLinkify/TextLinkify/src/main/res/values-sw720dp-land/dimens.xml index 560bd44e..560bd44e 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml +++ b/views/TextLinkify/TextLinkify/src/main/res/values-sw720dp-land/dimens.xml diff --git a/views/TextLinkify/TextLinkify/src/main/res/values-v11/styles.xml b/views/TextLinkify/TextLinkify/src/main/res/values-v11/styles.xml new file mode 100644 index 00000000..91f45232 --- /dev/null +++ b/views/TextLinkify/TextLinkify/src/main/res/values-v11/styles.xml @@ -0,0 +1,27 @@ +<!-- + 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. +--> + +<resources> + + <!-- + Base application theme for API 11+. This theme completely replaces + AppBaseTheme from res/values/styles.xml on API 11+ devices. + --> + <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> + <!-- API 11 theme customizations can go here. --> + </style> + +</resources> diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml b/views/TextLinkify/TextLinkify/src/main/res/values/dimens.xml index 3b1975a0..3b1975a0 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml +++ b/views/TextLinkify/TextLinkify/src/main/res/values/dimens.xml diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml b/views/TextLinkify/TextLinkify/src/main/res/values/strings.xml index c50774ed..371ee69a 100644 --- a/views/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml +++ b/views/TextLinkify/TextLinkify/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <resources> + <string name="app_name">TextLinkify Sample</string> <string name="intro">This sample illustrates how links can be added to a TextView. \nThis can be done either automatically by setting the <i>autoLink</i> property or explicitly.</string> diff --git a/views/TextLinkify/TextLinkify/src/main/res/values/styles.xml b/views/TextLinkify/TextLinkify/src/main/res/values/styles.xml new file mode 100644 index 00000000..91da12c4 --- /dev/null +++ b/views/TextLinkify/TextLinkify/src/main/res/values/styles.xml @@ -0,0 +1,40 @@ +<!-- + 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. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <!-- + Base application theme, dependent on API level. This theme is replaced + by AppBaseTheme from res/values-vXX/styles.xml on newer devices. + --> + <style name="AppBaseTheme" parent="android:Theme.Light"> + <!-- + Theme customizations available in newer API levels can go in + res/values-vXX/styles.xml, while customizations related to + backward-compatibility can go here. + --> + </style> + + <!-- Application theme. --> + <style name="AppTheme" parent="AppBaseTheme"> + <!-- All customizations that are NOT specific to a particular API-level can go here. --> + </style> + + <style name="LinkText"> + <item name="android:paddingTop">9dp</item> + <item name="android:paddingBottom">9dp</item> + </style> +</resources> diff --git a/views/TextLinkify/TextLinkifySample/.gitignore b/views/TextLinkify/TextLinkifySample/.gitignore deleted file mode 100644 index 6eb878d4..00000000 --- a/views/TextLinkify/TextLinkifySample/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# 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 diff --git a/views/TextLinkify/TextLinkifySample/proguard-project.txt b/views/TextLinkify/TextLinkifySample/proguard-project.txt deleted file mode 100644 index 0d8f171d..00000000 --- a/views/TextLinkify/TextLinkifySample/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ - To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/views/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml b/views/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml deleted file mode 100644 index 49b4eae0..00000000 --- a/views/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> - - - -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.android.textlinkify" - android:versionCode="1" - android:versionName="1.0"> - - <uses-sdk - android:minSdkVersion="4" - android:targetSdkVersion="17" /> - - <application - android:allowBackup="true" - android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:theme="@style/AppTheme" > - <activity - android:name=".MainActivity" - android:label="@string/app_name" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest> diff --git a/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml b/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml deleted file mode 100644 index e368f05f..00000000 --- a/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 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. - --> -<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.android.textlinkify.tests" - android:versionCode="1" - android:versionName="1.0"> - - <uses-sdk - android:minSdkVersion="18" - android:targetSdkVersion="19" /> - - <!-- We add an application tag here just so that we can indicate that - this package needs to link against the android.test library, - which is needed when building test cases. --> - <application> - <uses-library android:name="android.test.runner" /> - </application> - - <!-- - Specifies the instrumentation test runner used to run the tests. - --> - <instrumentation - android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.example.android.textlinkify" - android:label="Tests for com.example.android.textlinkify" /> - -</manifest>
\ No newline at end of file diff --git a/views/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java b/views/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java deleted file mode 100644 index 90a91cca..00000000 --- a/views/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java +++ /dev/null @@ -1,79 +0,0 @@ -/* -* 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"); -* 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.example.android.textlinkify.tests; - -import com.example.android.textlinkify.*; - -import android.test.ActivityInstrumentationTestCase2; - -/** -* Tests for TextLinkify sample. -*/ -public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { - - private MainActivity mTestActivity; - private TextLinkifyFragment mTestFragment; - - public SampleTests() { - super(MainActivity.class); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - - // Starts the activity under test using the default Intent with: - // action = {@link Intent#ACTION_MAIN} - // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} - // All other fields are null or empty. - mTestActivity = getActivity(); - mTestFragment = (TextLinkifyFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); - } - - /** - * Test if the test fixture has been set up correctly. - */ - public void testPreconditions() { - //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/views/TextLinkify/build.gradle b/views/TextLinkify/build.gradle index c7a137e4..495c5038 100644 --- a/views/TextLinkify/build.gradle +++ b/views/TextLinkify/build.gradle @@ -1,10 +1 @@ -// BEGIN_EXCLUDE -import com.example.android.samples.build.SampleGenPlugin -apply plugin: SampleGenPlugin - -samplegen { - pathToBuild "../../../../build" - pathToSamplesCommon "../../common" -} -apply from: "../../../../build/build.gradle" -// END_EXCLUDE +// Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/views/TextLinkify/buildSrc/build.gradle b/views/TextLinkify/buildSrc/build.gradle deleted file mode 100644 index 29282af4..00000000 --- a/views/TextLinkify/buildSrc/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ - - - -repositories { - mavenCentral() -} -dependencies { - compile 'org.freemarker:freemarker:2.3.20' -} - -sourceSets { - main { - groovy { - srcDir new File(rootDir, "../../../../../build/buildSrc/src/main/groovy") - } - } -} - diff --git a/views/TextLinkify/gradle/wrapper/gradle-wrapper.jar b/views/TextLinkify/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index 8c0fb64a..00000000 --- a/views/TextLinkify/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/views/TextLinkify/gradle/wrapper/gradle-wrapper.properties b/views/TextLinkify/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 861eddc3..00000000 --- a/views/TextLinkify/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Apr 10 15:27:10 PDT 2013 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip diff --git a/views/TextLinkify/gradlew b/views/TextLinkify/gradlew deleted file mode 100755 index 91a7e269..00000000 --- a/views/TextLinkify/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/views/TextLinkify/gradlew.bat b/views/TextLinkify/gradlew.bat deleted file mode 100644 index aec99730..00000000 --- a/views/TextLinkify/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/views/TextLinkify/settings.gradle b/views/TextLinkify/settings.gradle index 38e7dddc..20429823 100644 --- a/views/TextLinkify/settings.gradle +++ b/views/TextLinkify/settings.gradle @@ -1,4 +1,2 @@ +include ':TextLinkify' - - -include 'TextLinkifySample' diff --git a/views/TextLinkify/template-params.xml b/views/TextLinkify/template-params.xml deleted file mode 100644 index c703b8b7..00000000 --- a/views/TextLinkify/template-params.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> - -<sample> - <name>TextLinkify</name> - <group>Views</group> - <package>com.example.android.textlinkify</package> - - <!-- change minSdk if needed--> - <minSdk>4</minSdk> - - <strings> - <intro> - <![CDATA[ - This sample illustrates how links can be added to a TextView. This can be done either - automatically by setting the "autoLink" property or explicitly. - ]]> - </intro> - </strings> - - <template src="base"/> - <common src="logger"/> - -</sample> diff --git a/views/TextLinkify/textLinkify.jd b/views/TextLinkify/textLinkify.jd new file mode 100644 index 00000000..ca39b7b2 --- /dev/null +++ b/views/TextLinkify/textLinkify.jd @@ -0,0 +1,15 @@ +page.title=Linkify Sample +@jd:body +<p>This sample demonstrates how clickable links can be added to a + <a href="http://developer.android.com/reference/android/widget/TextView.html">TextView</a>. + This can be done automatically (see + <a href="http://developer.android.com/reference/android/widget/TextView.html#setAutoLinkMask(int)"> +TextView#setAutoLinkMask(int)</a>), explicitly by parsing a String as + HTML (see + <a href="http://developer.android.com/reference/android/text/Html.html#fromHtml(java.lang.String)"> + Html#fromHtml(String)</a>) or using a + <a href="http://developer.android.com/reference/android/text/SpannableString.html">SpannableString +</a> consisting of + <a href="http://developer.android.com/reference/android/text/style/StyleSpan.html">StyleSpan</a> + and <a href="http://developer.android.com/reference/android/text/style/URLSpan.html">URLSpan</a> + objects. </p>
\ No newline at end of file |