Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I3d04017e724878637b55283c13dad096573c8cd7
This commit is contained in:
Fabian Kozynski
2020-04-21 14:30:57 +00:00
committed by Automerger Merge Worker
parent 4754fdc2bc cc14ed08f5
commit 2503ec2080
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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));
}
} }