Updating settings to use resource overlay instead of setting.

Bug: 127366543
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest

Change-Id: I021d05a21e00136c6f3651247964319274bdab91
This commit is contained in:
Winson Chung
2019-03-06 16:11:53 -08:00
parent 8c4cac59b3
commit d16e3233af
7 changed files with 167 additions and 105 deletions

View File

@@ -16,9 +16,15 @@
package com.android.settings.gestures;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
import android.content.Context;
import android.content.om.IOverlayManager;
import android.os.ServiceManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import com.android.settings.widget.RadioButtonPreference;
public class SystemNavigationLegacyPreferenceController extends
@@ -26,7 +32,14 @@ public class SystemNavigationLegacyPreferenceController extends
static final String PREF_KEY_LEGACY = "gesture_legacy";
public SystemNavigationLegacyPreferenceController(Context context, String key) {
super(context, key);
this(context, IOverlayManager.Stub.asInterface(ServiceManager.getService(
Context.OVERLAY_SERVICE)), key);
}
@VisibleForTesting
public SystemNavigationLegacyPreferenceController(Context context,
IOverlayManager overlayManager, String key) {
super(context, overlayManager, key);
}
@Override
@@ -36,8 +49,7 @@ public class SystemNavigationLegacyPreferenceController extends
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
setEdgeToEdgeGestureEnabled(mContext, false);
setSwipeUpEnabled(mContext, false);
setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);
selectRadioButtonInGroup(PREF_KEY_LEGACY, mPreferenceScreen);
}