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

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

Merge "Fixing the alarm icon for new p20 styles" into rvc-d1-dev am: 618a60b1 

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

Change-Id: Ieabc3a019563aedeb93226cff9b2da1e2d88c800
parents 90d0b42f 618a60b1

packages/overlays/IconPackKaiAndroidOverlay/res/drawable/ic_audio_alarm.xml

+19 −6
Original line number Diff line number Diff line
@@ -13,9 +13,22 @@ 
   See the License for the specific language governing permissions and

   limitations under the License.

-->

<vector android:height="24dp" android:tint="?android:attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

  <path android:fillColor="@android:color/white" android:pathData="M12,4.01c-6.86,0-9,4.44-9,8.99c0,4.59,2.12,8.99,9,8.99c6.86,0,9-4.44,9-8.99C21,8.41,18.88,4.01,12,4.01z M12,20.49 C11.44,20.5,4.5,21.06,4.5,13c0-2.3,0.59-7.49,7.5-7.49c0.56-0.01,7.5-0.56,7.5,7.49C19.5,21.02,12.53,20.49,12,20.49z"/>

  <path android:fillColor="@android:color/white" android:pathData="M 1.84 3.56 H 7.84 V 5.06 H 1.84 V 3.56 Z"/>

  <path android:fillColor="@android:color/white" android:pathData="M 18.41 1.31 H 19.91 V 7.31 H 18.41 V 1.31 Z"/>

  <path android:fillColor="@android:color/white" android:pathData="M12.5,8H11v4.88c0,0.4,0.16,0.78,0.44,1.06l3.1,3.1l1.06-1.06l-3.1-3.1V8z"/>

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

        android:width="24dp"

        android:height="24dp"

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

        android:viewportWidth="24"

        android:viewportHeight="24">

  <path

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

      android:pathData="M12,4.01c-6.86,0 -9,4.44 -9,8.99c0,4.59 2.12,8.99 9,8.99c6.86,0 9,-4.44 9,-8.99C21,8.41 18.88,4.01 12,4.01zM12,20.49C11.44,20.5 4.5,21.06 4.5,13c0,-2.3 0.59,-7.49 7.5,-7.49c0.56,-0.01 7.5,-0.56 7.5,7.49C19.5,21.02 12.53,20.49 12,20.49z"/>

  <path

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

      android:pathData="M2.0575,5.6559l4.6068,-3.8442l0.961,1.1517l-4.6068,3.8442z"/>

  <path

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

      android:pathData="M16.3786,2.9637l0.961,-1.1517l4.6068,3.8442l-0.961,1.1517z"/>

  <path

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

      android:pathData="M12.5,8H11v4.88c0,0.4 0.16,0.78 0.44,1.06l3.1,3.1l1.06,-1.06l-3.1,-3.1V8z"/>

</vector>

packages/overlays/IconPackSamAndroidOverlay/res/drawable/ic_audio_alarm.xml

+16 −5
Original line number Diff line number Diff line
@@ -13,8 +13,19 @@ 
   See the License for the specific language governing permissions and

   limitations under the License.

-->

