Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-23 17:50:05 +00:00
committed by Android (Google) Code Review

View File

@@ -139,12 +139,11 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
* Enables the specified overlay package.
*/
static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
setOverlayEnabled(overlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY,
overlayPackage == NAV_BAR_MODE_3BUTTON_OVERLAY);
setOverlayEnabled(overlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY,
overlayPackage == NAV_BAR_MODE_2BUTTON_OVERLAY);
setOverlayEnabled(overlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY,
overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY);
try {
overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
static boolean isSwipeUpEnabled(Context context) {
@@ -159,12 +158,4 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
return NAV_BAR_MODE_GESTURAL == context.getResources().getInteger(
com.android.internal.R.integer.config_navBarInteractionMode);
}
static void setOverlayEnabled(IOverlayManager overlayManager, String pkg, boolean enabled) {
try {
overlayManager.setEnabled(pkg, enabled, USER_CURRENT);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
}