diff options
| author | 2023-07-11 09:09:02 +0000 | |
|---|---|---|
| committer | 2023-07-11 09:09:02 +0000 | |
| commit | 50f1ad275f39863f0c108cbfbd2fbe4caed3a69e (patch) | |
| tree | 7a2c07f6c114dc0989b67e76d63fc1ad34675472 | |
| parent | 2befc2319211ff0407fbf0b4df8c44859f725188 (diff) | |
| parent | 2cc7f546fb5859765d947fbe16e12161a210cb35 (diff) | |
Merge "Add the intent EXTRA for settings metrics" into udc-qpr-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/input/KeyboardLayoutManager.java | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 820f454abe80..753349c19e10 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2186,6 +2186,16 @@ public final class 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> * This must be passed as an extra field to the {@link #ACTION_CHANNEL_NOTIFICATION_SETTINGS}. diff --git a/services/core/java/com/android/server/input/KeyboardLayoutManager.java b/services/core/java/com/android/server/input/KeyboardLayoutManager.java index 3ac15947ab8e..63fded1a35fe 100644 --- a/services/core/java/com/android/server/input/KeyboardLayoutManager.java +++ b/services/core/java/com/android/server/input/KeyboardLayoutManager.java @@ -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 |