merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/build.gradle b/build.gradle
index 1f100b3..463cba8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@
"ui/actionbarcompat/ActionBarCompat-Basic",
"ui/actionbarcompat/ActionBarCompat-Styled",
"ui/actionbarcompat/ActionBarCompat-ListPopupMenu",
-"ui/actionbarcompat/ActionBarCompat-ShareActionProvider",
"notification/BasicNotifications",
"notification/CustomNotifications",
"ui/actionbar/DoneBar",
@@ -121,6 +120,7 @@
"system/AppShortcuts",
"input/keyboard/CommitContentSampleApp",
"input/keyboard/CommitContentSampleIME",
+"content/ShareActionProvider",
]
List<String> taskNames = [
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/.gitignore b/content/ShareActionProvider/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/.gitignore
rename to content/ShareActionProvider/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/proguard-project.txt b/content/ShareActionProvider/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/proguard-project.txt
rename to content/ShareActionProvider/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml b/content/ShareActionProvider/Application/src/main/AndroidManifest.xml
similarity index 75%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
rename to content/ShareActionProvider/Application/src/main/AndroidManifest.xml
index 18dfc27..9528338 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
+++ b/content/ShareActionProvider/Application/src/main/AndroidManifest.xml
@@ -16,14 +16,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.actionbarcompat.shareactionprovider"
+ package="com.example.android.shareactionprovider"
android:versionCode="1"
android:versionName="1.0">
- <!--
- ActionBarCompat provides an Action Bar from API v7 onwards
- -->
- <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
+ <permission android:name="com.example.android.shareactionprovider.ASSET_ACCESS"
+ android:protectionLevel="signature" />
<application
android:icon="@drawable/ic_launcher"
@@ -41,12 +39,14 @@
</activity>
<!-- ContentProvider which serves files from this application's asset folder -->
+ <!-- Allow the access to only the apps having the same signature for security -->
<provider
android:name=".content.AssetProvider"
- android:authorities="com.example.android.actionbarcompat.shareactionprovider"
+ android:authorities="com.example.android.shareactionprovider"
android:grantUriPermissions="true"
- android:exported="true" />
+ android:exported="true"
+ android:permission="com.example.android.shareactionprovider.ASSET_ACCESS" />
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg b/content/ShareActionProvider/Application/src/main/assets/photo_1.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
rename to content/ShareActionProvider/Application/src/main/assets/photo_1.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg b/content/ShareActionProvider/Application/src/main/assets/photo_2.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
rename to content/ShareActionProvider/Application/src/main/assets/photo_2.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg b/content/ShareActionProvider/Application/src/main/assets/photo_3.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
rename to content/ShareActionProvider/Application/src/main/assets/photo_3.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/MainActivity.java
similarity index 93%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
rename to content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/MainActivity.java
index 545764c..3ac28ea 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
+++ b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/MainActivity.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider;
+package com.example.android.shareactionprovider;
+
+import com.example.android.shareactionprovider.content.ContentItem;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.ShareActionProvider;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -31,8 +33,6 @@
import android.widget.ImageView;
import android.widget.TextView;
-import com.example.android.actionbarcompat.shareactionprovider.content.ContentItem;
-
import java.util.ArrayList;
/**
@@ -43,10 +43,8 @@
* text. When a new item is selected in the ViewPager, the ShareActionProvider is updated with
* a share intent specific to that content.
* <p>
- * 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 {
+public class MainActivity extends AppCompatActivity {
// The items to be displayed in the ViewPager
private final ArrayList<ContentItem> mItems = getSampleContent();
@@ -65,7 +63,7 @@
ViewPager vp = (ViewPager) findViewById(R.id.viewpager);
// Set an OnPageChangeListener so we are notified when a new item is selected
- vp.setOnPageChangeListener(mOnPageChangeListener);
+ vp.addOnPageChangeListener(mOnPageChangeListener);
// Finally set the adapter so the ViewPager can display items
vp.setAdapter(mPagerAdapter);
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/AssetProvider.java
similarity index 72%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
rename to content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/AssetProvider.java
index b60f7d7..21e3ab2 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
+++ b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/AssetProvider.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider.content;
+package com.example.android.shareactionprovider.content;
import android.content.ContentProvider;
import android.content.ContentValues;
+import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager;
import android.database.Cursor;
import android.net.Uri;
+import android.support.annotation.NonNull;
import android.text.TextUtils;
import java.io.FileNotFoundException;
@@ -41,38 +43,41 @@
}
@Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
+ public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
// Do not support delete requests.
return 0;
}
@Override
- public String getType(Uri uri) {
+ public String getType(@NonNull Uri uri) {
// Do not support returning the data type
return null;
}
@Override
- public Uri insert(Uri uri, ContentValues values) {
+ public Uri insert(@NonNull Uri uri, ContentValues values) {
// Do not support insert requests.
return null;
}
@Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ public Cursor query(@NonNull Uri uri, String[] projection, String selection,
+ String[] selectionArgs,
String sortOrder) {
// Do not support query requests.
return null;
}
@Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ public int update(@NonNull Uri uri, ContentValues values, String selection,
+ String[] selectionArgs) {
// Do not support update requests.
return 0;
}
@Override
- public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
+ public AssetFileDescriptor openAssetFile(@NonNull Uri uri, @NonNull String mode)
+ throws FileNotFoundException {
// The asset file name should be the last path segment
final String assetName = uri.getLastPathSegment();
@@ -83,7 +88,11 @@
try {
// Try and return a file descriptor for the given asset name
- AssetManager am = getContext().getAssets();
+ Context context = getContext();
+ if (context == null) {
+ return super.openAssetFile(uri, mode);
+ }
+ AssetManager am = context.getAssets();
return am.openFd(assetName);
} catch (IOException e) {
e.printStackTrace();
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/ContentItem.java
similarity index 91%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
rename to content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/ContentItem.java
index 756a9e6..5806088 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
+++ b/content/ShareActionProvider/Application/src/main/java/com/example/android/shareactionprovider/content/ContentItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider.content;
+package com.example.android.shareactionprovider.content;
import android.content.Context;
import android.content.Intent;
@@ -33,7 +33,7 @@
public final int contentType;
public final int contentResourceId;
- public final String contentAssetFilePath;
+ private final String mContentAssetFilePath;
/**
* Creates a ContentItem with the specified type, referencing a resource id.
@@ -44,7 +44,7 @@
public ContentItem(int type, int resourceId) {
contentType = type;
contentResourceId = resourceId;
- contentAssetFilePath = null;
+ mContentAssetFilePath = null;
}
/**
@@ -55,7 +55,7 @@
*/
public ContentItem(int type, String assetFilePath) {
contentType = type;
- contentAssetFilePath = assetFilePath;
+ mContentAssetFilePath = assetFilePath;
contentResourceId = 0;
}
@@ -63,9 +63,9 @@
* @return Uri to the content
*/
public Uri getContentUri() {
- if (!TextUtils.isEmpty(contentAssetFilePath)) {
+ if (!TextUtils.isEmpty(mContentAssetFilePath)) {
// If this content has an asset, then return a AssetProvider Uri
- return Uri.parse("content://" + AssetProvider.CONTENT_URI + "/" + contentAssetFilePath);
+ return Uri.parse("content://" + AssetProvider.CONTENT_URI + "/" + mContentAssetFilePath);
} else {
return null;
}
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png b/content/ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to content/ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png b/content/ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to content/ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/content/ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to content/ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/content/ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to content/ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml b/content/ShareActionProvider/Application/src/main/res/layout/item_image.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
rename to content/ShareActionProvider/Application/src/main/res/layout/item_image.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml b/content/ShareActionProvider/Application/src/main/res/layout/item_text.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
rename to content/ShareActionProvider/Application/src/main/res/layout/item_text.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml b/content/ShareActionProvider/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
rename to content/ShareActionProvider/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml b/content/ShareActionProvider/Application/src/main/res/menu/main_menu.xml
similarity index 82%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
rename to content/ShareActionProvider/Application/src/main/res/menu/main_menu.xml
index acd2134..4b85267 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
+++ b/content/ShareActionProvider/Application/src/main/res/menu/main_menu.xml
@@ -16,8 +16,7 @@
-->
<!--
- 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
+ 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).
@@ -26,7 +25,7 @@
xmlns:support="http://schemas.android.com/apk/res-auto">
<!--
- To use ShareActionProvider provided by ActionBarCompat, we reference the class by set the
+ To use ShareActionProvider, we reference the class by set the
support:actionProviderClass attribute with the full class name of ShareActionProvider.
-->
<item
@@ -35,4 +34,4 @@
support:actionProviderClass="android.support.v7.widget.ShareActionProvider"
support:showAsAction="always" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml b/content/ShareActionProvider/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
rename to content/ShareActionProvider/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml b/content/ShareActionProvider/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
rename to content/ShareActionProvider/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/content/ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
similarity index 96%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
rename to content/ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
index 2d56881..780aab2 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
+++ b/content/ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
@@ -15,7 +15,7 @@
*/
package com.example.android.actionbarcompat.shareactionprovider.tests;
-import com.example.android.actionbarcompat.shareactionprovider.*;
+import com.example.android.shareactionprovider.MainActivity;
import android.test.ActivityInstrumentationTestCase2;
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/CONTRIB.md b/content/ShareActionProvider/CONTRIB.md
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/CONTRIB.md
rename to content/ShareActionProvider/CONTRIB.md
diff --git a/content/ShareActionProvider/build.gradle b/content/ShareActionProvider/build.gradle
new file mode 100644
index 0000000..c7a137e
--- /dev/null
+++ b/content/ShareActionProvider/build.gradle
@@ -0,0 +1,10 @@
+// BEGIN_EXCLUDE
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
+samplegen {
+ pathToBuild "../../../../build"
+ pathToSamplesCommon "../../common"
+}
+apply from: "../../../../build/build.gradle"
+// END_EXCLUDE
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/buildSrc/build.gradle b/content/ShareActionProvider/buildSrc/build.gradle
similarity index 64%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/buildSrc/build.gradle
rename to content/ShareActionProvider/buildSrc/build.gradle
index e344a8c..29282af 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/buildSrc/build.gradle
+++ b/content/ShareActionProvider/buildSrc/build.gradle
@@ -11,7 +11,7 @@
sourceSets {
main {
groovy {
- srcDir new File(rootDir, "../../../../../../build/buildSrc/src/main/groovy")
+ srcDir new File(rootDir, "../../../../../build/buildSrc/src/main/groovy")
}
}
}
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.jar b/content/ShareActionProvider/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.jar
rename to content/ShareActionProvider/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties b/content/ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
rename to content/ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradlew b/content/ShareActionProvider/gradlew
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradlew
rename to content/ShareActionProvider/gradlew
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradlew.bat b/content/ShareActionProvider/gradlew.bat
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/gradlew.bat
rename to content/ShareActionProvider/gradlew.bat
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/packaging.yaml b/content/ShareActionProvider/packaging.yaml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/packaging.yaml
rename to content/ShareActionProvider/packaging.yaml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/1-image.png b/content/ShareActionProvider/screenshots/1-image.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/1-image.png
rename to content/ShareActionProvider/screenshots/1-image.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/2-text.png b/content/ShareActionProvider/screenshots/2-text.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/2-text.png
rename to content/ShareActionProvider/screenshots/2-text.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/icon-web.png b/content/ShareActionProvider/screenshots/icon-web.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/screenshots/icon-web.png
rename to content/ShareActionProvider/screenshots/icon-web.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle b/content/ShareActionProvider/settings.gradle
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle
rename to content/ShareActionProvider/settings.gradle
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml b/content/ShareActionProvider/template-params.xml
similarity index 73%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
rename to content/ShareActionProvider/template-params.xml
index 76d316a..adb8c2a 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
+++ b/content/ShareActionProvider/template-params.xml
@@ -15,17 +15,16 @@
limitations under the License.
-->
<sample>
- <name>ActionBarCompat-ShareActionProvider</name>
+ <name>ShareActionProvider</name>
<group>UI</group>
- <package>com.example.android.actionbarcompat.shareactionprovider</package>
+ <package>com.example.android.shareactionprovider</package>
- <minSdk>7</minSdk>
+ <minSdk>9</minSdk>
<strings>
<intro>
<![CDATA[
- This sample shows you how a provide a context-sensitive ShareActionProvider with
- ActionBarCompat, backwards compatible to API v7.
+ This sample shows you how a provide a context-sensitive ShareActionProvider.
]]>
</intro>
</strings>
@@ -34,7 +33,7 @@
<metadata>
<status>PUBLISHED</status>
- <categories>UI, ActionBar</categories>
+ <categories>UI</categories>
<technologies>Android</technologies>
<languages>Java</languages>
<solutions>Mobile</solutions>
@@ -46,12 +45,10 @@
</screenshots>
<api_refs>
<android>android.support.v7.widget.ShareActionProvider</android>
- <android>android.support.v7.app.ActionBarActivity</android>
</api_refs>
<description>
<![CDATA[
-This sample shows you how a provide a context-sensitive ShareActionProvider with
-ActionBarCompat, backwards compatible to API v7.
+This sample shows you how a provide a context-sensitive ShareActionProvider.
]]>
</description>
<intro>
@@ -60,12 +57,8 @@
text. When a new item is selected in the ViewPager, the [`ShareActionProvider`][2] is updated with
a share intent specific to that content.
-This Activity extends from [`ActionBarActivity`][3], which provides all of the function
-necessary to display a compatible Action Bar on devices running Android v2.1+.
-
[1]: http://developer.android.com/reference/android/support/v4/view/ViewPager.html
[2]: http://developer.android.com/reference/android/widget/ShareActionProvider.html
-[3]: https://developer.android.com/reference/android/support/v7/app/ActionBarActivity.html
]]>
</intro>
</metadata>
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/LICENSE b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/LICENSE
deleted file mode 100644
index 4f22946..0000000
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/LICENSE
+++ /dev/null
@@ -1,647 +0,0 @@
-Apache License
---------------
-
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- 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.
-
-All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav
-and *.ogg) are licensed under the CC-BY-NC license. All other files are
-licensed under the Apache 2 license.
-
-CC-BY-NC License
-----------------
-
-Attribution-NonCommercial-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
- Considerations for licensors: Our public licenses are
- intended for use by those authorized to give the public
- permission to use material in ways otherwise restricted by
- copyright and certain other rights. Our licenses are
- irrevocable. Licensors should read and understand the terms
- and conditions of the license they choose before applying it.
- Licensors should also secure all rights necessary before
- applying our licenses so that the public can reuse the
- material as expected. Licensors should clearly mark any
- material not subject to the license. This includes other CC-
- licensed material, or material used under an exception or
- limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
-
- Considerations for the public: By using one of our public
- licenses, a licensor grants the public permission to use the
- licensed material under specified terms and conditions. If
- the licensor's permission is not necessary for any reason--for
- example, because of any applicable exception or limitation to
- copyright--then that use is not regulated by the license. Our
- licenses grant only permissions under copyright and certain
- other rights that a licensor has authority to grant. Use of
- the licensed material may still be restricted for other
- reasons, including because others have copyright or other
- rights in the material. A licensor may make special requests,
- such as asking that all changes be marked or described.
- Although not required by our licenses, you are encouraged to
- respect those requests where reasonable. More_considerations
- for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-NonCommercial-ShareAlike 4.0 International Public License
-("Public License"). To the extent this Public License may be
-interpreted as a contract, You are granted the Licensed Rights in
-consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the
-Licensor receives from making the Licensed Material available under
-these terms and conditions.
-
-
-Section 1 -- Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar
- Rights that is derived from or based upon the Licensed Material
- and in which the Licensed Material is translated, altered,
- arranged, transformed, or otherwise modified in a manner requiring
- permission under the Copyright and Similar Rights held by the
- Licensor. For purposes of this Public License, where the Licensed
- Material is a musical work, performance, or sound recording,
- Adapted Material is always produced where the Licensed Material is
- synched in timed relation with a moving image.
-
- b. Adapter's License means the license You apply to Your Copyright
- and Similar Rights in Your contributions to Adapted Material in
- accordance with the terms and conditions of this Public License.
-
- c. BY-NC-SA Compatible License means a license listed at
- creativecommons.org/compatiblelicenses, approved by Creative
- Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights
- closely related to copyright including, without limitation,
- performance, broadcast, sound recording, and Sui Generis Database
- Rights, without regard to how the rights are labeled or
- categorized. For purposes of this Public License, the rights
- specified in Section 2(b)(1)-(2) are not Copyright and Similar
- Rights.
-
- e. Effective Technological Measures means those measures that, in the
- absence of proper authority, may not be circumvented under laws
- fulfilling obligations under Article 11 of the WIPO Copyright
- Treaty adopted on December 20, 1996, and/or similar international
- agreements.
-
- f. Exceptions and Limitations means fair use, fair dealing, and/or
- any other exception or limitation to Copyright and Similar Rights
- that applies to Your use of the Licensed Material.
-
- g. License Elements means the license attributes listed in the name
- of a Creative Commons Public License. The License Elements of this
- Public License are Attribution, NonCommercial, and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database,
- or other material to which the Licensor applied this Public
- License.
-
- i. Licensed Rights means the rights granted to You subject to the
- terms and conditions of this Public License, which are limited to
- all Copyright and Similar Rights that apply to Your use of the
- Licensed Material and that the Licensor has authority to license.
-
- j. Licensor means the individual(s) or entity(ies) granting rights
- under this Public License.
-
- k. NonCommercial means not primarily intended for or directed towards
- commercial advantage or monetary compensation. For purposes of
- this Public License, the exchange of the Licensed Material for
- other material subject to Copyright and Similar Rights by digital
- file-sharing or similar means is NonCommercial provided there is
- no payment of monetary compensation in connection with the
- exchange.
-
- l. Share means to provide material to the public by any means or
- process that requires permission under the Licensed Rights, such
- as reproduction, public display, public performance, distribution,
- dissemination, communication, or importation, and to make material
- available to the public including in ways that members of the
- public may access the material from a place and at a time
- individually chosen by them.
-
- m. Sui Generis Database Rights means rights other than copyright
- resulting from Directive 96/9/EC of the European Parliament and of
- the Council of 11 March 1996 on the legal protection of databases,
- as amended and/or succeeded, as well as other essentially
- equivalent rights anywhere in the world.
-
- n. You means the individual or entity exercising the Licensed Rights
- under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
- a. License grant.
-
- 1. Subject to the terms and conditions of this Public License,
- the Licensor hereby grants You a worldwide, royalty-free,
- non-sublicensable, non-exclusive, irrevocable license to
- exercise the Licensed Rights in the Licensed Material to:
-
- a. reproduce and Share the Licensed Material, in whole or
- in part, for NonCommercial purposes only; and
-
- b. produce, reproduce, and Share Adapted Material for
- NonCommercial purposes only.
-
- 2. Exceptions and Limitations. For the avoidance of doubt, where
- Exceptions and Limitations apply to Your use, this Public
- License does not apply, and You do not need to comply with
- its terms and conditions.
-
- 3. Term. The term of this Public License is specified in Section
- 6(a).
-
- 4. Media and formats; technical modifications allowed. The
- Licensor authorizes You to exercise the Licensed Rights in
- all media and formats whether now known or hereafter created,
- and to make technical modifications necessary to do so. The
- Licensor waives and/or agrees not to assert any right or
- authority to forbid You from making technical modifications
- necessary to exercise the Licensed Rights, including
- technical modifications necessary to circumvent Effective
- Technological Measures. For purposes of this Public License,
- simply making modifications authorized by this Section 2(a)
- (4) never produces Adapted Material.
-
- 5. Downstream recipients.
-
- a. Offer from the Licensor -- Licensed Material. Every
- recipient of the Licensed Material automatically
- receives an offer from the Licensor to exercise the
- Licensed Rights under the terms and conditions of this
- Public License.
-
- b. Additional offer from the Licensor -- Adapted Material.
- Every recipient of Adapted Material from You
- automatically receives an offer from the Licensor to
- exercise the Licensed Rights in the Adapted Material
- under the conditions of the Adapter's License You apply.
-
- c. No downstream restrictions. You may not offer or impose
- any additional or different terms or conditions on, or
- apply any Effective Technological Measures to, the
- Licensed Material if doing so restricts exercise of the
- Licensed Rights by any recipient of the Licensed
- Material.
-
- 6. No endorsement. Nothing in this Public License constitutes or
- may be construed as permission to assert or imply that You
- are, or that Your use of the Licensed Material is, connected
- with, or sponsored, endorsed, or granted official status by,
- the Licensor or others designated to receive attribution as
- provided in Section 3(a)(1)(A)(i).
-
- b. Other rights.
-
- 1. Moral rights, such as the right of integrity, are not
- licensed under this Public License, nor are publicity,
- privacy, and/or other similar personality rights; however, to
- the extent possible, the Licensor waives and/or agrees not to
- assert any such rights held by the Licensor to the limited
- extent necessary to allow You to exercise the Licensed
- Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this
- Public License.
-
- 3. To the extent possible, the Licensor waives any right to
- collect royalties from You for the exercise of the Licensed
- Rights, whether directly or through a collecting society
- under any voluntary or waivable statutory or compulsory
- licensing scheme. In all other cases the Licensor expressly
- reserves any right to collect such royalties, including when
- the Licensed Material is used other than for NonCommercial
- purposes.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
- a. Attribution.
-
- 1. If You Share the Licensed Material (including in modified
- form), You must:
-
- a. retain the following if it is supplied by the Licensor
- with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed
- Material and any others designated to receive
- attribution, in any reasonable manner requested by
- the Licensor (including by pseudonym if
- designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of
- warranties;
-
- v. a URI or hyperlink to the Licensed Material to the
- extent reasonably practicable;
-
- b. indicate if You modified the Licensed Material and
- retain an indication of any previous modifications; and
-
- c. indicate the Licensed Material is licensed under this
- Public License, and include the text of, or the URI or
- hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any
- reasonable manner based on the medium, means, and context in
- which You Share the Licensed Material. For example, it may be
- reasonable to satisfy the conditions by providing a URI or
- hyperlink to a resource that includes the required
- information.
- 3. If requested by the Licensor, You must remove any of the
- information required by Section 3(a)(1)(A) to the extent
- reasonably practicable.
-
- b. ShareAlike.
-
- In addition to the conditions in Section 3(a), if You Share
- Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter's License You apply must be a Creative Commons
- license with the same License Elements, this version or
- later, or a BY-NC-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the
- Adapter's License You apply. You may satisfy this condition
- in any reasonable manner based on the medium, means, and
- context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms
- or conditions on, or apply any Effective Technological
- Measures to, Adapted Material that restrict exercise of the
- rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right
- to extract, reuse, reproduce, and Share all or a substantial
- portion of the contents of the database for NonCommercial purposes
- only;
-
- b. if You include all or a substantial portion of the database
- contents in a database in which You have Sui Generis Database
- Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material,
- including for purposes of Section 3(b); and
-
- c. You must comply with the conditions in Section 3(a) if You Share
- all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
- a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
- EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
- AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
- ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
- IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
- WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
- ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
- KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
- ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
- b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
- TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
- NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
- INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
- COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
- USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
- DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
- IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
- c. The disclaimer of warranties and limitation of liability provided
- above shall be interpreted in a manner that, to the extent
- possible, most closely approximates an absolute disclaimer and
- waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
- a. This Public License applies for the term of the Copyright and
- Similar Rights licensed here. However, if You fail to comply with
- this Public License, then Your rights under this Public License
- terminate automatically.
-
- b. Where Your right to use the Licensed Material has terminated under
- Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided
- it is cured within 30 days of Your discovery of the
- violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any
- right the Licensor may have to seek remedies for Your violations
- of this Public License.
-
- c. For the avoidance of doubt, the Licensor may also offer the
- Licensed Material under separate terms or conditions or stop
- distributing the Licensed Material at any time; however, doing so
- will not terminate this Public License.
-
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
- License.
-
-
-Section 7 -- Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different
- terms or conditions communicated by You unless expressly agreed.
-
- b. Any arrangements, understandings, or agreements regarding the
- Licensed Material not stated herein are separate from and
- independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and
- shall not be interpreted to, reduce, limit, restrict, or impose
- conditions on any use of the Licensed Material that could lawfully
- be made without permission under this Public License.
-
- b. To the extent possible, if any provision of this Public License is
- deemed unenforceable, it shall be automatically reformed to the
- minimum extent necessary to make it enforceable. If the provision
- cannot be reformed, it shall be severed from this Public License
- without affecting the enforceability of the remaining terms and
- conditions.
-
- c. No term or condition of this Public License will be waived and no
- failure to comply consented to unless expressly agreed to by the
- Licensor.
-
- d. Nothing in this Public License constitutes or may be interpreted
- as a limitation upon, or waiver of, any privileges and immunities
- that apply to the Licensor or You, including from the legal
- processes of any jurisdiction or authority.
-
-=======================================================================
-
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md
deleted file mode 100644
index 362ff31..0000000
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-
-Android ActionBarCompat-ShareActionProvider Sample
-===================================
-
-This sample shows you how a provide a context-sensitive ShareActionProvider with
-ActionBarCompat, backwards compatible to API v7.
-
-Introduction
-------------
-
-The sample contains a [`ViewPager`][1] which displays content of differing types: image and
-text. When a new item is selected in the ViewPager, the [`ShareActionProvider`][2] is updated with
-a share intent specific to that content.
-
-This Activity extends from [`ActionBarActivity`][3], which provides all of the function
-necessary to display a compatible Action Bar on devices running Android v2.1+.
-
-[1]: http://developer.android.com/reference/android/support/v4/view/ViewPager.html
-[2]: http://developer.android.com/reference/android/widget/ShareActionProvider.html
-[3]: https://developer.android.com/reference/android/support/v7/app/ActionBarActivity.html
-
-Pre-requisites
---------------
-
-- Android SDK 24
-- Android Build Tools v24.0.2
-- Android Support Repository
-
-Screenshots
--------------
-
-<img src="screenshots/1-image.png" height="400" alt="Screenshot"/> <img src="screenshots/2-text.png" height="400" alt="Screenshot"/>
-
-Getting Started
----------------
-
-This sample uses the Gradle build system. To build this project, use the
-"gradlew build" command or use "Import Project" in Android Studio.
-
-Support
--------
-
-- Google+ Community: https://plus.google.com/communities/105153134372062985968
-- Stack Overflow: http://stackoverflow.com/questions/tagged/android
-
-If you've found an error in this sample, please file an issue:
-https://github.com/googlesamples/android-ActionBarCompat-ShareActionProvider
-
-Patches are encouraged, and may be submitted by forking this project and
-submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
-
-License
--------
-
-Copyright 2016 The Android Open Source Project, Inc.
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements. See the NOTICE file distributed with this work for
-additional information regarding copyright ownership. The ASF licenses this
-file to you 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.
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/build.gradle b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/build.gradle
deleted file mode 100644
index cca9ac3..0000000
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-// BEGIN_EXCLUDE
-import com.example.android.samples.build.SampleGenPlugin
-apply plugin: SampleGenPlugin
-
-samplegen {
- pathToBuild "../../../../../build"
- pathToSamplesCommon "../../../common"
-}
-apply from: "../../../../../build/build.gradle"
-// END_EXCLUDE
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
index e2b83d3..7bb29c8 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 The Android Open Source Project
+ * Copyright 2016 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.
@@ -87,22 +87,17 @@
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_sample, container, false);
- // Retrieve the SwipeRefreshLayout and GridView instances
mSwipeRefreshLayout = (MultiSwipeRefreshLayout) view.findViewById(R.id.swiperefresh);
// BEGIN_INCLUDE (change_colors)
// Set the color scheme of the SwipeRefreshLayout by providing 4 color resource ids
- mSwipeRefreshLayout.setColorScheme(
+ mSwipeRefreshLayout.setColorSchemeResources(
R.color.swipe_color_1, R.color.swipe_color_2,
R.color.swipe_color_3, R.color.swipe_color_4);
// END_INCLUDE (change_colors)
- // Retrieve the GridView
mGridView = (GridView) view.findViewById(android.R.id.list);
-
- // Retrieve the empty view
mEmptyView = view.findViewById(android.R.id.empty);
-
return view;
}
// END_INCLUDE (inflate_view)
@@ -116,7 +111,7 @@
* Create an ArrayAdapter to contain the data for the GridView. Each item in the GridView
* uses the system-defined simple_list_item_1 layout that contains one TextView. Initially
*/
- mListAdapter = new ArrayAdapter<String>(
+ mListAdapter = new ArrayAdapter<>(
getActivity(),
android.R.layout.simple_list_item_1,
android.R.id.text1);
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/template-params.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/template-params.xml
index ad1ad5e..c466403 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/template-params.xml
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/template-params.xml
@@ -23,7 +23,7 @@
<package>com.example.android.swiperefreshmultipleviews</package>
<!-- change minSdk if needed-->
- <minSdk>14</minSdk>
+ <minSdk>9</minSdk>
<strings>
<intro>
<
