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

Commit b2ffd9ef authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge changes from topic "baklava-eggs" into main 

* changes:
  Telescope!
  Refreshed SystemUI/EasterEgg app icons for Android 16.
parents ea64be1a 7623efdb

packages/EasterEgg/AndroidManifest.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />





    <application

    <application

        android:icon="@drawable/android15_patch_adaptive"

        android:icon="@drawable/android16_patch_adaptive"

        android:label="@string/app_name">

        android:label="@string/app_name">





        <!-- Android V easter egg: Daydream version of Landroid

        <!-- Android V easter egg: Daydream version of Landroid
@@ -41,7 +41,7 @@ 
        <service

        <service

            android:name=".landroid.DreamUniverse"

            android:name=".landroid.DreamUniverse"

            android:exported="true"

            android:exported="true"

            android:icon="@drawable/android15_patch_adaptive"

            android:icon="@drawable/android16_patch_adaptive"

            android:label="@string/v_egg_name"

            android:label="@string/v_egg_name"

            android:description="@string/dream_description"

            android:description="@string/dream_description"

            android:enabled="false"

            android:enabled="false"
@@ -62,7 +62,7 @@ 
            android:name=".landroid.MainActivity"

            android:name=".landroid.MainActivity"

            android:exported="true"

            android:exported="true"

            android:label="@string/u_egg_name"

            android:label="@string/u_egg_name"

            android:icon="@drawable/android15_patch_adaptive"

            android:icon="@drawable/android16_patch_adaptive"

            android:configChanges="orientation|screenLayout|screenSize|density"

            android:configChanges="orientation|screenLayout|screenSize|density"

            android:theme="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen">

            android:theme="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen">

            <intent-filter>

            <intent-filter>

packages/EasterEgg/res/drawable/android16_patch_adaptive.xml

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

<!--

Copyright (C) 2024 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.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@drawable/android16_patch_adaptive_background"/>

    <foreground android:drawable="@drawable/android16_patch_adaptive_foreground"/>

    <monochrome android:drawable="@drawable/android16_patch_monochrome"/>

</adaptive-icon>

packages/EasterEgg/res/drawable/android16_patch_adaptive_background.xml

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

<!--

Copyright (C) 2024 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.

-->

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

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <group>

    <clip-path

        android:pathData="M0,0h108v108h-108z"/>

    <path

        android:pathData="M73,54L54,35L35,54L54,73L73,54Z"

        android:fillColor="#34A853"/>

    <path

        android:pathData="M44.5,44.5L54,44.5L44.5,54L44.5,44.5Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M63.5,63.5L54,63.5L63.5,54L63.5,63.5Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M54,54L54,44.5L63.5,54L54,54Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M54,44.5L54,35L63.5,44.5L54,44.5Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M54,63.5L54,73L44.5,63.5L54,63.5Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M63.5,54L63.5,44.5L73,54L63.5,54Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M44.5,54L44.5,63.5L35,54L44.5,54Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M54,54L54,63.5L44.5,54L54,54Z"

        android:fillColor="#1F8E3D"/>

    <path

        android:pathData="M82.5,25.5L82.5,35L73,25.5L82.5,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,44.5L63.5,35L73,44.5L63.5,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,35L82.5,35L73,44.5L73,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M82.5,35L92,35L82.5,44.5L82.5,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,35L54,35L63.5,25.5L63.5,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,44.5L82.5,44.5L73,54L73,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,25.5L63.5,25.5L73,16L73,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,35L63.5,35L73,25.5L73,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M82.5,63.5L82.5,73L73,63.5L82.5,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,82.5L63.5,73L73,82.5L63.5,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,73L82.5,73L73,82.5L73,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M82.5,73L92,73L82.5,82.5L82.5,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,73L54,73L63.5,63.5L63.5,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,82.5L82.5,82.5L73,92L73,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,63.5L63.5,63.5L73,54L73,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M73,73L63.5,73L73,63.5L73,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,63.5L44.5,73L35,63.5L44.5,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,82.5L25.5,73L35,82.5L25.5,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,73L44.5,73L35,82.5L35,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,73L54,73L44.5,82.5L44.5,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,73L16,73L25.5,63.5L25.5,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,82.5L44.5,82.5L35,92L35,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,63.5L25.5,63.5L35,54L35,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,73L25.5,73L35,63.5L35,73Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,25.5L44.5,35L35,25.5L44.5,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,44.5L25.5,35L35,44.5L25.5,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,35L44.5,35L35,44.5L35,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,35L54,35L44.5,44.5L44.5,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,35L16,35L25.5,25.5L25.5,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,44.5L44.5,44.5L35,54L35,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,25.5L25.5,25.5L35,16L35,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M35,35L25.5,35L35,25.5L35,35Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,25.5L54,25.5L63.5,16L63.5,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,6.5L54,6.5L44.5,16L44.5,6.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,16L54,25.5L44.5,16L54,16Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,25.5L54,35L44.5,25.5L54,25.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,6.5L54,-3L63.5,6.5L54,6.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,16L44.5,25.5L35,16L44.5,16Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,16L63.5,6.5L73,16L63.5,16Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,16L54,6.5L63.5,16L54,16Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M101.5,63.5L92,63.5L101.5,54L101.5,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M82.5,44.5L92,44.5L82.5,54L82.5,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M92,54L92,63.5L82.5,54L92,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M92,63.5L92,73L82.5,63.5L92,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M92,44.5L92,35L101.5,44.5L92,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M82.5,54L82.5,63.5L73,54L82.5,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M101.5,54L101.5,44.5L111,54L101.5,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M92,54L92,44.5L101.5,54L92,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,101.5L54,101.5L63.5,92L63.5,101.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,82.5L54,82.5L44.5,92L44.5,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,92L54,101.5L44.5,92L54,92Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,101.5L54,111L44.5,101.5L54,101.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,82.5L54,73L63.5,82.5L54,82.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M44.5,92L44.5,101.5L35,92L44.5,92Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M63.5,92L63.5,82.5L73,92L63.5,92Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M54,92L54,82.5L63.5,92L54,92Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,63.5L16,63.5L25.5,54L25.5,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M6.5,44.5L16,44.5L6.5,54L6.5,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M16,54L16,63.5L6.5,54L16,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M16,63.5L16,73L6.5,63.5L16,63.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M16,44.5L16,35L25.5,44.5L16,44.5Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M6.5,54L6.5,63.5L-3,54L6.5,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M25.5,54L25.5,44.5L35,54L25.5,54Z"

        android:fillColor="#16161D"/>

    <path

        android:pathData="M16,54L16,44.5L25.5,54L16,54Z"

        android:fillColor="#16161D"/>

  </group>

