From 5b2a769765e80d1a5fb187155a3ef461d4312b83 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Tue, 21 Jan 2025 21:49:32 +0000 Subject: [PATCH] Increment TeX counters for the HCT migration notification. See the corresponding TeX change for more details. Bug: 369906140 Flag: com.android.graphics.hwui.flags.high_contrast_text_small_text_rect Test: run statsd_testdrive 644 and verify the output when the notification appears Test: ensure that rotating / restarting the activity does not trigger multiple increments to the counter Change-Id: Iea01962611e3e327cfbde6f3451f7f1ec54b955e --- .../HighContrastTextMigrationReceiver.java | 4 ++++ .../accessibility/TextReadingPreferenceFragment.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java b/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java index 8e311858f51..d058b0053aa 100644 --- a/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java +++ b/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java @@ -36,6 +36,7 @@ import android.util.Log; import androidx.annotation.NonNull; import com.android.graphics.hwui.flags.Flags; +import com.android.modules.expresslog.Counter; import com.android.settings.R; import com.google.common.annotations.VisibleForTesting; @@ -166,6 +167,7 @@ public class HighContrastTextMigrationReceiver extends BroadcastReceiver { NotificationManager.IMPORTANCE_LOW); notificationManager.createNotificationChannel(notificationChannel); notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build()); + Counter.logIncrement("accessibility.value_hct_notification_posted"); } private Intent createHighContrastTextSettingsIntent(Context context) { @@ -174,6 +176,8 @@ public class HighContrastTextMigrationReceiver extends BroadcastReceiver { Bundle fragmentArgs = new Bundle(); fragmentArgs.putString(EXTRA_FRAGMENT_ARG_KEY, TextReadingPreferenceFragment.HIGH_TEXT_CONTRAST_KEY); + fragmentArgs.putInt(TextReadingPreferenceFragment.EXTRA_LAUNCHED_FROM, + TextReadingPreferenceFragment.EntryPoint.HIGH_CONTRAST_TEXT_NOTIFICATION); settingsIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs); return settingsIntent; } diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java index a972a0dd5fa..a6e6687bf5d 100644 --- a/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragment.java @@ -34,6 +34,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import com.android.graphics.hwui.flags.Flags; +import com.android.modules.expresslog.Counter; import com.android.settings.R; import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums; import com.android.settings.dashboard.DashboardFragment; @@ -84,6 +86,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment { EntryPoint.SUW_ANYTHING_ELSE, EntryPoint.DISPLAY_SETTINGS, EntryPoint.ACCESSIBILITY_SETTINGS, + EntryPoint.HIGH_CONTRAST_TEXT_NOTIFICATION, }) @interface EntryPoint { int UNKNOWN_ENTRY = 0; @@ -91,6 +94,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment { int SUW_ANYTHING_ELSE = 2; int DISPLAY_SETTINGS = 3; int ACCESSIBILITY_SETTINGS = 4; + int HIGH_CONTRAST_TEXT_NOTIFICATION = 5; } @VisibleForTesting @@ -121,6 +125,14 @@ public class TextReadingPreferenceFragment extends DashboardFragment { rootView.setAccessibilityPaneTitle(getString( R.string.accessibility_text_reading_options_title)); } + if (Flags.highContrastTextSmallTextRect()) { + updateEntryPoint(); + if (mEntryPoint == EntryPoint.HIGH_CONTRAST_TEXT_NOTIFICATION + // Only log this counter during the first launch, not during activity refresh + && savedInstanceState == null) { + Counter.logIncrement("accessibility.value_hct_notification_opened_settings"); + } + } } @Override