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

Commit f5ea3fd4 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic326-u-a14' into 'v1-u' 

Port A13 changes to A14

See merge request !30
parents f045b603 48859347

java/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ android_app { 
        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

        "androidx.viewpager2_viewpager2",

        "elib",

    ],



    // Do not compress dictionary files to mmap dict data runtime

java/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
     package="com.android.inputmethod.latin"

     android:versionCode="30">



    <uses-sdk android:minSdkVersion="21"

    <uses-sdk android:minSdkVersion="29"

         android:targetSdkVersion="30"/>



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

java/res/drawable/btn_keyboard_key_action_normal_you.xml

+7 −1
Original line number Diff line number Diff line
@@ -5,5 +5,11 @@ 
-->

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

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

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

    

    <padding android:left="1dp"

             android:top="1dp"

             android:right="1dp"

             android:bottom="1dp" />



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

</shape>

java/res/drawable/btn_keyboard_key_action_pressed_you.xml

+7 −1
Original line number Diff line number Diff line
@@ -5,5 +5,11 @@ 
-->

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

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

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

    

    <padding android:left="1dp"

             android:top="1dp"

             android:right="1dp"

             android:bottom="1dp" />



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

</shape>

java/res/drawable/sym_keyboard_delete_you.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ 
    android:viewportHeight="24"

    android:autoMirrored="true">

    <path

        android:fillColor="@color/icon_color_you"

        android:fillColor="@color/keyboard_key_text_color_you"

        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM22,19L7.07,19L2.4,12l4.66,-7L22,5v14zM10.41,17L14,13.41 17.59,17 19,15.59 15.41,12 19,8.41 17.59,7 14,10.59 10.41,7 9,8.41 12.59,12 9,15.59z" />

</vector>