</vector>

packages/EasterEgg/res/drawable/android16_patch_adaptive_foreground.xml

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

<!--

Copyright (C) 2024 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.

-->

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

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M40.65,63.013C40.722,62.922 40.716,62.789 40.633,62.707V62.707C40.537,62.61 40.377,62.62 40.292,62.727C34.567,69.881 31.569,75.536 33.089,77.056C35.366,79.333 46.923,71.469 58.901,59.491C60.049,58.343 61.159,57.199 62.226,56.066C62.342,55.943 62.339,55.751 62.219,55.632L61.566,54.978C61.441,54.854 61.238,54.857 61.117,54.985C60.057,56.11 58.951,57.25 57.806,58.395C46.882,69.319 36.496,76.646 34.61,74.759C33.417,73.567 35.903,68.982 40.65,63.013Z"

      android:fillColor="#C6FF00"

      android:fillType="evenOdd"/>

  <path

      android:pathData="M67.956,52.033C68.205,51.966 68.462,52.115 68.529,52.364C68.596,52.614 68.448,52.871 68.198,52.938L67.956,52.033ZM68.198,52.938L63.926,54.083L63.683,53.178L67.956,52.033L68.198,52.938Z"

      android:fillColor="#000000"/>

  <path

      android:pathData="M64.497,49.237C64.564,48.987 64.821,48.839 65.071,48.906C65.32,48.973 65.469,49.229 65.402,49.479L64.497,49.237ZM65.402,49.479L64.257,53.752L63.352,53.509L64.497,49.237L65.402,49.479Z"

      android:fillColor="#000000"/>

  <path

      android:pathData="M66.145,51.236C64.869,49.961 62.83,49.931 61.591,51.17L58.825,53.937C58.585,54.176 58.585,54.564 58.825,54.803C59.063,55.042 59.452,55.042 59.691,54.803L60.436,54.057C60.915,53.579 61.69,53.579 62.169,54.057L63.324,55.212C63.802,55.691 63.802,56.466 63.324,56.945L62.578,57.69C62.339,57.929 62.339,58.318 62.578,58.557C62.817,58.796 63.205,58.796 63.444,58.557L66.211,55.79C67.45,54.551 67.42,52.512 66.145,51.236Z"

      android:fillColor="#000000"/>

