Remove usage of the enableBubbleBarInPersistentTaskBar flag.
Remove and merge the usage of the enableBubbleBarInPersistentTaskBar flag to the enableBubbleBar flag. Bug: 383181643 Flag: com.android.wm.shell.enable_bubble_bar Test: NONE - removed and merged flag usage. Change-Id: I4f131e1ddf8367425b91c8fb597857ee222b75d8
This commit is contained in:
@@ -772,7 +772,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
* aligned - returns 0.
|
||||
*/
|
||||
public float getTranslationXForBubbleBarPosition(BubbleBarLocation location) {
|
||||
if (!mControllerCallbacks.isBubbleBarEnabledInPersistentTaskbar()
|
||||
if (!mControllerCallbacks.isBubbleBarEnabled()
|
||||
|| location == mBubbleBarLocation
|
||||
|| !mActivityContext.shouldStartAlignTaskbar()
|
||||
) {
|
||||
@@ -792,7 +792,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
int iconEnd = centerAlignIconEnd;
|
||||
if (mShouldTryStartAlign) {
|
||||
int startSpacingPx = deviceProfile.inlineNavButtonsEndSpacingPx;
|
||||
if (mControllerCallbacks.isBubbleBarEnabledInPersistentTaskbar()
|
||||
if (mControllerCallbacks.isBubbleBarEnabled()
|
||||
&& mBubbleBarLocation != null
|
||||
&& mActivityContext.shouldStartAlignTaskbar()) {
|
||||
iconEnd = (int) getTaskBarIconsEndForBubbleBarLocation(mBubbleBarLocation);
|
||||
|
||||
Reference in New Issue
Block a user