Merge "Use correct constants for Global Actions Panel settings." into qt-dev
This commit is contained in:
@@ -25,12 +25,11 @@ import com.android.internal.annotations.VisibleForTesting;
|
|||||||
public class GlobalActionsPanelPreferenceController extends GesturePreferenceController {
|
public class GlobalActionsPanelPreferenceController extends GesturePreferenceController {
|
||||||
private static final String PREF_KEY_VIDEO = "global_actions_panel_video";
|
private static final String PREF_KEY_VIDEO = "global_actions_panel_video";
|
||||||
|
|
||||||
// TODO (b/132182180) -- Use Secure Settings constants instead of hard-coded strings
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
protected static final String ENABLED_SETTING = "global_actions_panel_enabled";
|
protected static final String ENABLED_SETTING = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
|
||||||
// TODO (b/132182180) -- Use Secure Settings constants instead of hard-coded strings
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
protected static final String AVAILABLE_SETTING = "global_actions_panel_available";
|
protected static final String AVAILABLE_SETTING =
|
||||||
|
Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
protected static final String TOGGLE_KEY = "gesture_global_actions_panel_switch";
|
protected static final String TOGGLE_KEY = "gesture_global_actions_panel_switch";
|
||||||
|
@@ -33,10 +33,9 @@ public class GlobalActionsPanelSettings extends DashboardFragment {
|
|||||||
|
|
||||||
private static final String TAG = "GlobalActionsPanelSettings";
|
private static final String TAG = "GlobalActionsPanelSettings";
|
||||||
|
|
||||||
// TODO (132184167): Use correct settings constant
|
|
||||||
@Override
|
@Override
|
||||||
public int getMetricsCategory() {
|
public int getMetricsCategory() {
|
||||||
return SettingsEnums.SETTINGS_GESTURES;
|
return SettingsEnums.GLOBAL_ACTIONS_PANEL_SETTINGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user