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

Merge "Use correct constants for Global Actions Panel settings." into qt-dev

Browse Source
This commit is contained in:
Aran Ink
2019-05-08 18:56:26 +00:00
committed by Android (Google) Code Review
parent ea6bd51bea b8e81544ef
commit 7627363d3e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java
View File

@@ -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";

3
src/com/android/settings/gestures/GlobalActionsPanelSettings.java
View File

@@ -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