Skip to content
This repository was archived by the owner on Sep 12, 2019. It is now read-only.

Commit d3aa223

Browse files
google-automergergoogle-automerger
committed
Auto-update
1 parent 79fec06 commit d3aa223

File tree

8 files changed

+69
-32
lines changed

8 files changed

+69
-32
lines changed

‎.google/packaging.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# GOOGLE SAMPLE PACKAGING DATA
2+
#
3+
# This file is used by Google as part of our samples packaging process.
4+
# End users may safely ignore this file. It has no relevance to other systems.
5+
---
6+
status: PUBLISHED
7+
technologies: [Android]
8+
categories: [Views]
9+
languages: [Java]
10+
solutions: [Mobile]
11+
github: android-TextLinkify
12+
license: apache2

‎Application/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
buildscript {
22
repositories {
3-
mavenCentral()
3+
jcenter()
44
}
55

66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.12.+'
7+
classpath 'com.android.tools.build:gradle:1.0.0-rc1'
88
}
99
}
1010

1111
apply plugin: 'com.android.application'
1212

13+
repositories {
14+
jcenter()
15+
}
16+
1317

1418
dependencies {
1519

@@ -27,7 +31,7 @@ List<String> dirs = [
2731

2832
android {
2933
compileSdkVersion 21
30-
buildToolsVersion "21.0.0"
34+
buildToolsVersion "21.1.1"
3135

3236
defaultConfig {
3337
minSdkVersion 4

‎Application/src/main/res/values-v21/base-colors.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2013 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<resources>
18+
19+
20+
</resources>

‎Application/src/main/res/values-v21/base-template-styles.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2013 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<resources>
18+
19+
<!-- Activity themes -->
20+
<style name="Theme.Base" parent="android:Theme.Material.Light">
21+
</style>
22+
23+
</resources>

‎Application/src/main/res/values-v21/template-styles.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎CONTRIB.md renamed to ‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Please fill out either the individual or corporate Contributor License Agreement
99

1010
* If you are an individual writing original source code and you're sure you
1111
own the intellectual property, then you'll need to sign an [individual CLA]
12-
(https://developers.google.com/open-source/cla/individual).
12+
(https://cla.developers.google.com).
1313
* If you work for a company that wants to allow you to contribute your work,
1414
then you'll need to sign a [corporate CLA]
15-
(https://developers.google.com/open-source/cla/corporate).
15+
(https://cla.developers.google.com).
1616

1717
Follow either of the two links above to access the appropriate CLA and
1818
instructions for how to sign and return it. Once we receive it, we'll be able to

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Android TextLinkify Sample
2-
==============================
2+
===================================
33

44
This sample illustrates how links can be added to a TextView. This can be done either
55
automatically by setting the "autoLink" property or explicitly.
66

77
Pre-requisites
88
--------------
99

10-
- Android SDK v20
11-
- Android Build Tools v20
10+
- Android SDK v21
11+
- Android Build Tools v21.1.1
1212
- Android Support Repository
1313

1414
Getting Started
@@ -41,7 +41,7 @@ file to you under the Apache License, Version 2.0 (the "License"); you may not
4141
use this file except in compliance with the License. You may obtain a copy of
4242
the License at
4343

44-
http://www.apache.org/licenses/LICENSE-2.0
44+
http://www.apache.org/licenses/LICENSE-2.0
4545

4646
Unless required by applicable law or agreed to in writing, software
4747
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 commit comments

Comments
 (0)