LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev am: b6fc18aa28

Browse Source 
am: d7ddad5dc7

* commit 'd7ddad5dc7f529d64b35188bfc4a32c0e3f3d42e':
  ShortcutDemo: changes for DR API update.

Change-Id: I8942e31415b6700f7301f65f43f43a22a0cca10d
This commit is contained in:
Makoto Onuki
2016-05-17 18:27:06 +00:00
committed by android-build-merger
parent 24d69850bc d7ddad5dc7
commit 9626804be1
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -16,6 +16,7 @@
package com.example.android.pm.shortcutdemo; package com.example.android.pm.shortcutdemo;
import android.app.IntentService; import android.app.IntentService;
import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager; import android.content.pm.ShortcutManager;
@@ -49,8 +50,9 @@ public class ShortcutPublishingService extends IntentService {
private void addShortcut() { private void addShortcut() {
final ShortcutInfo si1 = ShortcutPublisher.addRandomIntents( final ShortcutInfo si1 = ShortcutPublisher.addRandomIntents(
this, new ShortcutInfo.Builder(this) this, new ShortcutInfo.Builder(this)
.setId("shortcut-" + System.currentTimeMillis()) .setId("shortcut-" + System.currentTimeMillis()))
.setWeight(10)).build(); .setActivityComponent(new ComponentName(this, ShortcutPublisher.class))
.build();
ShortcutPublisher.callApi(this, () -> ShortcutPublisher.callApi(this, () ->
getSystemService(ShortcutManager.class).addDynamicShortcuts(Arrays.asList(si1))); getSystemService(ShortcutManager.class).addDynamicShortcuts(Arrays.asList(si1)));
} }