</vector>

packages/EasterEgg/res/drawable/android16_patch_monochrome.xml

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

<!--

Copyright (C) 2024 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.

-->

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

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:strokeWidth="1"

      android:pathData="M54.707,35.707L72.293,53.293A1,1 102.155,0 1,72.293 54.707L54.707,72.293A1,1 0,0 1,53.293 72.293L35.707,54.707A1,1 0,0 1,35.707 53.293L53.293,35.707A1,1 0,0 1,54.707 35.707z"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M55.237,35.177L72.823,52.763A1.75,1.75 67.835,0 1,72.823 55.237L55.237,72.823A1.75,1.75 77.684,0 1,52.763 72.823L35.177,55.237A1.75,1.75 0,0 1,35.177 52.763L52.763,35.177A1.75,1.75 0,0 1,55.237 35.177z"

      android:strokeWidth="1.5"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M44.5,44.5h19v19h-19z"

      android:strokeWidth="0.75"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M54,44.5l9.5,9.5l-9.5,9.5l-9.5,-9.5z"

      android:strokeWidth="0.75"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M54,35V73"

      android:strokeWidth="0.75"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M73,54L35,54"

      android:strokeWidth="0.75"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"/>

  <path

      android:pathData="M33.576,31.135l1.146,1.146l-1.146,1.146l-1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M31.146,65.966l1.146,1.146l-1.146,1.146l-1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M26.718,56l1.718,1.718l-1.718,1.718l-1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M31.146,48l1.146,1.146l-1.146,1.146l-1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M41.925,34.374l1.718,1.718l-1.718,1.718l-1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M63.146,71l1.146,1.146l-1.146,1.146l-1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M48.567,74.553l1.718,1.718l-1.718,1.718l-1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M51.146,26l1.146,1.146l-1.146,1.146l-1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M72.291,32.146l-1.146,1.146l-1.146,-1.146l1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M76.531,36.417l-1.718,1.718l-1.718,-1.718l1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M58.291,32.146l-1.146,1.146l-1.146,-1.146l1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M68.419,36.978l-1.146,1.146l-1.146,-1.146l1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M74.252,64.034l-1.146,1.146l-1.146,-1.146l1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M71.437,76.718l-1.718,1.718l-1.718,-1.718l1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M42.984,69.38l-1.146,1.146l-1.146,-1.146l1.146,-1.146z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M82.437,51.718l-1.718,1.718l-1.718,-1.718l1.718,-1.718z"

      android:fillColor="#E8F5E9"/>

  <path

      android:pathData="M40.65,63.013C40.722,62.922 40.716,62.789 40.633,62.707V62.707C40.537,62.61 40.377,62.62 40.292,62.727C34.567,69.881 31.569,75.536 33.089,77.056C35.366,79.333 46.923,71.469 58.901,59.491C60.049,58.343 61.159,57.199 62.226,56.066C62.342,55.943 62.339,55.751 62.219,55.632L61.566,54.978C61.441,54.854 61.238,54.857 61.117,54.985C60.057,56.11 58.951,57.25 57.806,58.395C46.882,69.319 36.496,76.646 34.61,74.759C33.417,73.567 35.903,68.982 40.65,63.013Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

  <path

      android:pathData="M67.956,52.033C68.205,51.966 68.462,52.115 68.529,52.364C68.596,52.614 68.448,52.871 68.198,52.938L67.956,52.033ZM68.198,52.938L63.926,54.083L63.683,53.178L67.956,52.033L68.198,52.938Z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M64.497,49.237C64.564,48.987 64.821,48.839 65.071,48.906C65.32,48.972 65.469,49.229 65.402,49.479L64.497,49.237ZM65.402,49.479L64.257,53.752L63.352,53.509L64.497,49.237L65.402,49.479Z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M66.145,51.236C64.869,49.961 62.83,49.931 61.591,51.17L58.825,53.937C58.585,54.176 58.585,54.564 58.825,54.803C59.063,55.042 59.452,55.042 59.691,54.803L60.436,54.057C60.915,53.579 61.69,53.579 62.169,54.057L63.324,55.212C63.802,55.691 63.802,56.466 63.324,56.945L62.578,57.69C62.339,57.929 62.339,58.318 62.578,58.556C62.817,58.796 63.205,58.796 63.444,58.556L66.211,55.79C67.45,54.551 67.42,52.512 66.145,51.236Z"

      android:fillColor="#ffffff"/>

</vector>