<vector android:height="24dp" android:tint="?android:attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

  <path android:fillColor="@android:color/white" android:pathData="M21.18,5.01l-3.07-2.56c-0.42-0.35-1.05-0.3-1.41,0.13v0C16.34,3,16.4,3.63,16.82,3.99l3.07,2.56 c0.42,0.35,1.05,0.3,1.41-0.13C21.66,6,21.6,5.37,21.18,5.01z"/>

  <path android:fillColor="@android:color/white" android:pathData="M4.1,6.55l3.07-2.56C7.6,3.63,7.66,3,7.3,2.58l0,0C6.95,2.15,6.32,2.1,5.9,2.45L2.82,5.01C2.4,5.37,2.34,6,2.7,6.42l0,0 C3.05,6.85,3.68,6.9,4.1,6.55z"/>

  <path android:fillColor="@android:color/white" android:pathData="M12,4c-4.97,0-9,4.03-9,9c0,4.97,4.03,9,9,9s9-4.03,9-9C21,8.03,16.97,4,12,4z M15.5,16.5L15.5,16.5 c-0.39,0.39-1.03,0.39-1.42,0L11.58,14C11.21,13.62,11,13.11,11,12.58V9c0-0.55,0.45-1,1-1s1,0.45,1,1v3.59l2.5,2.49 C15.89,15.47,15.89,16.11,15.5,16.5z"/>

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

        android:width="24dp"

        android:height="24dp"

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

        android:viewportWidth="24"

        android:viewportHeight="24">

  <path

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

      android:pathData="M21.18,5.01l-3.07,-2.56c-0.42,-0.35 -1.05,-0.3 -1.41,0.13v0C16.34,3 16.4,3.63 16.82,3.99l3.07,2.56c0.42,0.35 1.05,0.3 1.41,-0.13C21.66,6 21.6,5.37 21.18,5.01z"/>

  <path

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

      android:pathData="M4.1,6.55l3.07,-2.56C7.6,3.63 7.66,3 7.3,2.58l0,0C6.95,2.15 6.32,2.1 5.9,2.45L2.82,5.01C2.4,5.37 2.34,6 2.7,6.42l0,0C3.05,6.85 3.68,6.9 4.1,6.55z"/>

  <path

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

      android:pathData="M12,4c-4.97,0 -9,4.03 -9,9c0,4.97 4.03,9 9,9s9,-4.03 9,-9C21,8.03 16.97,4 12,4zM15.5,16.5L15.5,16.5c-0.39,0.39 -1.03,0.39 -1.42,0L11.58,14C11.21,13.62 11,13.11 11,12.58V9c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v3.59l2.5,2.49C15.89,15.47 15.89,16.11 15.5,16.5z"/>

</vector>

packages/overlays/IconPackVictorAndroidOverlay/res/drawable/ic_audio_alarm.xml

+19 −6
Original line number Diff line number Diff line
@@ -13,9 +13,22 @@ 
   See the License for the specific language governing permissions and

   limitations under the License.

-->

<vector android:height="24dp" android:tint="?android:attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

  <path android:fillColor="@android:color/white" android:pathData="M 12.5 8 L 11 8 L 11 13.5 L 14.54 17.04 L 15.6 15.97 L 12.5 12.88 Z"/>

  <path android:fillColor="@android:color/white" android:pathData="M 1.84 3.56 H 7.84 V 5.06 H 1.84 V 3.56 Z"/>

  <path android:fillColor="@android:color/white" android:pathData="M 18.41 1.31 H 19.91 V 7.31 H 18.41 V 1.31 Z"/>

  <path android:fillColor="@android:color/white" android:pathData="M12,4c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9S16.97,4,12,4z M12,20.5c-4.14,0-7.5-3.36-7.5-7.5S7.86,5.5,12,5.5 s7.5,3.36,7.5,7.5S16.14,20.5,12,20.5z"/>

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

        android:width="24dp"

        android:height="24dp"

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

        android:viewportWidth="24"

        android:viewportHeight="24">

  <path

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

      android:pathData="M12.5,8l-1.5,0l0,5.5l3.54,3.54l1.06,-1.07l-3.1,-3.09z"/>

  <path

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

      android:pathData="M2.0575,5.6557l4.6068,-3.8442l0.961,1.1517l-4.6068,3.8442z"/>

  <path

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

      android:pathData="M16.3786,2.9637l0.961,-1.1517l4.6068,3.8442l-0.961,1.1517z"/>

  <path

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

      android:pathData="M12,4c-4.97,0 -9,4.03 -9,9s4.03,9 9,9s9,-4.03 9,-9S16.97,4 12,4zM12,20.5c-4.14,0 -7.5,-3.36 -7.5,-7.5S7.86,5.5 12,5.5s7.5,3.36 7.5,7.5S16.14,20.5 12,20.5z"/>

</vector>