From 3a43ed61cba0dd45cf085f41c1632cfbc82a8adc Mon Sep 17 00:00:00 2001 From: Dave Hawkey Date: Fri, 26 Jun 2015 10:27:47 -0600 Subject: Add LauncherCallbacks for requesting permissions on MNC Change-Id: Ia8f704590e03e16db04c2f7acee1e79ce7334749 --- src/com/android/launcher3/Launcher.java | 9 +++++++++ src/com/android/launcher3/LauncherCallbacks.java | 2 ++ src/com/android/launcher3/LauncherExtension.java | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 48f390145..734c7285e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -883,6 +883,15 @@ public class Launcher extends Activity } } + /** @Override for MNC */ + protected void onRequestPermissionsResult(int requestCode, String[] permissions, + int[] grantResults) { + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onRequestPermissionsResult(requestCode, permissions, + grantResults); + } + } + private PendingAddArguments preparePendingAddArgs(int requestCode, Intent data, int appWidgetId, ItemInfo info) { PendingAddArguments args = new PendingAddArguments(); diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java index d8128d6e5..3c402a87e 100644 --- a/src/com/android/launcher3/LauncherCallbacks.java +++ b/src/com/android/launcher3/LauncherCallbacks.java @@ -37,6 +37,8 @@ public interface LauncherCallbacks { public void onPostCreate(Bundle savedInstanceState); public void onNewIntent(Intent intent); public void onActivityResult(int requestCode, int resultCode, Intent data); + public void onRequestPermissionsResult(int requestCode, String[] permissions, + int[] grantResults); public void onWindowFocusChanged(boolean hasFocus); public boolean onPrepareOptionsMenu(Menu menu); public void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args); diff --git a/src/com/android/launcher3/LauncherExtension.java b/src/com/android/launcher3/LauncherExtension.java index fe9bd6c23..54b13f9f2 100644 --- a/src/com/android/launcher3/LauncherExtension.java +++ b/src/com/android/launcher3/LauncherExtension.java @@ -81,6 +81,11 @@ public class LauncherExtension extends Launcher { public void onActivityResult(int requestCode, int resultCode, Intent data) { } + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, + int[] grantResults) { + } + @Override public void onWindowFocusChanged(boolean hasFocus) { } -- cgit v1.2.3