From f76c528e5bc9bc81b09a3cbd0ccc3d8806ea9725 Mon Sep 17 00:00:00 2001 From: danielwbhuang Date: Thu, 6 Jul 2023 20:28:44 +0800 Subject: [PATCH] Use EXTRA_ENTRYPOINT to log entry point for metrics 1. Extra name: EXTRA_ENTRYPOINT 2. Value: integer which is from SettingsEnums.EntryPointType // access physical keyboard settings through keyboard configured notification entry point KEYBOARD_CONFIGURED_NOTIFICATION = 0; // access physical keyboard settings through keyboard settings entry point KEYBOARD_SETTINGS = 1; // access physical keyboard settings through connected devices settings entry point CONNECTED_DEVICES_SETTINGS = 2; Bug: 271391879 Test: manual and check the device log. Change-Id: I0d5144790e184eb3374d4615d8874619c372742a --- .../inputmethod/KeyboardSettingsPreferenceController.java | 4 ++-- .../settings/inputmethod/NewKeyboardSettingsUtils.java | 6 ------ .../settings/inputmethod/PhysicalKeyboardFragment.java | 6 +++--- .../inputmethod/PhysicalKeyboardPreferenceController.java | 5 ++--- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java b/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java index 03461af4c29..ae6a24ac817 100644 --- a/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java +++ b/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.provider.Settings; @@ -53,8 +54,7 @@ public class KeyboardSettingsPreferenceController extends BasePreferenceControll if (mCachedDevice.getAddress().equals(hardKeyboardDeviceInfo.mBluetoothAddress)) { Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); intent.putExtra( - NewKeyboardSettingsUtils.EXTRA_INTENT_FROM, - "com.android.settings.inputmethod.KeyboardSettingsPreferenceController"); + Settings.EXTRA_ENTRYPOINT, SettingsEnums.CONNECTED_DEVICES_SETTINGS); intent.putExtra( Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, hardKeyboardDeviceInfo.mDeviceIdentifier); diff --git a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java index 697c0f09f62..ad68c4344da 100644 --- a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java +++ b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java @@ -33,12 +33,6 @@ import java.util.List; */ public class NewKeyboardSettingsUtils { - /** - * Record the class name of the intent sender for metrics. - */ - public static final String EXTRA_INTENT_FROM = - "com.android.settings.inputmethod.EXTRA_INTENT_FROM"; - static final String EXTRA_TITLE = "keyboard_layout_picker_title"; static final String EXTRA_USER_ID = "user_id"; static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier"; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 9f5d67a8e9a..289d7c186a9 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -123,9 +123,9 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment } InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra( KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER); - String intentFromWhere = - activity.getIntent().getStringExtra(NewKeyboardSettingsUtils.EXTRA_INTENT_FROM); - if (intentFromWhere != null) { + int intentFromWhere = + activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1); + if (intentFromWhere != -1) { mMetricsFeatureProvider.action( getContext(), SettingsEnums.ACTION_OPEN_PK_SETTINGS_FROM, intentFromWhere); } diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 1f01b98b982..b88928ca531 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.hardware.input.InputManager; @@ -66,9 +67,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont return false; } Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); - intent.putExtra( - NewKeyboardSettingsUtils.EXTRA_INTENT_FROM, - "com.android.settings.inputmethod.PhysicalKeyboardPreferenceController"); + intent.putExtra(Settings.EXTRA_ENTRYPOINT, SettingsEnums.KEYBOARD_SETTINGS); mContext.startActivity(intent); return true; }