Merge "Fix compilation of DragAndDropAcrossApps" into pi-dev
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
index db7bcbc..debcbd1 100644
--- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
@@ -41,7 +41,7 @@
</strings>
<metadata>
- <status>PUBLISHED</status>
+ <status>DEPRECATED</status>
<categories>Content</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/media/MediaBrowserService/README.md b/media/MediaBrowserService/README.md
index 2deee4e..d81fe4a 100644
--- a/media/MediaBrowserService/README.md
+++ b/media/MediaBrowserService/README.md
@@ -1,3 +1,5 @@
+DEPRECATED : This is no longer supported, please consider using https://github.com/googlesamples/android-UniversalMusicPlayer instead.
+======================================================================================================================================
Android MediaBrowserService Sample
===================================
diff --git a/media/MediaBrowserService/packaging.yaml b/media/MediaBrowserService/packaging.yaml
index b1d7bbd..287999e 100644
--- a/media/MediaBrowserService/packaging.yaml
+++ b/media/MediaBrowserService/packaging.yaml
@@ -4,7 +4,7 @@
# End users may safely ignore this file. It has no relevance to other systems.
---
-status: PUBLISHED
+status: DEPRECATED
technologies: [Android]
categories: [None]
languages: [Java]
diff --git a/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties b/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties
index 86fc139..7169263 100644
--- a/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/notification/ActiveNotifications/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/notification/ActiveNotifications/template-params.xml b/notification/ActiveNotifications/template-params.xml
index d750bbc..0f15ed2 100644
--- a/notification/ActiveNotifications/template-params.xml
+++ b/notification/ActiveNotifications/template-params.xml
@@ -20,8 +20,8 @@
<package>com.example.android.activenotifications</package>
<minSdk>24</minSdk>
- <compileSdkVersion>24</compileSdkVersion>
- <targetSdkVersion>24</targetSdkVersion>
+ <compileSdkVersion>28</compileSdkVersion>
+ <targetSdkVersion>28</targetSdkVersion>
<strings>
<intro>
@@ -77,7 +77,7 @@
and define a notification group summary.
In Android M, you can query for the active notifications that your app sent
-sing the [notify][2] methods.
+using the [notify][2] methods.
This sample demonstrates simple use of these features by allowing a user
to add notifications and then query how many notifications
diff --git a/system/AppShortcuts/app/build.gradle b/system/AppShortcuts/app/build.gradle
index 68dc6a7..26ebd8e 100644
--- a/system/AppShortcuts/app/build.gradle
+++ b/system/AppShortcuts/app/build.gradle
@@ -1,16 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.0"
+ compileSdkVersion 28
defaultConfig {
applicationId "com.example.android.shortcutsample"
minSdkVersion 25
- targetSdkVersion 25
- jackOptions {
- enabled true
- }
+ targetSdkVersion 28
}
compileOptions {
diff --git a/system/AppShortcuts/app/src/main/AndroidManifest.xml b/system/AppShortcuts/app/src/main/AndroidManifest.xml
index 183bc84..da4c074 100644
--- a/system/AppShortcuts/app/src/main/AndroidManifest.xml
+++ b/system/AppShortcuts/app/src/main/AndroidManifest.xml
@@ -17,8 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.appshortcuts">
- <uses-sdk android:minSdkVersion="25" />
-
<uses-permission android:name="android.permission.INTERNET" />
<application
diff --git a/system/AppShortcuts/build.gradle b/system/AppShortcuts/build.gradle
index ef4eaec..244379a 100644
--- a/system/AppShortcuts/build.gradle
+++ b/system/AppShortcuts/build.gradle
@@ -1,15 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
+ google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.2.1'
}
}
allprojects {
repositories {
+ google()
jcenter()
}
}
diff --git a/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties b/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
index ce4e724..4dc91dd 100644
--- a/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
+++ b/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/ui/views/RecyclerView/kotlinApp/app/build.gradle b/ui/views/RecyclerView/kotlinApp/app/build.gradle
index fd409cf..5a2cdfc 100644
--- a/ui/views/RecyclerView/kotlinApp/app/build.gradle
+++ b/ui/views/RecyclerView/kotlinApp/app/build.gradle
@@ -5,11 +5,11 @@
apply plugin: 'kotlin-android-extensions'
android {
- compileSdkVersion 27
+ compileSdkVersion 28
defaultConfig {
applicationId "com.example.android.recyclerview"
minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,8 +27,8 @@
}
dependencies {
- implementation "com.android.support:appcompat-v7:27.0.2"
- implementation 'com.android.support:recyclerview-v7:27.0.2'
+ implementation "com.android.support:appcompat-v7:28.0.0"
+ implementation "com.android.support:recyclerview-v7:28.0.0"
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
diff --git a/ui/views/RecyclerView/kotlinApp/build.gradle b/ui/views/RecyclerView/kotlinApp/build.gradle
index c2ff357..ac76599 100644
--- a/ui/views/RecyclerView/kotlinApp/build.gradle
+++ b/ui/views/RecyclerView/kotlinApp/build.gradle
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.1.60'
+ ext.kotlin_version = '1.3.11'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/ui/views/RecyclerView/kotlinApp/gradle/wrapper/gradle-wrapper.properties b/ui/views/RecyclerView/kotlinApp/gradle/wrapper/gradle-wrapper.properties
index cab792c..96d282a 100644
--- a/ui/views/RecyclerView/kotlinApp/gradle/wrapper/gradle-wrapper.properties
+++ b/ui/views/RecyclerView/kotlinApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 08 08:41:54 PST 2017
+#Thu Jan 10 13:45:50 PST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/views/EmojiCompat/kotlinApp/app/build.gradle b/views/EmojiCompat/kotlinApp/app/build.gradle
index de2074b..b6ca675 100644
--- a/views/EmojiCompat/kotlinApp/app/build.gradle
+++ b/views/EmojiCompat/kotlinApp/app/build.gradle
@@ -16,7 +16,7 @@
buildscript {
ext {
- kotlin_version = '1.1.3-2'
+ kotlin_version = '1.3.11'
}
repositories {
jcenter()
@@ -29,20 +29,15 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-ext {
- supportLibVersion = '26.0.0'
-}
-
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.0'
+ compileSdkVersion 28
defaultConfig {
applicationId "com.example.android.emojicompat"
minSdkVersion 19
- targetSdkVersion 26
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -50,21 +45,19 @@
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
- configurations.all {
- resolutionStrategy.force "com.android.support:support-annotations:$supportLibVersion"
- }
}
dependencies {
// Support Libraries
- compile "com.android.support:appcompat-v7:$supportLibVersion"
- compile "com.android.support:support-emoji:$supportLibVersion"
- compile "com.android.support:support-emoji-appcompat:$supportLibVersion"
- compile "com.android.support:support-emoji-bundled:$supportLibVersion"
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.emoji:emoji:1.0.0'
+ implementation 'androidx.emoji:emoji-appcompat:1.0.0'
+ implementation 'androidx.emoji:emoji-bundled:1.0.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
// Test
- testCompile 'junit:junit:4.12'
- androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ androidTestImplementation "androidx.test.espresso:espresso-intents:3.1.1"
- compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+ testImplementation 'junit:junit:4.12'
}
diff --git a/views/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt b/views/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
index e4f93d5..c7fadea 100644
--- a/views/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/androidTest/java/com/example/android/emojicompat/MainActivityTest.kt
@@ -16,19 +16,15 @@
package com.example.android.emojicompat
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
class MainActivityTest {
@Rule @JvmField
diff --git a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
index dccf739..de1190f 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
@@ -17,8 +17,8 @@
package com.example.android.emojicompat
import android.content.Context
-import android.support.text.emoji.widget.EmojiTextViewHelper
-import android.support.v7.widget.AppCompatTextView
+import androidx.emoji.widget.EmojiTextViewHelper
+import androidx.appcompat.widget.AppCompatTextView
import android.text.InputFilter
import android.util.AttributeSet
diff --git a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
index f51a945..9fe29c5 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
@@ -17,10 +17,10 @@
package com.example.android.emojicompat
import android.app.Application
-import android.support.text.emoji.EmojiCompat
-import android.support.text.emoji.FontRequestEmojiCompatConfig
-import android.support.text.emoji.bundled.BundledEmojiCompatConfig
-import android.support.v4.provider.FontRequest
+import androidx.emoji.text.EmojiCompat
+import androidx.emoji.text.FontRequestEmojiCompatConfig
+import androidx.emoji.bundled.BundledEmojiCompatConfig
+import androidx.core.provider.FontRequest
import android.util.Log
diff --git a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/MainActivity.kt b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/MainActivity.kt
index b23c800..34520ba 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/MainActivity.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/MainActivity.kt
@@ -17,8 +17,8 @@
package com.example.android.emojicompat
import android.os.Bundle
-import android.support.text.emoji.EmojiCompat
-import android.support.v7.app.AppCompatActivity
+import androidx.emoji.text.EmojiCompat
+import androidx.appcompat.app.AppCompatActivity
import android.widget.TextView
import java.lang.ref.WeakReference
diff --git a/views/EmojiCompat/kotlinApp/app/src/main/res/layout/activity_main.xml b/views/EmojiCompat/kotlinApp/app/src/main/res/layout/activity_main.xml
index 5be684f..af84c62 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/res/layout/activity_main.xml
+++ b/views/EmojiCompat/kotlinApp/app/src/main/res/layout/activity_main.xml
@@ -30,21 +30,21 @@
android:orientation="vertical"
android:padding="@dimen/spacing_normal">
- <android.support.text.emoji.widget.EmojiAppCompatTextView
+ <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/emoji_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_small"
android:textSize="@dimen/text_size"/>
- <android.support.text.emoji.widget.EmojiAppCompatEditText
+ <androidx.emoji.widget.EmojiAppCompatEditText
android:id="@+id/emoji_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_small"
android:textSize="@dimen/text_size"/>
- <android.support.text.emoji.widget.EmojiAppCompatButton
+ <androidx.emoji.widget.EmojiAppCompatButton
android:id="@+id/emoji_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/views/EmojiCompat/kotlinApp/build.gradle b/views/EmojiCompat/kotlinApp/build.gradle
index a1ea5cd..7d9c35f 100644
--- a/views/EmojiCompat/kotlinApp/build.gradle
+++ b/views/EmojiCompat/kotlinApp/build.gradle
@@ -16,10 +16,11 @@
buildscript {
repositories {
+ google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.2.1'
}
}
diff --git a/views/EmojiCompat/kotlinApp/gradle.properties b/views/EmojiCompat/kotlinApp/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/views/EmojiCompat/kotlinApp/gradle.properties
+++ b/views/EmojiCompat/kotlinApp/gradle.properties
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
diff --git a/views/EmojiCompat/kotlinApp/gradle/wrapper/gradle-wrapper.properties b/views/EmojiCompat/kotlinApp/gradle/wrapper/gradle-wrapper.properties
index 947a175..0e9e6e0 100644
--- a/views/EmojiCompat/kotlinApp/gradle/wrapper/gradle-wrapper.properties
+++ b/views/EmojiCompat/kotlinApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 10 16:54:15 JST 2017
+#Thu Jan 10 14:19:34 PST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
index 9d06364..804e17d 100644
--- a/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
@@ -17,9 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.wearable.watchface" >
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="25" />
-
<!-- Permissions required by the wearable app -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
index 0c0e0ce..45dfe19 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
@@ -17,10 +17,6 @@
<manifest package="com.example.android.wearable.watchface"
xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk
- android:minSdkVersion="21"
- android:targetSdkVersion="25"/>
-
<uses-feature android:name="android.hardware.type.watch"/>
<!-- Required to act as a custom watch face. -->
diff --git a/wearable/wear/WatchFace/gradle.properties b/wearable/wear/WatchFace/gradle.properties
new file mode 100644
index 0000000..0bc4294
--- /dev/null
+++ b/wearable/wear/WatchFace/gradle.properties
@@ -0,0 +1,20 @@
+
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
diff --git a/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties
index 1b2e111..3aa3818 100644
--- a/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties
+++ b/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index fa169b5..981bd16 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -23,18 +23,18 @@
<package>com.example.android.wearable.watchface</package>
<minSdk>18</minSdk>
- <targetSdkVersion>27</targetSdkVersion>
+ <targetSdkVersion>28</targetSdkVersion>
<minSdkVersionWear>24</minSdkVersionWear>
- <compileSdkVersionWear>26</compileSdkVersionWear>
- <targetSdkVersionWear>26</targetSdkVersionWear>
+ <compileSdkVersionWear>28</compileSdkVersionWear>
+ <targetSdkVersionWear>28</targetSdkVersionWear>
<multiDexEnabled>true</multiDexEnabled>
- <dependency>com.google.android.support:wearable:2.3.0</dependency>
- <dependency_wearable>com.android.support:palette-v7:27.1.0</dependency_wearable>
- <dependency_wearable>com.android.support:wear:27.1.0</dependency_wearable>
+ <dependency>com.google.android.support:wearable:2.4.0</dependency>
+ <dependency_wearable>com.android.support:palette-v7:28.0.0</dependency_wearable>
+ <dependency_wearable>com.android.support:wear:28.0.0</dependency_wearable>
<wearable>