Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev
am: 2862d538b6
Change-Id: I907985ee2898dbe4a8e5a522934c8e4e332edca0
This commit is contained in:
@@ -619,6 +619,10 @@ public class NavigationBarView extends FrameLayout implements
|
||||
// Always disable recents when alternate car mode UI is active and for secondary displays.
|
||||
boolean disableRecent = isRecentsButtonDisabled();
|
||||
|
||||
// Disable the home handle if both hone and recents are disabled
|
||||
boolean disableHomeHandle = disableRecent
|
||||
&& ((mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);
|
||||
|
||||
boolean disableBack = !useAltBack && (isGesturalMode(mNavBarMode)
|
||||
|| ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0));
|
||||
|
||||
@@ -649,6 +653,7 @@ public class NavigationBarView extends FrameLayout implements
|
||||
getBackButton().setVisibility(disableBack ? View.INVISIBLE : View.VISIBLE);
|
||||
getHomeButton().setVisibility(disableHome ? View.INVISIBLE : View.VISIBLE);
|
||||
getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);
|
||||
getHomeHandle().setVisibility(disableHomeHandle ? View.INVISIBLE : View.VISIBLE);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
||||
Reference in New Issue
Block a user