commit f3f9a3b55306a1e6df60b5ee652fda6750035e5e
author Makoto Onuki <omakoto@google.com> Wed May 11 16:17:27 2016 -0700
committer Makoto Onuki <omakoto@google.com> Thu May 12 16:46:02 2016 -0700
tree 274790d182be00140dd498e8a1fbea733fcb7f5d
parent 5b93a5e61669b891ef07468f9527e549e6fcda59

ShortcutDemo: changes for DR API update.

Bug 28536066

Change-Id: I1c23bd57aba42e761ed31f8c9584d61c6900aa70

samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublisher.java

diff --git a/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublisher.java b/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublisher.java
index a1bb794..5360bba 100644
--- a/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublisher.java
+++ b/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublisher.java
@@ -16,6 +16,7 @@
 package com.example.android.pm.shortcutdemo;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
@@ -180,23 +181,26 @@
         intent3.putExtra("nest", new Bundle());
         intent3.getBundleExtra("nest").putInt("int", 123);
 
+        final ComponentName activity = new ComponentName(this, ShortcutPublisher.class);
+
         final ShortcutInfo si1 = addRandomIntents(this, new ShortcutInfo.Builder(this)
-                .setId("shortcut1")
-                .setWeight(10)).build();
+                .setId("shortcut1"))
+                .setActivityComponent(activity)
+                .build();
 
         final ShortcutInfo si2 = new ShortcutInfo.Builder(this)
                 .setId(SETUP_SHORTCUT_ID)
+                .setActivityComponent(activity)
                 .setTitle("Shortcut Demo Main")
                 .setIcon(icon2)
-                .setWeight(5)
                 .setIntent(intent2)
                 .build();
 
         final ShortcutInfo si3 = new ShortcutInfo.Builder(this)
                 .setId("shortcut3")
+                .setActivityComponent(activity)
                 .setTitle("Shortcut Demo Main with extras")
                 .setIcon(icon3)
-                .setWeight(15)
                 .setIntent(intent3)
                 .build();
 
@@ -221,8 +225,9 @@
     public void onAddPressed(View view) {
         final ShortcutInfo si = addRandomIntents(this, new ShortcutInfo.Builder(this)
                 .setId("shortcut-" + formatTime(System.currentTimeMillis()) + "-"
-                        + sSequenceNumber.getAndIncrement())
-                .setWeight(10)).build();
+                        + sSequenceNumber.getAndIncrement()))
+                .setActivityComponent(new ComponentName(this, ShortcutPublisher.class))
+                .build();
         callApi(this, () -> mShortcutManager.addDynamicShortcuts(Arrays.asList(si)));
         refreshList();
     }

samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublishingService.java

diff --git a/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublishingService.java b/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublishingService.java
index 18e6b8d..e0abb22 100644
--- a/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublishingService.java
+++ b/samples/ShortcutDemo/publisher/src/com/example/android/pm/shortcutdemo/ShortcutPublishingService.java
@@ -16,6 +16,7 @@
 package com.example.android.pm.shortcutdemo;
 
 import android.app.IntentService;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
@@ -49,8 +50,9 @@
     private void addShortcut() {
         final ShortcutInfo si1 = ShortcutPublisher.addRandomIntents(
                 this, new ShortcutInfo.Builder(this)
-                .setId("shortcut-" + System.currentTimeMillis())
-                .setWeight(10)).build();
+                .setId("shortcut-" + System.currentTimeMillis()))
+                .setActivityComponent(new ComponentName(this, ShortcutPublisher.class))
+                .build();
         ShortcutPublisher.callApi(this, () ->
             getSystemService(ShortcutManager.class).addDynamicShortcuts(Arrays.asList(si1)));
     }