Skip to content

[quick_actions_android] Switch to Compat version of ShortcutManager to support Google surfaces #6638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 5 commits into from
May 10, 2024
Merged

[quick_actions_android] Switch to Compat version of ShortcutManager to support Google surfaces #6638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bf35ba
do the conversion
May 2, 2024
527f1aa
Merge branch 'main' into quick_actions_google_surfaces
gmackall May 7, 2024
b8c9c7d
just delete the shortcutmanager mocking in tests? it works?
May 7, 2024
2fe7420
pubspec+changelog
May 7, 2024
ff8c78a
format
May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
format
  • Loading branch information
Gray Mackall committed May 7, 2024
commit ff8c78a062c5d65e8cef566d52da766579ea4ea4
4 changes: 2 additions & 2 deletions ...k_actions_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import androidx.core.graphics.drawable.IconCompat;

import io.flutter.plugins.quickactions.Messages.AndroidQuickActionsApi;
import io.flutter.plugins.quickactions.Messages.FlutterError;
import io.flutter.plugins.quickactions.Messages.Result;
Expand Down Expand Up @@ -132,7 +131,8 @@ private List<ShortcutInfoCompat> shortcutItemMessageToShortcutInfo(
final String icon = shortcut.getIcon();
final String type = shortcut.getType();
final String title = shortcut.getLocalizedTitle();
final ShortcutInfoCompat.Builder shortcutBuilder = new ShortcutInfoCompat.Builder(context, type);
final ShortcutInfoCompat.Builder shortcutBuilder =
new ShortcutInfoCompat.Builder(context, type);

final int resourceId = loadResourceId(context, icon);
final Intent intent = getIntentToOpenMainActivity(type);
Expand Down
1 change: 0 additions & 1 deletion ...ons_android/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.pm.ShortcutManagerCompat;

import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
Expand Down