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

Commit 65adb316 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6539570 from 29ae7ded to mainline-release 

Change-Id: I983e68280cdd44a3e89a02a38df37fb53284c95c
parents b2ac0458 29ae7ded

res/layout/item_doc_inflated_message_cross_profile.xml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
            android:layout_marginTop="8dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:textAppearance="@style/EmptyStateTitleText"/>

        <TextView

            android:id="@+id/message"

tests/unit/com/android/documentsui/dirlist/AppsRowManagerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.documentsui.sidebar.RootItem; 
import com.android.documentsui.testing.TestActionHandler;

import com.android.documentsui.testing.TestProvidersAccess;

import com.android.documentsui.testing.TestResolveInfo;

import com.android.documentsui.util.VersionUtils;



import com.google.common.collect.Lists;
@@ -169,6 +170,9 @@ public class AppsRowManagerTest { 


    @Test

    public void testUpdateView_showSelectedUserItems_otherUser() {

        if (!VersionUtils.isAtLeastR()) {

            return;

        }

        mState.action = State.ACTION_GET_CONTENT;

        when(mActivity.getSelectedUser()).thenReturn(TestProvidersAccess.OtherUser.USER_ID);

        mState.stack.changeRoot(TestProvidersAccess.RECENTS);