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

Commit 47811b47 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Update screen record icons 

Replace icon drawable and add content descriptions for the status bar
icon

Bug: 152412892
Fixes: 153518579
Test: manual
Change-Id: I0ee6f0856d96a8e56fcd04ff33512076cc491c8d
parent d8b6b0fb

packages/SystemUI/res/drawable/ic_screen_record_background.xml

+8 −10
Original line number Diff line number Diff line
@@ -13,13 +13,11 @@ Copyright (C) 2020 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?android:attr/colorError"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:pathData="M10,0L14,0A10,10 0,0 1,24 10L24,10A10,10 0,0 1,14 20L10,20A10,10 0,0 1,0 10L0,10A10,10 0,0 1,10 0z"

        android:fillColor="@android:color/white"/>

</vector>
 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

        android:shape="rectangle">

    <solid

        android:color="@color/screenrecord_status_color"

        android:width="@dimen/screenrecord_status_icon_width"

        android:height="@dimen/screenrecord_status_icon_height" />

    <corners android:radius="@dimen/screenrecord_status_icon_bg_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_screenrecord.xml

+9 −9
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"

        android:fillColor="#FFFFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,16c-2.21,0 -4,-1.79 -4,-4c0,-2.21 1.79,-4 4,-4c2.21,0 4,1.79 4,4C16,14.21 14.21,16 12,16zM11.99,1.99c-2.22,0 -4.26,0.73 -5.92,1.96l1.44,1.44c1.28,-0.87 2.82,-1.39 4.49,-1.39c1.67,0 3.21,0.52 4.5,1.4l1.44,-1.44C16.26,2.72 14.22,1.99 11.99,1.99zM16.48,18.6c-1.28,0.87 -2.82,1.39 -4.49,1.39c-1.66,0 -3.2,-0.52 -4.47,-1.39l-1.44,1.44c1.66,1.22 3.7,1.95 5.91,1.95c2.22,0 4.26,-0.73 5.92,-1.95L16.48,18.6zM5.39,16.49c-0.88,-1.28 -1.4,-2.83 -1.4,-4.5c0,-1.66 0.52,-3.21 1.39,-4.49L3.95,6.07c-1.22,1.66 -1.95,3.7 -1.95,5.92c0,2.22 0.73,4.27 1.96,5.93L5.39,16.49zM20.04,6.08l-1.44,1.44c0.87,1.28 1.39,2.82 1.39,4.47c0,1.66 -0.52,3.2 -1.39,4.49l1.44,1.44c1.22,-1.66 1.96,-3.7 1.96,-5.92C21.99,9.78 21.26,7.73 20.04,6.08z"/>

</vector>

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -257,4 +257,6 @@ 


    <!-- Docked misalignment message -->

    <color name="misalignment_text_color">#F28B82</color>



    <color name="screenrecord_status_color">#E94235</color>

</resources>

packages/SystemUI/res/values/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,10 @@ 
    <dimen name="screenrecord_dialog_padding">18dp</dimen>

    <dimen name="screenrecord_logo_size">24dp</dimen>

    <dimen name="screenrecord_status_text_size">14sp</dimen>

    <dimen name="screenrecord_status_icon_radius">5dp</dimen>

    <dimen name="screenrecord_status_icon_radius">7dp</dimen>

    <dimen name="screenrecord_status_icon_width">21dp</dimen>

    <dimen name="screenrecord_status_icon_height">17.5dp</dimen>

    <dimen name="screenrecord_status_icon_bg_radius">8dp</dimen>



    <dimen name="kg_user_switcher_text_size">16sp</dimen>

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

+1 −5
Original line number Diff line number Diff line
@@ -79,19 +79,15 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> 
        state.value = isRecording || isStarting;

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



        if (isRecording) {

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

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

        } else if (isStarting) {

            // round, since the timer isn't exact

            int countdown = (int) Math.floorDiv(mMillisUntilFinished + 500, 1000);

            // TODO update icon

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

            state.secondaryLabel = String.format("%d...", countdown);

        } else {

            // TODO update icon

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

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

        }

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