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

Commit 5d206b62 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Update screen record dialog to spec" into sc-dev am: f9a11581 am:... 

Merge "Update screen record dialog to spec" into sc-dev am: f9a11581 am: 899bf2e7 am: cb263353

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

Change-Id: I27f92a8a071772f0179f6b8af0ae92f7374cf910
parents 84623cc6 cb263353

packages/SystemUI/res/color/screenrecord_switch_thumb_color.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <!-- Disabled status of thumb -->

    <item android:state_enabled="false"

          android:color="@android:color/system_neutral2_100" />

    <!-- Toggle off status of thumb -->

    <item android:state_checked="false"

          android:color="@android:color/system_neutral2_100" />

    <!-- Enabled or toggle on status of thumb -->

    <item android:color="@android:color/system_accent1_100" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/screenrecord_switch_track_color.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <!-- Disabled status of thumb -->

    <item android:state_enabled="false"

          android:color="@android:color/system_neutral2_600"

          android:alpha="?android:attr/disabledAlpha" />

    <!-- Toggle off status of thumb -->

    <item android:state_checked="false"

          android:color="@android:color/system_neutral2_600" />

    <!-- Enabled or toggle on status of thumb -->

    <item android:color="@android:color/system_accent1_600" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_touch.xml

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

    limitations under the License.

-->

<!-- maybe need android:fillType="evenOdd" -->

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

        android:width="24dp"

        android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,7.5V11.24C7.79,10.43 7,9.06 7,7.5C7,5.01 9.01,3 11.5,3C13.99,3 16,5.01 16,7.5C16,9.06 15.21,10.43 14,11.24V7.5C14,6.12 12.88,5 11.5,5C10.12,5 9,6.12 9,7.5ZM14.3,13.61L18.84,15.87C19.37,16.09 19.75,16.63 19.75,17.25C19.75,17.31 19.74,17.38 19.73,17.45L18.98,22.72C18.87,23.45 18.29,24 17.54,24H10.75C10.34,24 9.96,23.83 9.69,23.56L4.75,18.62L5.54,17.82C5.74,17.62 6.02,17.49 6.33,17.49C6.39,17.49 6.4411,17.4989 6.4922,17.5078C6.5178,17.5122 6.5433,17.5167 6.57,17.52L10,18.24V7.5C10,6.67 10.67,6 11.5,6C12.33,6 13,6.67 13,7.5V13.5H13.76C13.95,13.5 14.13,13.54 14.3,13.61Z"

    />

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

        android:pathData="M18.19,12.44l-3.24,-1.62c1.29,-1 2.12,-2.56 2.12,-4.32c0,-3.03 -2.47,-5.5 -5.5,-5.5s-5.5,2.47 -5.5,5.5c0,2.13 1.22,3.98 3,4.89v3.26c-2.11,-0.45 -2.01,-0.44 -2.26,-0.44c-0.53,0 -1.03,0.21 -1.41,0.59L4,16.22l5.09,5.09C9.52,21.75 10.12,22 10.74,22h6.3c0.98,0 1.81,-0.7 1.97,-1.67l0.8,-4.71C20.03,14.32 19.38,13.04 18.19,12.44zM17.84,15.29L17.04,20h-6.3c-0.09,0 -0.17,-0.04 -0.24,-0.1l-3.68,-3.68l4.25,0.89V6.5c0,-0.28 0.22,-0.5 0.5,-0.5c0.28,0 0.5,0.22 0.5,0.5v6h1.76l3.46,1.73C17.69,14.43 17.91,14.86 17.84,15.29zM8.07,6.5c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,0.95 -0.38,1.81 -1,2.44V6.5c0,-1.38 -1.12,-2.5 -2.5,-2.5c-1.38,0 -2.5,1.12 -2.5,2.5v2.44C8.45,8.31 8.07,7.45 8.07,6.5z"/>

</vector>

packages/SystemUI/res/drawable/screenrecord_button_background_outline.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <stroke

        android:color="?androidprv:attr/colorAccentPrimary"

        android:width="1dp"/>

    <corners android:radius="24dp"/>

    <padding

        android:left="16dp"

        android:right="16dp"

        android:top="8dp"

        android:bottom="8dp" />

    <solid android:color="@android:color/transparent" />

</shape>

packages/SystemUI/res/drawable/screenrecord_button_background_solid.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <corners android:radius="24dp"/>

    <padding

        android:left="16dp"

        android:right="16dp"

        android:top="8dp"

        android:bottom="8dp" />

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

</shape>
 
 No newline at end of file