Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118f8aec authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Hide no calling slot when QSBH expands 

Other slots won't be visible ever.

Fixes: 184156535
Test: manual
Change-Id: I3a7ea48309e7bd253cdbe3f01f4e88be0ab017ac
parent 81b12816

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+6 −11
Original line number Original line Diff line number Diff line
@@ -17,9 +17,6 @@ package com.android.systemui.qs; 
import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;





import static com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN;

import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON;



import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;
@@ -41,7 +38,7 @@ import com.android.systemui.BatteryMeterView; 
import com.android.systemui.Interpolators;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.qs.QSDetail.Callback;

import com.android.systemui.qs.QSDetail.Callback;

import com.android.systemui.statusbar.StatusBarMobileView;

import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

import com.android.systemui.statusbar.phone.StatusBarWindowView;

import com.android.systemui.statusbar.phone.StatusBarWindowView;

import com.android.systemui.statusbar.phone.StatusIconContainer;

import com.android.systemui.statusbar.phone.StatusIconContainer;
@@ -91,7 +88,7 @@ public class QuickStatusBarHeader extends FrameLayout { 




    public QuickStatusBarHeader(Context context, AttributeSet attrs) {

    public QuickStatusBarHeader(Context context, AttributeSet attrs) {

        super(context, attrs);

        super(context, attrs);

        mMobileSlotName = context.getString(com.android.internal.R.string.status_bar_mobile);

        mMobileSlotName = context.getString(com.android.internal.R.string.status_bar_no_calling);

    }

    }





    /**

    /**
@@ -221,8 +218,8 @@ public class QuickStatusBarHeader extends FrameLayout { 
    }

    }





    private void updateAlphaAnimator() {

    private void updateAlphaAnimator() {

        StatusBarMobileView icon =

        StatusBarIconView icon =

                ((StatusBarMobileView) mIconContainer.getViewForSlot(mMobileSlotName));

                ((StatusBarIconView) mIconContainer.getViewForSlot(mMobileSlotName));

        TouchAnimator.Builder builder = new TouchAnimator.Builder()

        TouchAnimator.Builder builder = new TouchAnimator.Builder()

                .addFloat(mQSCarriers, "alpha", 0, 1)

                .addFloat(mQSCarriers, "alpha", 0, 1)

                .addFloat(mDatePrivacyView, "alpha", 0, mDatePrivacyAlpha);

                .addFloat(mDatePrivacyView, "alpha", 0, mDatePrivacyAlpha);
@@ -231,14 +228,12 @@ public class QuickStatusBarHeader extends FrameLayout { 
            builder.setListener(new TouchAnimator.ListenerAdapter() {

            builder.setListener(new TouchAnimator.ListenerAdapter() {

                @Override

                @Override

                public void onAnimationAtEnd() {

                public void onAnimationAtEnd() {

                    icon.forceHidden(true);

                    mIconContainer.addIgnoredSlot(mMobileSlotName);

                    icon.setVisibleState(STATE_HIDDEN);

                }

                }





                @Override

                @Override

                public void onAnimationStarted() {

                public void onAnimationStarted() {

                    icon.forceHidden(false);

                    mIconContainer.removeIgnoredSlot(mMobileSlotName);

                    icon.setVisibleState(STATE_ICON);

                }

                }

            });

            });

        }

        }