Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix inconsistency in nav mode changes" into rvc-dev am: 5c9e323353

Browse Source 
Change-Id: I964c69e56ddae4c3ecb394c1b398b7aaf5b78c79
This commit is contained in:
Winson Chung
2020-05-27 21:04:20 +00:00
committed by Automerger Merge Worker
parent 24cca715c8 5c9e323353
commit 51ae9e18fd
2 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
View File

@@ -93,7 +93,6 @@ public class NavigationBarInflaterView extends FrameLayout
private boolean mIsVertical; private boolean mIsVertical;
private boolean mAlternativeOrder; private boolean mAlternativeOrder;
private boolean mUsingCustomLayout;
private OverviewProxyService mOverviewProxyService; private OverviewProxyService mOverviewProxyService;
private int mNavBarMode = NAV_BAR_MODE_3BUTTON; private int mNavBarMode = NAV_BAR_MODE_3BUTTON;
@@ -145,7 +144,6 @@ public class NavigationBarInflaterView extends FrameLayout
@Override @Override
public void onNavigationModeChanged(int mode) { public void onNavigationModeChanged(int mode) {
mNavBarMode = mode; mNavBarMode = mode;
onLikelyDefaultLayoutChange();
} }
@Override @Override
@@ -154,17 +152,7 @@ public class NavigationBarInflaterView extends FrameLayout
super.onDetachedFromWindow(); super.onDetachedFromWindow();
} }
public void setNavigationBarLayout(String layoutValue) {
if (!Objects.equals(mCurrentLayout, layoutValue)) {
mUsingCustomLayout = layoutValue != null;
clearViews();
inflateLayout(layoutValue);
}
}
public void onLikelyDefaultLayoutChange() { public void onLikelyDefaultLayoutChange() {
// Don't override custom layouts
if (mUsingCustomLayout) return;
// Reevaluate new layout // Reevaluate new layout
final String newValue = getDefaultLayout(); final String newValue = getDefaultLayout();

30
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationModeController.java
View File

@@ -16,19 +16,14 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import static android.content.Intent.ACTION_OVERLAY_CHANGED;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.om.IOverlayManager; import android.content.om.IOverlayManager;
import android.content.om.OverlayInfo; import android.content.om.OverlayInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.ApkAssets; import android.content.res.ApkAssets;
import android.os.PatternMatcher;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
@@ -39,6 +34,7 @@ import android.util.Log;
import com.android.systemui.Dumpable; import com.android.systemui.Dumpable;
import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.dagger.qualifiers.UiBackground;
import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -69,16 +65,6 @@ public class NavigationModeController implements Dumpable {
private ArrayList<ModeChangedListener> mListeners = new ArrayList<>(); private ArrayList<ModeChangedListener> mListeners = new ArrayList<>();
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (DEBUG) {
Log.d(TAG, "ACTION_OVERLAY_CHANGED");
}
updateCurrentInteractionMode(true /* notify */);
}
};
private final DeviceProvisionedController.DeviceProvisionedListener mDeviceProvisionedCallback = private final DeviceProvisionedController.DeviceProvisionedListener mDeviceProvisionedCallback =
new DeviceProvisionedController.DeviceProvisionedListener() { new DeviceProvisionedController.DeviceProvisionedListener() {
@Override @Override
@@ -97,6 +83,7 @@ public class NavigationModeController implements Dumpable {
@Inject @Inject
public NavigationModeController(Context context, public NavigationModeController(Context context,
DeviceProvisionedController deviceProvisionedController, DeviceProvisionedController deviceProvisionedController,
ConfigurationController configurationController,
@UiBackground Executor uiBgExecutor) { @UiBackground Executor uiBgExecutor) {
mContext = context; mContext = context;
mCurrentUserContext = context; mCurrentUserContext = context;
@@ -105,10 +92,15 @@ public class NavigationModeController implements Dumpable {
mUiBgExecutor = uiBgExecutor; mUiBgExecutor = uiBgExecutor;
deviceProvisionedController.addCallback(mDeviceProvisionedCallback); deviceProvisionedController.addCallback(mDeviceProvisionedCallback);
IntentFilter overlayFilter = new IntentFilter(ACTION_OVERLAY_CHANGED); configurationController.addCallback(new ConfigurationController.ConfigurationListener() {
overlayFilter.addDataScheme("package"); @Override
overlayFilter.addDataSchemeSpecificPart("android", PatternMatcher.PATTERN_LITERAL); public void onOverlayChanged() {
mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, overlayFilter, null, null); if (DEBUG) {
Log.d(TAG, "onOverlayChanged");
}
updateCurrentInteractionMode(true /* notify */);
}
});
updateCurrentInteractionMode(false /* notify */); updateCurrentInteractionMode(false /* notify */);
} }