Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-23 21:03:36 +00:00
committed by Android (Google) Code Review

View File

@@ -4350,15 +4350,20 @@ public class SettingsProvider extends ContentProvider {
} }
if (navBarMode != -1) { if (navBarMode != -1) {
String overlayPackage = "";
try { try {
overlayManager.setEnabled(NAV_BAR_MODE_3BUTTON_OVERLAY, switch (navBarMode) {
navBarMode == NAV_BAR_MODE_3BUTTON, case NAV_BAR_MODE_3BUTTON:
UserHandle.USER_CURRENT); overlayPackage = NAV_BAR_MODE_3BUTTON_OVERLAY;
overlayManager.setEnabled(NAV_BAR_MODE_2BUTTON_OVERLAY, break;
navBarMode == NAV_BAR_MODE_2BUTTON, case NAV_BAR_MODE_2BUTTON:
UserHandle.USER_CURRENT); overlayPackage = NAV_BAR_MODE_2BUTTON_OVERLAY;
overlayManager.setEnabled(NAV_BAR_MODE_GESTURAL_OVERLAY, break;
navBarMode == NAV_BAR_MODE_GESTURAL, case NAV_BAR_MODE_GESTURAL:
overlayPackage = NAV_BAR_MODE_GESTURAL_OVERLAY;
break;
}
overlayManager.setEnabledExclusiveInCategory(overlayPackage,
UserHandle.USER_CURRENT); UserHandle.USER_CURRENT);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new IllegalStateException( throw new IllegalStateException(