Update sample prebuilts for KLP (DO NOT MERGE)
Change-Id: I4e34116225877ac06661af22790578752cc70171
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
index 481f10d..f104237 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile "com.android.support:appcompat-v7:18.0.+"
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
index 53e4882..712ef3c 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile "com.android.support:appcompat-v7:+"
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
index 481f10d..f104237 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile "com.android.support:appcompat-v7:18.0.+"
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
index 481f10d..f104237 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile "com.android.support:appcompat-v7:18.0.+"
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-w820dp/dimens.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
- <!-- Example customization of dimensions originally defined in res/values/dimens.xml
- (such as screen margins) for screens with more than 820dp of available width. This
- would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
- <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/dimens.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/dimens.xml
deleted file mode 100644
index a0171a7..0000000
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-
- </resources>
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..02b87cf
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
@@ -1,19 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+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
+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
+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.
+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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
+ <string name="item_clicked">%s clicked</string>
+ <string name="show_as_grid">Show as grid</string>
+ <string name="show_as_list">Show as list</string>
</resources>
diff --git a/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
index 4f5d419..00daa77 100644
--- a/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/strings.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
index 3635fcd..ce0e461 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/Basic/BasicSample/build.gradle b/prebuilts/gradle/Basic/BasicSample/build.gradle
deleted file mode 100644
index ba3300b..0000000
--- a/prebuilts/gradle/Basic/BasicSample/build.gradle
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.8.+'
- }
-}
-
-apply plugin: 'android'
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.0.+"
- compile "com.android.support:gridlayout-v7:19.0.+"
-
-
- compile "com.android.support:appcompat-v7:18.0.+"
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "19.0.1"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- instrumentTest.setRoot('tests')
- instrumentTest.java.srcDirs = ['tests/src']
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/Basic/BasicSample/src/main/AndroidManifest.xml
deleted file mode 100644
index 332c055..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,43 +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.actionbarcompat.basic"
- android:versionCode="1"
- android:versionName="1.0">
-
- <!-- ActionBarCompat provides an Action Bar from API v7 onwards -->
- <uses-sdk
- android:minSdkVersion="7"
- android:targetSdkVersion="17" />
-
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/Theme.AppCompat"
- android:allowBackup="true">
-
- <activity android:name=".MainActivity">
- <!-- Launcher Intent filter -->
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java b/prebuilts/gradle/Basic/BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
deleted file mode 100644
index 8d3506f..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.actionbarcompat.basic;
-
-import android.os.Bundle;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * This sample shows you how to use ActionBarCompat to create a basic Activity which displays
- * action items. It covers inflating items from a menu resource, as well as adding an item in code.
- *
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
- * necessary to display a compatible Action Bar on devices running Android v2.1+.
- */
-public class MainActivity extends ActionBarActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.sample_main);
- }
-
- // BEGIN_INCLUDE(create_menu)
- /**
- * Use this method to instantiate your menu, and add your items to it. You
- * should return true if you have added items to it and want the menu to be displayed.
- */
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate our menu from the resources by using the menu inflater.
- getMenuInflater().inflate(R.menu.main, menu);
-
- // It is also possible add items here. Use a generated id from
- // resources (ids.xml) to ensure that all menu ids are distinct.
- MenuItem locationItem = menu.add(0, R.id.menu_location, 0, R.string.menu_location);
- locationItem.setIcon(R.drawable.ic_action_location);
-
- // Need to use MenuItemCompat methods to call any action item related methods
- MenuItemCompat.setShowAsAction(locationItem, MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
- return true;
- }
- // END_INCLUDE(create_menu)
-
- // BEGIN_INCLUDE(menu_item_selected)
- /**
- * This method is called when one of the menu items to selected. These items
- * can be on the Action Bar, the overflow menu, or the standard options menu. You
- * should return true if you handle the selection.
- */
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_refresh:
- // Here we might start a background refresh task
- return true;
-
- case R.id.menu_location:
- // Here we might call LocationManager.requestLocationUpdates()
- return true;
-
- case R.id.menu_settings:
- // Here we would open up our settings activity
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
- // END_INCLUDE(menu_item_selected)
-}
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_location.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
deleted file mode 100644
index a42b3ea..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index c9d295d..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index d3f981d..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 5bb19fb..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_location.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
deleted file mode 100644
index eaf9774..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
deleted file mode 100644
index eef97e9..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index fc2bf8c..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 5737b36..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
deleted file mode 100644
index 5f11cce..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index 1027c9a..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 1b9acf2..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 31df043..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 5087435..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +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.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <LinearLayout style="@style/Widget.SampleMessageTile"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView style="@style/Widget.SampleMessage"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/horizontal_page_margin"
- android:layout_marginRight="@dimen/horizontal_page_margin"
- android:layout_marginTop="@dimen/vertical_page_margin"
- android:layout_marginBottom="@dimen/vertical_page_margin"
- android:text="@string/intro_message" />
- </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/sample_main.xml
deleted file mode 100644
index ff589e1..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/layout/sample_main.xml
+++ /dev/null
@@ -1,22 +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.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="16dp"
- android:text="@string/intro_message"
- android:gravity="center" />
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/menu/main.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/menu/main.xml
deleted file mode 100644
index a4dc5d1..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,51 +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.
--->
-
-<!--
- As we're using ActionBarCompat, any action item attributes come from ActionBarCompat's XML
- namespace instead of the android namespace. Here we've added a new support namespace added to
- the menu element allowing us to use the 'showAsAction' attribute in a backwards compatible way.
- Any other action item attributes used should be referenced from this namespace too
- (actionProviderClass, actionViewClass, actionLayout).
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:support="http://schemas.android.com/apk/res-auto" >
-
- <!--
- Here we create an item, setting support:showAsAction to display the item as an action if
- there's room on the compatible Action Bar.
- -->
- <item
- android:id="@+id/menu_refresh"
- android:icon="@drawable/ic_action_refresh"
- android:title="@string/menu_refresh"
- support:showAsAction="ifRoom"/>
-
- <!-- Location item is added in onCreateOptionsMenu() -->
-
- <!--
- Here we set the settings item to always be in the overflow menu, by setting
- support:showAsAction to never, so it is never displayed as an action item on the compatible
- Action Bar.
- -->
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/ic_action_settings"
- android:title="@string/menu_settings"
- support:showAsAction="never"/>
-
-</menu>
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-dimens.xml
+++ /dev/null
@@ -1,24 +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.
- -->
-
-<resources>
-
- <!-- Semantic definitions -->
-
- <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
- <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +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.
- -->
-
-<resources>
-
- <style name="Widget.SampleMessage">
- <item name="android:textAppearance">?android:textAppearanceLarge</item>
- <item name="android:lineSpacingMultiplier">1.2</item>
- <item name="android:shadowDy">-6.5</item>
- </style>
-
-</resources>
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values/base-strings.xml
deleted file mode 100644
index ff084ef..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/base-strings.xml
+++ /dev/null
@@ -1,34 +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.
--->
-
-
-
-<resources>
- <string name="app_name">Basic</string>
- <string name="intro_message">
- <![CDATA[
-
-
- This sample shows you how to use ActionBarCompat to create a basic Activity which
- displays action items. It covers inflating items from a menu resource, as well as adding
- an item in code. Items that are not shown as action items on the Action Bar are
- displayed in the action bar overflow.
-
-
- ]]>
- </string>
-</resources>
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/ids.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values/ids.xml
deleted file mode 100644
index 0269815..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<resources>
-
- <!--
- Generate an id which can be used when the location menu item is added in MainActivity
- -->
- <item name="menu_location" type="id"/>
-
-</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values/strings.xml
deleted file mode 100644
index 7867410..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +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.
--->
-<resources>
- <string name="menu_refresh">Refresh</string>
- <string name="menu_location">Location</string>
- <string name="menu_settings">Settings</string>
-</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-dimens.xml
+++ /dev/null
@@ -1,32 +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.
- -->
-
-<resources>
-
- <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
- <dimen name="margin_tiny">4dp</dimen>
- <dimen name="margin_small">8dp</dimen>
- <dimen name="margin_medium">16dp</dimen>
- <dimen name="margin_large">32dp</dimen>
- <dimen name="margin_huge">64dp</dimen>
-
- <!-- Semantic definitions -->
-
- <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
- <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-styles.xml
deleted file mode 100644
index 404623e..0000000
--- a/prebuilts/gradle/Basic/BasicSample/src/main/res/values/template-styles.xml
+++ /dev/null
@@ -1,42 +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.
- -->
-
-<resources>
-
- <!-- Activity themes -->
-
- <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
- <style name="Theme.Sample" parent="Theme.Base" />
-
- <style name="AppTheme" parent="Theme.Sample" />
- <!-- Widget styling -->
-
- <style name="Widget" />
-
- <style name="Widget.SampleMessage">
- <item name="android:textAppearance">?android:textAppearanceMedium</item>
- <item name="android:lineSpacingMultiplier">1.1</item>
- </style>
-
- <style name="Widget.SampleMessageTile">
- <item name="android:background">@drawable/tile</item>
- <item name="android:shadowColor">#7F000000</item>
- <item name="android:shadowDy">-3.5</item>
- <item name="android:shadowRadius">2</item>
- </style>
-
-</resources>
diff --git a/prebuilts/gradle/Basic/BasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/Basic/BasicSample/tests/AndroidManifest.xml
deleted file mode 100644
index a2f7cfc..0000000
--- a/prebuilts/gradle/Basic/BasicSample/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.actionbarcompat.basic.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.actionbarcompat.basic"
- android:label="Tests for com.example.android.actionbarcompat.basic" />
-
-</manifest>
\ No newline at end of file
diff --git a/prebuilts/gradle/Basic/BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/prebuilts/gradle/Basic/BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
deleted file mode 100644
index 8c1b2be..0000000
--- a/prebuilts/gradle/Basic/BasicSample/tests/src/com/example/android/actionbarcompat/basic/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.actionbarcompat.basic.tests;
-
-import com.example.android.actionbarcompat.basic.*;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
-* Tests for Basic sample.
-*/
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
- private MainActivity mTestActivity;
- private BasicFragment 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 = (BasicFragment)
- 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/prebuilts/gradle/Basic/README.txt b/prebuilts/gradle/Basic/README.txt
deleted file mode 100644
index 9616c58..0000000
--- a/prebuilts/gradle/Basic/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Build Instructions
--------------------
-
-This sample uses the Gradle build system. To build this project, use the
-"gradlew build" command or use "Import Project" in Android Studio.
-
-To see a list of all available commands, run "gradlew tasks".
-
-Dependencies
--------------
-
-- Android SDK Build-tools v18.1
-- Android Support Repository v2
-
-Dependencies are available for download via the Android SDK Manager.
-
-Android Studio is available for download at:
- http://developer.android.com/sdk/installing/studio.html
diff --git a/prebuilts/gradle/Basic/build.gradle b/prebuilts/gradle/Basic/build.gradle
deleted file mode 100644
index 584ba87..0000000
--- a/prebuilts/gradle/Basic/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/Basic/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/Basic/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/Basic/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Basic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/Basic/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 56f685a..0000000
--- a/prebuilts/gradle/Basic/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.10-bin.zip
diff --git a/prebuilts/gradle/Basic/gradlew b/prebuilts/gradle/Basic/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/Basic/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/prebuilts/gradle/Basic/gradlew.bat b/prebuilts/gradle/Basic/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/Basic/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/prebuilts/gradle/Basic/settings.gradle b/prebuilts/gradle/Basic/settings.gradle
deleted file mode 100644
index 2f3a557..0000000
--- a/prebuilts/gradle/Basic/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-include 'BasicSample'
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
index 39e67cf..b0d7529 100644
--- a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
+++ b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 11
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
index 3635fcd..ce0e461 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
+++ b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle b/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
index 3635fcd..ce0e461 100644
--- a/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
+++ b/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
index 7268f8e..96bdeaf 100644
--- a/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
index 3635fcd..ce0e461 100644
--- a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
+++ b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
+++ b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
index dc4040d..09fa0f2 100644
--- a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 17
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
index dc4040d..09fa0f2 100644
--- a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
+++ b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 17
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
index bd5f54c..f66ba6d 100644
--- a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
+++ b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
+++ b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
index bd5f54c..f66ba6d 100644
--- a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
+++ b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
index 2d228cb..f3daf96 100644
--- a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
+++ b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile files('renderscript-v8.jar')
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
index 8e914ab..c68abf9 100644
--- a/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
index 2cc613a..0ba3e76 100644
--- a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
+++ b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle b/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
+++ b/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..319cf31
--- a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
@@ -1,19 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+ 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
+ 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
+ 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.
+ 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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
+
+ <string name="scene">Scene</string>
+ <string name="scene_1">1</string>
+ <string name="scene_2">2</string>
+ <string name="scene_3">3</string>
+ <string name="scene_4">4</string>
+ <string name="hello">Hello!</string>
+ <string name="additional_message">This text fades in and out.</string>
+
</resources>
diff --git a/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
+++ b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
index 3635fcd..ce0e461 100644
--- a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
+++ b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
index f70a10c..01795af 100644
--- a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
+++ b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 14
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle b/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
+++ b/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..f708284
--- a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
@@ -1,19 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+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
+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
+ 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.
+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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+ <string name="service_name">CardEmulation Sample</string>
+ <string name="card_title">Sample Loyalty Card</string>
+ <string name="account_number">Account Number</string>
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/build.gradle b/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
+++ b/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..b1b1a49
--- a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml
@@ -1,19 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+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
+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
+ 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.
+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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+ <string name="card_title">Sample Loyalty Card</string>
+ <string name="account_number">Account Number</string>
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
index faeb422..0b5e0c8 100644
--- a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
+++ b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 3
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
+++ b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle b/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
+++ b/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
index 88992c0..684b39c 100644
--- a/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
index 2cc613a..0ba3e76 100644
--- a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
+++ b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle b/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
index f70a10c..01795af 100644
--- a/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
+++ b/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 14
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
+++ b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..5f77789
--- a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
@@ -1,19 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+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
+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
+ 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.
+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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
+
+ <string name="lorem_ipsum">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
+
</resources>
diff --git a/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
index 4f5d419..00daa77 100644
--- a/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
index 39e67cf..b0d7529 100644
--- a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
+++ b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 11
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
+++ b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
index f70a10c..01795af 100644
--- a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
+++ b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 14
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle b/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
index 2d9552c..8b88a99 100644
--- a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
+++ b/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
compile "com.android.support:appcompat-v7:+"
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
index bd5f54c..f66ba6d 100644
--- a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
+++ b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
index 8998218..d7c3c23 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
+++ b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
compile files('renderscript-v8.jar')
@@ -35,7 +35,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
index 0f9e485..42b0b0f 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
+++ b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
+++ b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
+++ b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..e1b0846
--- a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
@@ -1,19 +1,9 @@
-<!--
- 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+
+ <string name="tab_stream">Stream</string>
+ <string name="tab_messages">Messages</string>
+ <string name="tab_notifications">Notifications</string>
+ <string name="tab_photos">Photos</string>
+
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle b/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
+++ b/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle b/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
index 036385b..3c4239e 100644
--- a/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
+++ b/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:19.1.+"
+ compile "com.android.support:support-v13:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
index 4e1852d..1135a41 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 10
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..6bdb32e
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
@@ -1,19 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+ 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
+ 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
+ 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.
+ 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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+
+ <string name="menu_refresh">Refresh</string>
+
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
index 4e1852d..1135a41 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 10
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..21bbcaf
--- a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
@@ -1,19 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+ 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
+ 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
+ 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.
+ 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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+
+ <string name="menu_refresh">Refresh</string>
+
+ <string name="menu_color_scheme">Color scheme</string>
+ <string name="menu_color_scheme_1">Scheme #1</string>
+ <string name="menu_color_scheme_2">Scheme #2</string>
+ <string name="menu_color_scheme_3">Scheme #3</string>
+
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
index 4e1852d..1135a41 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,8 +17,8 @@
dependencies {
// Add the support lib that is appropriate for SDK 10
- compile "com.android.support:support-v4:19.1.+"
- compile "com.android.support:gridlayout-v7:19.1.+"
+ compile "com.android.support:support-v4:20.+"
+ compile "com.android.support:gridlayout-v7:20.+"
}
@@ -34,7 +34,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
copy from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/strings.xml
copy to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index 7b9d9ec..991f0e8
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
@@ -1,19 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2013 The Android Open Source Project
+ 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
+ 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
+ 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.
+ 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>
- <string name="sample_show_log">Show Log</string>
- <string name="sample_hide_log">Hide Log</string>
-</resources>
+
+ <string name="menu_clear">Clear items</string>
+ <string name="menu_refresh">Refresh</string>
+ <string name="empty_text">List is empty! Swipe down to refresh.</string>
+
+</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle b/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
+++ b/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
index 42942f3..f7ef855 100644
--- a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
+++ b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
@@ -17,7 +17,7 @@
dependencies {
// Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:19.1.+"
+ compile "com.android.support:support-v4:20.+"
}
@@ -33,7 +33,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion "19.1.0"
sourceSets {
main {
diff --git a/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
index 56f685a..d7f03cf 100644
--- a/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
