diff --git a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java b/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java
index 07d303ba0ad..b980499ef90 100644
--- a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java
+++ b/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java
@@ -25,12 +25,11 @@ import com.android.internal.annotations.VisibleForTesting;
 public class GlobalActionsPanelPreferenceController extends GesturePreferenceController {
     private static final String PREF_KEY_VIDEO = "global_actions_panel_video";
 
-    // TODO (b/132182180) -- Use Secure Settings constants instead of hard-coded strings
     @VisibleForTesting
-    protected static final String ENABLED_SETTING = "global_actions_panel_enabled";
-    // TODO (b/132182180) -- Use Secure Settings constants instead of hard-coded strings
+    protected static final String ENABLED_SETTING = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
     @VisibleForTesting
-    protected static final String AVAILABLE_SETTING = "global_actions_panel_available";
+    protected static final String AVAILABLE_SETTING =
+            Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
 
     @VisibleForTesting
     protected static final String TOGGLE_KEY = "gesture_global_actions_panel_switch";
diff --git a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java
index 0ace61f0c05..fe9a9e80cba 100644
--- a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java
+++ b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java
@@ -33,10 +33,9 @@ public class GlobalActionsPanelSettings extends DashboardFragment {
 
     private static final String TAG = "GlobalActionsPanelSettings";
 
-    // TODO (132184167): Use correct settings constant
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_GESTURES;
+        return SettingsEnums.GLOBAL_ACTIONS_PANEL_SETTINGS;
     }
 
     @Override