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

Commit 8fba9360 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show chevron on ScreenRecordTile" into sc-dev am: a3b91578 

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

Change-Id: I63abbc830c474b0e3818fe864c5d59ac5ab935cd
parents 9c337819 a3b91578

packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> 
        state.state = (isRecording || isStarting) ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

        state.label = mContext.getString(R.string.quick_settings_screen_record_label);

        state.icon = ResourceIcon.get(R.drawable.ic_screenrecord);

        // Show expand icon when clicking will open a dialog

        state.forceExpandIcon = state.state == Tile.STATE_INACTIVE;



        if (isRecording) {

            state.secondaryLabel = mContext.getString(R.string.quick_settings_screen_record_stop);

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java

+34 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.qs.tiles; 
import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertTrue;



import static org.junit.Assert.assertFalse;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -167,4 +168,37 @@ public class ScreenRecordTileTest extends SysuiTestCase { 


        assertTrue(mTile.getState().contentDescription.toString().contains(mTile.getState().label));

    }



    @Test

    public void testForceExpandIcon_notRecordingNotStarting() {

        when(mController.isStarting()).thenReturn(false);

        when(mController.isRecording()).thenReturn(false);



        mTile.refreshState();

        mTestableLooper.processAllMessages();



        assertTrue(mTile.getState().forceExpandIcon);

    }



    @Test

    public void testForceExpandIcon_recordingNotStarting() {

        when(mController.isStarting()).thenReturn(false);

        when(mController.isRecording()).thenReturn(true);



        mTile.refreshState();

        mTestableLooper.processAllMessages();



        assertFalse(mTile.getState().forceExpandIcon);

    }



    @Test

    public void testForceExpandIcon_startingNotRecording() {

        when(mController.isStarting()).thenReturn(true);

        when(mController.isRecording()).thenReturn(false);



        mTile.refreshState();

        mTestableLooper.processAllMessages();



        assertFalse(mTile.getState().forceExpandIcon);

    }

}