diff options
author | Dave Hawkey <dhawkey@google.com> | 2015-06-26 16:48:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 16:48:32 +0000 |
commit | 79f25bedd2ed13613323b085b46b9b42aee21696 (patch) | |
tree | 17239cf2925ff220e00454c0aefbc39d99377614 /src | |
parent | bb87053ef98014fb4693aa4ff7e9d44ca30f7b9a (diff) | |
parent | 3a43ed61cba0dd45cf085f41c1632cfbc82a8adc (diff) | |
download | android_packages_apps_Trebuchet-79f25bedd2ed13613323b085b46b9b42aee21696.tar.gz android_packages_apps_Trebuchet-79f25bedd2ed13613323b085b46b9b42aee21696.tar.bz2 android_packages_apps_Trebuchet-79f25bedd2ed13613323b085b46b9b42aee21696.zip |
Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherCallbacks.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherExtension.java | 5 |
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) { } |