Merge "Fix lint warnings." into nyc-dev am: e680cef70f
am: 24165a8f7b
Change-Id: I2589067cc6eb7f7d5d08ac43060cbe7a4449a7e6
diff --git a/input/keyboard/CommitContentSampleApp/app/build.gradle b/input/keyboard/CommitContentSampleApp/app/build.gradle
index f46fe08..fcaa562 100644
--- a/input/keyboard/CommitContentSampleApp/app/build.gradle
+++ b/input/keyboard/CommitContentSampleApp/app/build.gradle
@@ -2,7 +2,7 @@
android {
compileSdkVersion 25
- buildToolsVersion "25 rc1"
+ buildToolsVersion "25.0.0"
defaultConfig {
applicationId "com.example.android.android.sampleapp"
minSdkVersion 16
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/AndroidManifest.xml b/input/keyboard/CommitContentSampleApp/app/src/main/AndroidManifest.xml
index 16c93b1..a733594 100644
--- a/input/keyboard/CommitContentSampleApp/app/src/main/AndroidManifest.xml
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
index cde69bc..e8a0aaf
--- a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f2618b0
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
index c133a0c..f4ac0f7
--- a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..6836318
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
index bfa42f0..74ee41a
--- a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..22be9b8
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
index 324e72c..c7eaeb6
--- a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d701598
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
index aee44e1..dd7ed2e
--- a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..b4b3ca7
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/screenshots/icon-web.png b/input/keyboard/CommitContentSampleApp/screenshots/icon-web.png
new file mode 100644
index 0000000..87e89be
--- /dev/null
+++ b/input/keyboard/CommitContentSampleApp/screenshots/icon-web.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleApp/template-params.xml b/input/keyboard/CommitContentSampleApp/template-params.xml
index 436d90a..df61da6 100644
--- a/input/keyboard/CommitContentSampleApp/template-params.xml
+++ b/input/keyboard/CommitContentSampleApp/template-params.xml
@@ -39,7 +39,7 @@
<languages>Java</languages>
<solutions>Mobile</solutions>
<level>INTERMEDIATE</level>
- <icon>screenshots/web-icon.png</icon>
+ <icon>screenshots/icon-web.png</icon>
<screenshots>
<img>screenshots/screenshot-1.png</img>
</screenshots>
diff --git a/input/keyboard/CommitContentSampleIME/app/build.gradle b/input/keyboard/CommitContentSampleIME/app/build.gradle
index 0b33296..7856e5d 100644
--- a/input/keyboard/CommitContentSampleIME/app/build.gradle
+++ b/input/keyboard/CommitContentSampleIME/app/build.gradle
@@ -2,7 +2,7 @@
android {
compileSdkVersion 25
- buildToolsVersion "25 rc1"
+ buildToolsVersion "25.0.0"
defaultConfig {
applicationId "com.example.android.supportv13.sampleime"
minSdkVersion 16
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/AndroidManifest.xml b/input/keyboard/CommitContentSampleIME/app/src/main/AndroidManifest.xml
index f9891ff..86a7b37 100644
--- a/input/keyboard/CommitContentSampleIME/app/src/main/AndroidManifest.xml
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
<application
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
index cde69bc..e8a0aaf
--- a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f2618b0
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
index c133a0c..f4ac0f7
--- a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..6836318
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
index bfa42f0..74ee41a
--- a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..22be9b8
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
index 324e72c..c7eaeb6
--- a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d701598
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
index aee44e1..dd7ed2e
--- a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..b4b3ca7
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/screenshots/icon-web.png b/input/keyboard/CommitContentSampleIME/screenshots/icon-web.png
new file mode 100644
index 0000000..87e89be
--- /dev/null
+++ b/input/keyboard/CommitContentSampleIME/screenshots/icon-web.png
Binary files differ
diff --git a/input/keyboard/CommitContentSampleIME/template-params.xml b/input/keyboard/CommitContentSampleIME/template-params.xml
index 800a864..8530373 100644
--- a/input/keyboard/CommitContentSampleIME/template-params.xml
+++ b/input/keyboard/CommitContentSampleIME/template-params.xml
@@ -39,7 +39,7 @@
<languages>Java</languages>
<solutions>Mobile</solutions>
<level>INTERMEDIATE</level>
- <icon>screenshots/web-icon.png</icon>
+ <icon>screenshots/icon-web.png</icon>
<screenshots>
<img>screenshots/screenshot-1.png</img>
</screenshots>
@@ -73,6 +73,11 @@
With this API, you can build messaging apps that accept rich content from any keyboard, as well as
keyboards that can send rich content to any app.
+**Note:** This sample does not have a default Activity. After installing it, you will need to enable
+this app as a keyboard by navigating to *Settings > Languages & Input > Virtual Keyboard > Manage
+Keyboards*. This keyboard can then be accessed by pressing the virtual keyboard icon in the
+lower-right hand corner of the display while in a text field.
+
[1]: https://android-dot-devsite.googleplex.com/preview/image-keyboard.html
]]>
</intro>
diff --git a/system/AppShortcuts/app/build.gradle b/system/AppShortcuts/app/build.gradle
index e7b94e7..68dc6a7 100644
--- a/system/AppShortcuts/app/build.gradle
+++ b/system/AppShortcuts/app/build.gradle
@@ -2,7 +2,7 @@
android {
compileSdkVersion 25
- buildToolsVersion "25 rc1"
+ buildToolsVersion "25.0.0"
defaultConfig {
applicationId "com.example.android.shortcutsample"
diff --git a/system/AppShortcuts/app/src/main/AndroidManifest.xml b/system/AppShortcuts/app/src/main/AndroidManifest.xml
index 9dfc7a3..183bc84 100644
--- a/system/AppShortcuts/app/src/main/AndroidManifest.xml
+++ b/system/AppShortcuts/app/src/main/AndroidManifest.xml
@@ -23,7 +23,8 @@
<application
android:label="@string/app_name"
- android:icon="@drawable/app"
+ android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_round"
android:resizeableActivity="true">
<activity android:name="com.example.android.appshortcuts.Main">
diff --git a/system/AppShortcuts/app/src/main/res/drawable-nodpi/app.png b/system/AppShortcuts/app/src/main/res/drawable-nodpi/app.png
deleted file mode 100644
index 39ca2f9..0000000
--- a/system/AppShortcuts/app/src/main/res/drawable-nodpi/app.png
+++ /dev/null
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher.png b/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cb86b97
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..7502f5d
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher.png b/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..bfeec7a
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..13ca6d7
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..358442e
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..ff93f4d
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..c99a1a0
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8b642db
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..3bcda81
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..a49362e
--- /dev/null
+++ b/system/AppShortcuts/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/system/AppShortcuts/screenshots/icon-web.png b/system/AppShortcuts/screenshots/icon-web.png
new file mode 100644
index 0000000..14204f7
--- /dev/null
+++ b/system/AppShortcuts/screenshots/icon-web.png
Binary files differ
diff --git a/system/AppShortcuts/template-params.xml b/system/AppShortcuts/template-params.xml
index ba19eba..5ef96b6 100644
--- a/system/AppShortcuts/template-params.xml
+++ b/system/AppShortcuts/template-params.xml
@@ -41,7 +41,7 @@
<languages>Java</languages>
<solutions>Mobile</solutions>
<level>INTERMEDIATE</level>
- <icon>screenshots/web-icon.png</icon>
+ <icon>screenshots/icon-web.png</icon>
<screenshots>
<img>screenshots/screenshot-1.png</img>
</screenshots>
