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

Commit 1a7b0801 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "Default status bar user chip to View.GONE" into tm-qpr-dev am:... 

Merge "Default status bar user chip to View.GONE" into tm-qpr-dev am: 517df64d am: ac37c12b am: 6030888c am: 02a73cfd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21994312



Change-Id: Id0a6d25a2bf9b4406081a85653e030ba4e404473
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 377e1363 02a73cfd

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();
@@ -571,6 +578,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);

    }