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

Commit 59dbe9ab authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \\\"Most cats would prefer chicken.\\\" into nyc-dev am:... 

Merge "Merge \\\"Most cats would prefer chicken.\\\" into nyc-dev am: d9069f8c am: d563a959 am: d09503ed"
parents e5262bee 5619f422

packages/EasterEgg/res/drawable/food_bacon.xml→packages/EasterEgg/res/drawable/food_chicken.xml

+16 −1
Original line number Diff line number Diff line
@@ -20,5 +20,20 @@ Copyright (C) 2015 The Android Open Source Project 
        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M42.6,14.9c-0.8,0,-2.6,-1.3,-2.7,-1.6c-0.2,-0.2,-2.2,-0.9,-2.7,-2c-0.2,-0.4,-1.1,-3.4,-1.1,-3.4s0,0,-1.8,3   c-1.8,3,-4.3,3.1,-7.6,3c-3.3,-0.1,-3,3.4,-5.5,5.8c-2.5,2.4,-5.4,3,-9.6,2.5c-4.2,-0.6,-6.8,6.7,-6.8,6.7s1.5,0.5,2.5,0.5s2.5,1.2,3.3,5   c0.8,3.9,5.1,6.5,5.1,6.5s0.1,-6.3,1.2,-9.2c1.1,-2.9,6.4,-0.5,9.8,-1.3c3.4,-0.8,3.3,-4.8,4.2,-6.7c0.9,-1.9,3.9,-2.6,7.6,-3.4   C42.2,19.4,43.4,14.9,42.6,14.9z M13.4,30.7c-0.6,2.1,-0.6,1.7,-0.6,1.7s0,-2.6,0.8,-3.3c0.8,-0.6,4.8,-1,4.8,-1S14.1,28.6,13.4,30.7z    M13.4,25.6c-1.5,0.8,-3,1.8,-3,1.8s-1.1,-1.7,1.1,-2.3c2.2,-0.6,9,0.6,10,-2.2c1,-2.6,3.8,-7.5,4.5,-7.1c-1.5,1.7,-3.1,7,-4.3,8.6   C20.8,25.7,14.9,24.8,13.4,25.6z M31.7,17.3c-2.1,0.9,-3.9,2.3,-5.3,5.7c-1.4,3.3,-3.5,2.7,-3.5,2.7c5.6,-5,3.2,-7.4,5.5,-8.4   c3.5,-1.5,2.6,0.2,4.8,-1.3c2.3,-1.6,3.1,-2.6,3.1,-2.6C36.4,13.4,34.1,16.3,31.7,17.3z"/>

        android:pathData="M9,12v14h10V11H9z M11.7,16.3c-0.7,0,-1.3,-0.6,-1.3,-1.3s0.6,-1.3,1.3,-1.3S13,14.3,13,15S12.4,16.3,11.7,16.3z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M5.7,20.1l1.6,-3.0l-1.6,-3.0l4.4,3.0z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M19.0,6.0l-2.3,2.3l-2.7,-2.6l-2.7,2.6l-2.3,-2.3l0.0,4.0l10.0,0.0z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,25c0,8.3,6.7,15,15,15s15,-6.7,15,-15H9z M29.9,31.5h-11v-1h12L29.9,31.5z M31.9,29.5h-13v-1h14L31.9,29.5z M33.9,27.5   h-15v-1h16L33.9,27.5z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M27.0,38.6h2.0v6.0h-2.0z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M17.4,44.6l-2.1999998,0.0l4.4000006,-6.0l2.1999989,0.0z"/>

</vector>

packages/EasterEgg/res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ Copyright (C) 2016 The Android Open Source Project 
        <item>Empty dish</item>

        <item>Bits</item>

        <item>Fish</item>

        <item>Bacon</item>

        <item>Chicken</item>

        <item>Treat</item>

    </string-array>

    <array name="food_icons">

        <item>@drawable/food_dish</item>

        <item>@drawable/food_bits</item>

        <item>@drawable/food_sysuituna</item>

        <item>@drawable/food_bacon</item>

        <item>@drawable/food_chicken</item>

        <item>@drawable/food_donut</item>

    </array>

    <integer-array name="food_intervals">
@@ -45,8 +45,8 @@ Copyright (C) 2016 The Android Open Source Project 
    <integer-array name="food_new_cat_prob">

        <item>0</item>

        <item>5</item>

        <item>25</item>

        <item>50</item>

        <item>75</item>

        <item>35</item>

        <item>65</item>

        <item>90</item>

    </integer-array>

</resources>