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

Commit 2503ec20 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Add content description for ScreenRecordTile" into rvc-dev am: cc14ed08 

Change-Id: I3d04017e724878637b55283c13dad096573c8cd7
parents 4754fdc2 cc14ed08

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -18,7 +18,9 @@ package com.android.systemui.qs.tiles; 




import android.content.Intent;

import android.content.Intent;

import android.service.quicksettings.Tile;

import android.service.quicksettings.Tile;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;

import android.widget.Switch;





import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.plugins.qs.QSTile;
@@ -88,6 +90,10 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> 
            state.icon = ResourceIcon.get(R.drawable.ic_qs_screenrecord);

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

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

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

        }

        }

        state.contentDescription = TextUtils.isEmpty(state.secondaryLabel)

                ? state.label

                : TextUtils.concat(state.label, ", ", state.secondaryLabel);

        state.expandedAccessibilityClassName = Switch.class.getName();

    }

    }





    @Override

    @Override

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -133,4 +133,12 @@ public class ScreenRecordTileTest extends SysuiTestCase { 




        verify(mController, times(1)).stopRecording();

        verify(mController, times(1)).stopRecording();

    }

    }



    @Test

    public void testContentDescriptionHasTileName() {

        mTile.refreshState();

        mTestableLooper.processAllMessages();



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

    }

}
 
}