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

Commit 64b25555 authored by Evan Laird's avatar Evan Laird
Browse files

Default status bar user chip to View.GONE 

Fixes an issue where configuration changes cause it to flicker.

Fixes: 262369917
Test: CollapsedStatusBarFragmentTest
Test: KeyguardStatusBarViewTest
Change-Id: I232bf76be9089a231c9bff82be5e64e3238d90f5
parent 049f8dc0

packages/SystemUI/res/layout/status_bar_user_chip_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:orientation="horizontal"

    android:layout_marginEnd="@dimen/status_bar_user_chip_end_margin"

    android:background="@drawable/status_bar_user_chip_bg"

    android:visibility="visible" >

    android:visibility="gone" >

    <ImageView android:id="@+id/current_user_avatar"

        android:layout_width="@dimen/status_bar_user_chip_avatar_size"

        android:layout_height="@dimen/status_bar_user_chip_avatar_size"

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewTest.java

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; 
import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.LayoutInflater;

import android.view.View;



import androidx.test.filters.SmallTest;
@@ -48,6 +49,13 @@ public class KeyguardStatusBarViewTest extends SysuiTestCase { 
        });

    }



    @Test

    public void userSwitcherChip_defaultVisibilityIsGone() {

        assertThat(mKeyguardStatusBarView.findViewById(

                R.id.user_switcher_container).getVisibility()).isEqualTo(

                View.GONE);

    }



    @Test

    public void setTopClipping_clippingUpdated() {

        int topClipping = 40;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java

+11 −0
Original line number Diff line number Diff line
@@ -293,6 +293,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { 
        assertEquals(View.VISIBLE, getClockView().getVisibility());

    }



    @Test

    public void userChip_defaultVisibilityIsGone() {

        CollapsedStatusBarFragment fragment = resumeAndGetFragment();



        assertEquals(View.GONE, getUserChipView().getVisibility());

    }



    @Test

    public void disable_noOngoingCall_chipHidden() {

        CollapsedStatusBarFragment fragment = resumeAndGetFragment();
@@ -558,6 +565,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { 
        return (CollapsedStatusBarFragment) mFragment;

    }



    private View getUserChipView() {

        return mFragment.getView().findViewById(R.id.user_switcher_container);

    }



    private View getClockView() {

        return mFragment.getView().findViewById(R.id.clock);

    }