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

Commit b6340da0 authored by Daniel Huang's avatar Daniel Huang Committed by Automerger Merge Worker
Browse files

Merge "Add the intent EXTRA for settings metrics" into udc-qpr-dev am: 50f1ad27 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23897518



Change-Id: Ia967ee2e05fe26d77c1fbe77938ce0712098a88b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5f1bc39 50f1ad27

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,16 @@ public final class Settings { 
    public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS

            = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";













    /**













     * Intent Extra: The value of {@link android.app.settings.SettingsEnums#EntryPointType} for













     * settings metrics that logs the entry point about physical keyboard settings.













     * <p>













     * This must be passed as an extra field to the {@link #ACTION_HARD_KEYBOARD_SETTINGS}.













     * @hide













     */













    public static final String EXTRA_ENTRYPOINT =













            "com.android.settings.inputmethod.EXTRA_ENTRYPOINT";



























    /**















     * Activity Extra: The package owner of the notification channel settings to display.















     * <p>

































services/core/java/com/android/server/input/KeyboardLayoutManager.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ import android.annotation.UserIdInt;













import android.app.Notification;















import android.app.NotificationManager;















import android.app.PendingIntent;













import android.app.settings.SettingsEnums;















import android.content.BroadcastReceiver;















import android.content.ComponentName;















import android.content.Context;










@@ -1168,6 +1169,8 @@ final class KeyboardLayoutManager implements InputManager.InputDeviceListener {





























        if (targetDevice != null) {















            intent.putExtra(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, targetDevice.getIdentifier());













            intent.putExtra(













                    Settings.EXTRA_ENTRYPOINT, SettingsEnums.KEYBOARD_CONFIGURED_NOTIFICATION);















        }































        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK