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

Commit 928fc7cd authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Add support for Meta+Ctrl+N to open Notes task" into udc-dev

parents 8b3f7da4 432041b4

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void collapsePanels();

    method public void expandNotificationsPanel();

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public int getLastSystemKey();

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void handleSystemKey(int);

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void handleSystemKey(@NonNull android.view.KeyEvent);

    method public void sendNotificationFeedback(@Nullable String, @Nullable android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setExpansionDisabledForSimNetworkLock(boolean);

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void togglePanel();

core/java/android/app/StatusBarManager.java

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.os.ServiceManager; 
import android.os.UserHandle;

import android.util.Pair;

import android.util.Slog;

import android.view.KeyEvent;

import android.view.View;



import com.android.internal.statusbar.AppClipsServiceConnector;
@@ -740,7 +741,7 @@ public class StatusBarManager { 
     */

    @RequiresPermission(android.Manifest.permission.STATUS_BAR)

    @TestApi

    public void handleSystemKey(int key) {

    public void handleSystemKey(@NonNull KeyEvent key) {

        try {

            final IStatusBarService svc = getService();

            if (svc != null) {

core/java/com/android/internal/statusbar/IStatusBar.aidl

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.media.INearbyMediaDevicesProvider; 
import android.media.MediaRoute2Info;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.view.KeyEvent;

import android.service.notification.StatusBarNotification;



import com.android.internal.statusbar.IAddTileResultCallback;
@@ -141,7 +142,7 @@ oneway interface IStatusBar 
    void addQsTile(in ComponentName tile);

    void remQsTile(in ComponentName tile);

    void clickQsTile(in ComponentName tile);

    void handleSystemKey(in int key);

    void handleSystemKey(in KeyEvent key);



    /**

     * Methods to show toast messages for screen pinning

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.media.MediaRoute2Info; 
import android.net.Uri;

import android.os.Bundle;

import android.os.UserHandle;

import android.view.KeyEvent;

import android.service.notification.StatusBarNotification;



import com.android.internal.logging.InstanceId;
@@ -110,7 +111,7 @@ interface IStatusBarService 
    void remTile(in ComponentName tile);

    void clickTile(in ComponentName tile);

    @UnsupportedAppUsage

    void handleSystemKey(in int key);

    void handleSystemKey(in KeyEvent key);

    int getLastSystemKey();



    /**

packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ private fun createNoteTaskIntent(info: NoteTaskInfo): Intent = 


        // EXTRA_USE_STYLUS_MODE does not mean a stylus is in-use, but a stylus entrypoint

        // was used to start the note task.

        putExtra(Intent.EXTRA_USE_STYLUS_MODE, true)

        val useStylusMode = info.entryPoint != NoteTaskEntryPoint.KEYBOARD_SHORTCUT

        putExtra(Intent.EXTRA_USE_STYLUS_MODE, useStylusMode)



        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

        // We should ensure the note experience can be opened both as a full screen (lockscreen)