Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb5f6197 authored by Dave Hawkey's avatar Dave Hawkey Committed by Android Git Automerger
Browse files

am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC"... 

am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte

* commit '79f25bed':
  Add LauncherCallbacks for requesting permissions on MNC
parents 7162944c 79f25bed

src/com/android/launcher3/Launcher.java

+9 −0
Original line number Diff line number Diff line
@@ -871,6 +871,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();

src/com/android/launcher3/LauncherCallbacks.java

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,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);

src/com/android/launcher3/testing/LauncherExtension.java

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,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) {

        }