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

Use correct constants for Global Actions Panel settings.

Browse Source 
Test: Automated tests pass. Manual testing allows enabling/disabling of secure setting via Settings preference.

Fixes: 132182180
Fixes: 132184167
Change-Id: I62caccfe64e073c95b0c0f8a42e5728cf7f3c1ca
This commit is contained in:
Aran Ink
2019-05-07 16:36:56 -04:00
parent 2659c0f61b
commit b8e81544ef
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 { 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";

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