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

Commit f5699918 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 

Bug: 298295554
Merged-In: If13ac9b81cfe65730d5ce270e9409bc97cef75ec
Change-Id: I15108feab97251425a55faa3dea1dbb5d6e709e0
parents 7c8c0319 e79bbb96

TEST_MAPPING

+16 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "WallpaperPicker2Tests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "ThemePickerTests",

      "options": [
@@ -7,6 +15,14 @@ 
          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "WallpaperPickerGoogleTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ]

}

res/color/keyguard_quick_affordance_slot_tab_background_color.xml→res/color/picker_fragment_tab_background_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



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

    <item android:state_selected="true" android:color="@color/color_accent_primary" />

    <item android:state_selected="true" android:color="@color/system_primary" />

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

</selector>

res/color/picker_fragment_tab_text_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



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

    <item android:state_selected="true" android:color="@color/text_color_on_accent" />

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

    <item android:state_selected="true" android:color="@color/system_on_primary" />

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

</selector>

res/values-en-rCA/clock_colors.xml→res/drawable/carousel_item_card_background.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2023 The Android Open Source Project
@@ -14,18 +14,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string-array name="clock_color_ids">

    <item msgid="4948142733161826319">"RED"</item>

    <item msgid="6882970855289978213">"ORANGE"</item>

    <item msgid="5560732545714984533">"YELLOW"</item>

    <item msgid="7246284817845434226">"GREEN"</item>

    <item msgid="6762906417604676001">"BLUE"</item>

    <item msgid="8974135109557664892">"INDIGO"</item>

    <item msgid="786643557830463422">"VIOLET"</item>

    <item msgid="6835537356703747621">"GRAY"</item>

    <item msgid="2470141365136884119">"TEAL"</item>

  </string-array>

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

    android:shape="rectangle">

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

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

</shape>
 
 No newline at end of file

res/values-en-rGB/clock_colors.xml→res/drawable/clock_color_size_button_background.xml

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

<!--

     Copyright (C) 2023 The Android Open Source Project
@@ -14,18 +13,15 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:color="?android:colorControlHighlight">



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string-array name="clock_color_ids">

    <item msgid="4948142733161826319">"RED"</item>

    <item msgid="6882970855289978213">"ORANGE"</item>

    <item msgid="5560732545714984533">"YELLOW"</item>

    <item msgid="7246284817845434226">"GREEN"</item>

    <item msgid="6762906417604676001">"BLUE"</item>

    <item msgid="8974135109557664892">"INDIGO"</item>

    <item msgid="786643557830463422">"VIOLET"</item>

    <item msgid="6835537356703747621">"GREY"</item>

    <item msgid="2470141365136884119">"TEAL"</item>

  </string-array>

</resources>
 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

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

            <solid android:color="?android:colorControlHighlight" />

        </shape>

    </item>



    <item android:drawable="@drawable/clock_color_size_button_background_base" />

</ripple>