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

Commit 79f25bed authored by Dave Hawkey's avatar Dave Hawkey Committed by Android (Google) Code Review
Browse files

Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte

parents bb87053e 3a43ed61

src/com/android/launcher3/Launcher.java

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

src/com/android/launcher3/LauncherCallbacks.java

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

src/com/android/launcher3/LauncherExtension.java

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

        }