summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Hawkey <dhawkey@google.com>2015-06-26 10:27:47 -0600
committerDave Hawkey <dhawkey@google.com>2015-06-26 10:27:47 -0600
commit3a43ed61cba0dd45cf085f41c1632cfbc82a8adc (patch)
tree38de2aec6ea3a818d45f8f62aec149be315d71f7
parent21a4ccc6275a6a3328fc4951f6942b43b0a7726b (diff)
downloadandroid_packages_apps_Trebuchet-3a43ed61cba0dd45cf085f41c1632cfbc82a8adc.tar.gz
android_packages_apps_Trebuchet-3a43ed61cba0dd45cf085f41c1632cfbc82a8adc.tar.bz2
android_packages_apps_Trebuchet-3a43ed61cba0dd45cf085f41c1632cfbc82a8adc.zip
Add LauncherCallbacks for requesting permissions on MNC
Change-Id: Ia8f704590e03e16db04c2f7acee1e79ce7334749
-rw-r--r--src/com/android/launcher3/Launcher.java9
-rw-r--r--src/com/android/launcher3/LauncherCallbacks.java2
-rw-r--r--src/com/android/launcher3/LauncherExtension.java5
3 files changed, 16 insertions, 0 deletions
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
@@ -82,6 +82,11 @@ public class LauncherExtension extends Launcher {
}
@Override
+ public void onRequestPermissionsResult(int requestCode, String[] permissions,
+ int[] grantResults) {
+ }
+
+ @Override
public void onWindowFocusChanged(boolean hasFocus) {
}