aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2017-03-22 11:30:08 -0700
committerTrevor Johns <trevorjohns@google.com>2017-03-22 11:31:06 -0700
commit033b104d215ed94eb56ab75a21c6128b60023e4c (patch)
tree06f415c12d7b1cc3bc8cd90325699160ef2a065b
parent4452a075b3bc0614ccf9fcdf381b2b4efd2ea6b4 (diff)
downloadandroid-033b104d215ed94eb56ab75a21c6128b60023e4c.tar.gz
Cleanup template-params.xml files for all projects
- Remove references to N Preview - Change statuses from DRAFT to PUBLISHED Test: manual Change-Id: I4cd302fb133f5f3e3f4f690397e0375e273ac1a1
-rw-r--r--connectivity/bluetooth/BluetoothAdvertisements/template-params.xml2
-rw-r--r--content/documentsUi/DirectorySelection/template-params.xml2
-rw-r--r--content/documentsUi/ScopedDirectoryAccess/template-params.xml4
-rw-r--r--notification/ActiveNotifications/template-params.xml6
-rw-r--r--notification/MessagingService/template-params.xml4
-rw-r--r--security/DirectBoot/template-params.xml2
-rw-r--r--security/FingerprintDialog/template-params.xml2
-rw-r--r--system/AppUsageStatistics/template-params.xml2
-rw-r--r--system/RuntimePermissions/template-params.xml2
-rw-r--r--system/RuntimePermissionsBasic/template-params.xml2
-rw-r--r--ui/window/DragAndDropAcrossApps/template-params.xml28
-rw-r--r--ui/window/MultiWindowPlayground/template-params.xml4
12 files changed, 30 insertions, 30 deletions
diff --git a/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml b/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
index 4bd4f2a0..65024884 100644
--- a/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
+++ b/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
@@ -50,7 +50,7 @@ with a single device acting as both scanner and advertiser.
<metadata>
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<categories>Connectivity</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/content/documentsUi/DirectorySelection/template-params.xml b/content/documentsUi/DirectorySelection/template-params.xml
index c0172f62..2426f9a6 100644
--- a/content/documentsUi/DirectorySelection/template-params.xml
+++ b/content/documentsUi/DirectorySelection/template-params.xml
@@ -36,7 +36,7 @@
<template src="base" />
<metadata>
- <status>DRAFTED</status>
+ <status>PUBLISHED</status>
<categories>Content</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
index 81161162..4879b973 100644
--- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
@@ -17,7 +17,7 @@
<sample>
<name>ScopedDirectoryAccess</name>
- <group>Android N Preview</group> <!-- This field will be deprecated in the future
+ <group>Content</group> <!-- This field will be deprecated in the future
and replaced with the "categories" tags below. -->
<package>com.example.android.scopeddirectoryaccess</package>
@@ -43,7 +43,7 @@ READ_EXTERNAL_STORAGE or WRITE_EXTERNAL_STORAGE in your manifest.
<metadata>
<status>PUBLISHED</status>
- <categories>Android N Preview</categories>
+ <categories>Content</categories>
<technologies>Android</technologies>
<languages>Java</languages>
<solutions>Mobile</solutions>
diff --git a/notification/ActiveNotifications/template-params.xml b/notification/ActiveNotifications/template-params.xml
index 6728c855..d750bbc9 100644
--- a/notification/ActiveNotifications/template-params.xml
+++ b/notification/ActiveNotifications/template-params.xml
@@ -16,7 +16,7 @@
-->
<sample>
<name>ActiveNotifications</name>
- <group>Android N Preview</group>
+ <group>Notification</group>
<package>com.example.android.activenotifications</package>
<minSdk>24</minSdk>
@@ -44,8 +44,8 @@ via a PendingIntent.
<common src="logger" />
<metadata>
- <status>DRAFT</status>
- <categories>Getting Started, Notification, Android N Preview</categories>
+ <status>PUBLISHED</status>
+ <categories>Notification</categories>
<technologies>Android</technologies>
<languages>Java</languages>
<solutions>Mobile</solutions>
diff --git a/notification/MessagingService/template-params.xml b/notification/MessagingService/template-params.xml
index 554163ce..8113c3f3 100644
--- a/notification/MessagingService/template-params.xml
+++ b/notification/MessagingService/template-params.xml
@@ -16,7 +16,7 @@
-->
<sample>
<name>MessagingService</name>
- <group>Android N Preview</group>
+ <group>Notification</group>
<package>com.example.android.messagingservice</package>
<minSdk>21</minSdk>
@@ -42,7 +42,7 @@ notification.
<template src="base-application" />
<metadata>
<status>PUBLISHED</status>
- <categories>Android N Preview</categories>
+ <categories>Notification</categories>
<!-- Old Categories: UI, Notification -->
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml
index b020ec14..a9aa69d1 100644
--- a/security/DirectBoot/template-params.xml
+++ b/security/DirectBoot/template-params.xml
@@ -17,7 +17,7 @@
<sample>
<name>DirectBoot</name>
- <group>Android N Preview</group> <!-- This field will be deprecated in the future
+ <group>Security</group> <!-- This field will be deprecated in the future
and replaced with the "categories" tags below. -->
<package>com.example.android.directboot</package>
diff --git a/security/FingerprintDialog/template-params.xml b/security/FingerprintDialog/template-params.xml
index 78184922..37a84fe1 100644
--- a/security/FingerprintDialog/template-params.xml
+++ b/security/FingerprintDialog/template-params.xml
@@ -41,7 +41,7 @@ before proceeding some actions such as purchasing an item.
<metadata>
<!-- Values: {DRAFT | PUBLISHED | INTERNAL | DEPRECATED | SUPERCEDED} -->
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<categories>security</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/system/AppUsageStatistics/template-params.xml b/system/AppUsageStatistics/template-params.xml
index 38f5781d..dc8b46fd 100644
--- a/system/AppUsageStatistics/template-params.xml
+++ b/system/AppUsageStatistics/template-params.xml
@@ -36,7 +36,7 @@
<template src="base" />
<metadata>
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<categories>System</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml
index c766f9bd..c61c8d25 100644
--- a/system/RuntimePermissions/template-params.xml
+++ b/system/RuntimePermissions/template-params.xml
@@ -39,7 +39,7 @@
<common src="logger"/>
<metadata>
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<categories>System</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml
index c5852ed8..aba6ac8e 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -36,7 +36,7 @@ Note: The "RuntimePermissions" sample provides a more complete overview over the
<template src="base"/>
<metadata>
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<categories>System</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/ui/window/DragAndDropAcrossApps/template-params.xml b/ui/window/DragAndDropAcrossApps/template-params.xml
index 6b02e61f..9d232252 100644
--- a/ui/window/DragAndDropAcrossApps/template-params.xml
+++ b/ui/window/DragAndDropAcrossApps/template-params.xml
@@ -17,7 +17,7 @@
<sample>
<name>DragAndDropAcrossApps-new</name>
- <group>ui</group>
+ <group>ui</group>
<package>com.example.android.droptarget</package>
<minSdk>24</minSdk>
@@ -27,7 +27,7 @@
<strings>
<intro>
<![CDATA[
-This sample demonstrates how data can be moved between views within an
+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. DragSource contains images and text that can be dropped into the DropTarget
@@ -41,8 +41,8 @@ handle drag and drop events.
</strings>
<metadata>
- <status>DRAFT</status>
- <categories>Android N Preview</categories>
+ <status>PUBLISHED</status>
+ <categories>UI</categories>
<technologies>Android</technologies>
<languages>Java</languages>
<solutions>Mobile</solutions>
@@ -75,15 +75,15 @@ handle drag and drop events.
<intro>
<![CDATA[
Android N introduces support for drag and drop between applications,
-augmenting the existing APIs that have enabled this within a single
+augmenting the existing APIs that have enabled this within a single
window before.
-To start a drag operation you need to call `View.startDragAndDrop`.
+To start a drag operation you need to call `View.startDragAndDrop`.
Which gesture or action triggers this is up to you as an app developer.
-The API guide recommends doing this from
+The API guide recommends doing this from
`View.OnLongClickListener.onLongClick` and this seems to be the de-facto
-standard, but you are free to use other gestures (single tap, tap and drag
-etc).
+standard, but you are free to use other gestures (single tap, tap and drag
+etc).
However, if you go for a unconventional drag start gesture, note that
the framework implementation assumes that the pointer (touch or mouse)
is down while the drag is starting, and the most recent touch/click
@@ -95,16 +95,16 @@ than a long click).
By default a drag and drop operation is constrained by the window
containing the view that started the drag.
-To enable cross-window and cross-app drag and drop add
+To enable cross-window and cross-app drag and drop add
`View.DRAG_FLAG_GLOBAL` to the flags passed to the `View.startDragAndDrop`
-call.
+call.
-If a Uri requiring permission grants is being sent, then the
-`android.view.View.DRAG_FLAG_GLOBAL_URI_READ` and/or the
+If a Uri requiring permission grants is being sent, then the
+`android.view.View.DRAG_FLAG_GLOBAL_URI_READ` and/or the
`android.view.View.DRAG_FLAG_GLOBAL_URI_WRITE` flags must be used also.
To access content URIs requiring permissions on the receiving side, the target
app needs to request the `android.view.DropPermissions` from the activity via
-`android.app.Activity.requestDropPermissions`. This permission will stay either
+`android.app.Activity.requestDropPermissions`. This permission will stay either
until the activity is alive, or until the `release()` method is called on the
`android.view.DropPermissions` object.
]]>
diff --git a/ui/window/MultiWindowPlayground/template-params.xml b/ui/window/MultiWindowPlayground/template-params.xml
index 3c85054b..01ba9896 100644
--- a/ui/window/MultiWindowPlayground/template-params.xml
+++ b/ui/window/MultiWindowPlayground/template-params.xml
@@ -17,7 +17,7 @@
<sample>
<name>MultiWindowPlayground</name>
- <group>Android N Preview</group>
+ <group>UI</group>
<package>com.example.android.multiwindowplayground</package>
<minSdk>24</minSdk>
@@ -40,7 +40,7 @@ the lifecycle and behavior of the app.
<metadata>
<status>PUBLISHED</status>
- <categories>Android N Preview</categories>
+ <categories>UI</categories>
<technologies>Android</technologies>
<languages>Java</languages>
<solutions>Mobile</solutions>