aboutsummaryrefslogtreecommitdiff
path: root/ui/window
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2016-09-28 22:15:23 -0700
committerTrevor Johns <trevorjohns@google.com>2016-09-28 22:15:23 -0700
commit0d2f2c66864ce9acf7e417a3218d43fc0955f36c (patch)
tree1190e7422a3892749b9a26047efb418849486bfe /ui/window
parentd72f3df26721c64aa403e3b6d400cf8b99260dd1 (diff)
downloadandroid-0d2f2c66864ce9acf7e417a3218d43fc0955f36c.tar.gz
Syncing template-generated build artifacts
Change-Id: I2f782966a41e36c47025e33f80c6f6df16d7299a
Diffstat (limited to 'ui/window')
-rw-r--r--ui/window/AdvancedImmersiveMode/Application/build.gradle12
-rw-r--r--ui/window/AdvancedImmersiveMode/README.md2
-rw-r--r--ui/window/BasicImmersiveMode/README.md2
-rw-r--r--ui/window/DragAndDropAcrossApps/README.md20
-rw-r--r--ui/window/ImmersiveMode/README.md2
-rw-r--r--ui/window/MultiWindowPlayground/README.md2
6 files changed, 21 insertions, 19 deletions
diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle
index ebbee866..28e75d67 100644
--- a/ui/window/AdvancedImmersiveMode/Application/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.1.3'
}
}
@@ -16,10 +16,10 @@ repositories {
}
dependencies {
- compile "com.android.support:support-v4:24.1.1"
- compile "com.android.support:support-v13:24.1.1"
- compile "com.android.support:cardview-v7:24.1.1"
- compile "com.android.support:appcompat-v7:24.1.1"
+ compile "com.android.support:support-v4:24.2.1"
+ compile "com.android.support:support-v13:24.2.1"
+ compile "com.android.support:cardview-v7:24.2.1"
+ compile "com.android.support:appcompat-v7:24.2.1"
}
// The sample build uses multiple directories to
@@ -32,7 +32,7 @@ List<String> dirs = [
android {
compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ buildToolsVersion "24.0.2"
defaultConfig {
minSdkVersion 19
diff --git a/ui/window/AdvancedImmersiveMode/README.md b/ui/window/AdvancedImmersiveMode/README.md
index 1e1b7936..895d62a4 100644
--- a/ui/window/AdvancedImmersiveMode/README.md
+++ b/ui/window/AdvancedImmersiveMode/README.md
@@ -27,7 +27,7 @@ Pre-requisites
--------------
- Android SDK 24
-- Android Build Tools v24.0.1
+- Android Build Tools v24.0.2
- Android Support Repository
Screenshots
diff --git a/ui/window/BasicImmersiveMode/README.md b/ui/window/BasicImmersiveMode/README.md
index 593e72ef..782ecc79 100644
--- a/ui/window/BasicImmersiveMode/README.md
+++ b/ui/window/BasicImmersiveMode/README.md
@@ -20,7 +20,7 @@ Pre-requisites
--------------
- Android SDK 24
-- Android Build Tools v24.0.1
+- Android Build Tools v24.0.2
- Android Support Repository
Screenshots
diff --git a/ui/window/DragAndDropAcrossApps/README.md b/ui/window/DragAndDropAcrossApps/README.md
index bf5e418e..4c49eeb3 100644
--- a/ui/window/DragAndDropAcrossApps/README.md
+++ b/ui/window/DragAndDropAcrossApps/README.md
@@ -2,11 +2,13 @@
Android DragAndDropAcrossApps-new Sample
===================================
-This sample demonstrates how data can be moved between views within an
-app or between different apps via drag and drop.
-This sample contains two separate Android applications, DragSource and
-DropTarget that show how data can be dragged and dropped between
-two separate apps.
+This sample contains two separate Android applications: DragSource and
+DropTarget. DragSource contains images and text that can be dropped into the DropTarget
+app. Images are shared between the two apps through a URI for which the receiving app
+must request permission first, before it can be used.
+
+It also demonstrates the use of the DragStartHelper from the v13 support library to easily
+handle drag and drop events.
Introduction
------------
@@ -48,14 +50,14 @@ until the activity is alive, or until the `release()` method is called on the
Pre-requisites
--------------
-- Android SDK vandroid-N
-- Android Build Tools v23.0.0
+- Android SDK 24
+- Android Build Tools v24.0.2
- Android Support Repository
Screenshots
-------------
-<img src="screenshots/app.png" height="400" alt="Screenshot"/>
+<img src="screenshots/phone.png" height="400" alt="Screenshot"/> <img src="screenshots/tablet.png" height="400" alt="Screenshot"/>
Getting Started
---------------
@@ -78,7 +80,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
License
-------
-Copyright 2014 The Android Open Source Project, Inc.
+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
diff --git a/ui/window/ImmersiveMode/README.md b/ui/window/ImmersiveMode/README.md
index f9c0bd9a..a4572436 100644
--- a/ui/window/ImmersiveMode/README.md
+++ b/ui/window/ImmersiveMode/README.md
@@ -10,7 +10,7 @@ Pre-requisites
--------------
- Android SDK 24
-- Android Build Tools v24.0.1
+- Android Build Tools v24.0.2
- Android Support Repository
Getting Started
diff --git a/ui/window/MultiWindowPlayground/README.md b/ui/window/MultiWindowPlayground/README.md
index 1dd616fe..dbe200ab 100644
--- a/ui/window/MultiWindowPlayground/README.md
+++ b/ui/window/MultiWindowPlayground/README.md
@@ -49,7 +49,7 @@ Pre-requisites
--------------
- Android SDK 24
-- Android Build Tools v24.0.1
+- Android Build Tools v24.0.2
- Android Support Repository
Screenshots