PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use EXTRA_ENTRYPOINT to log entry point for metrics

Browse Source 
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
This commit is contained in:
danielwbhuang
2023-07-06 20:28:44 +08:00
parent 2070808a62
commit f76c528e5b
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.provider.Settings; import android.provider.Settings;
@@ -53,8 +54,7 @@ public class KeyboardSettingsPreferenceController extends BasePreferenceControll
if (mCachedDevice.getAddress().equals(hardKeyboardDeviceInfo.mBluetoothAddress)) { if (mCachedDevice.getAddress().equals(hardKeyboardDeviceInfo.mBluetoothAddress)) {
Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS);
intent.putExtra( intent.putExtra(
NewKeyboardSettingsUtils.EXTRA_INTENT_FROM, Settings.EXTRA_ENTRYPOINT, SettingsEnums.CONNECTED_DEVICES_SETTINGS);
"com.android.settings.inputmethod.KeyboardSettingsPreferenceController");
intent.putExtra( intent.putExtra(
Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, Settings.EXTRA_INPUT_DEVICE_IDENTIFIER,
hardKeyboardDeviceInfo.mDeviceIdentifier); hardKeyboardDeviceInfo.mDeviceIdentifier);

6
src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
View File

@@ -33,12 +33,6 @@ import java.util.List;
*/ */
public class NewKeyboardSettingsUtils { 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_TITLE = "keyboard_layout_picker_title";
static final String EXTRA_USER_ID = "user_id"; static final String EXTRA_USER_ID = "user_id";
static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier"; static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";

6
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -123,9 +123,9 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
} }
InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra( InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra(
KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER); KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER);
String intentFromWhere = int intentFromWhere =
activity.getIntent().getStringExtra(NewKeyboardSettingsUtils.EXTRA_INTENT_FROM); activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1);
if (intentFromWhere != null) { if (intentFromWhere != -1) {
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_OPEN_PK_SETTINGS_FROM, intentFromWhere); getContext(), SettingsEnums.ACTION_OPEN_PK_SETTINGS_FROM, intentFromWhere);
} }

5
src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
@@ -66,9 +67,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont
return false; return false;
} }
Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS);
intent.putExtra( intent.putExtra(Settings.EXTRA_ENTRYPOINT, SettingsEnums.KEYBOARD_SETTINGS);
NewKeyboardSettingsUtils.EXTRA_INTENT_FROM,
"com.android.settings.inputmethod.PhysicalKeyboardPreferenceController");
mContext.startActivity(intent); mContext.startActivity(intent);
return true; return true;
} }