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

Commit 7dbb3b9f authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic340-a15-a15_bringup' into 'a15' 

Port keyboard changes from A14

See merge request !41
parents c8c9625d 559ce5b3

build.gradle

+2 −25
Original line number Diff line number Diff line
@@ -15,23 +15,12 @@ android { 


    namespace 'com.android.inputmethod.latin'



    // Required if using classes in android.test.runner

    useLibrary 'android.test.runner'



    // Required if using classes in android.test.base

    useLibrary 'android.test.base'



    // Required if using classes in android.test.mock

    useLibrary 'android.test.mock'



    defaultConfig {

        minSdkVersion 30

        targetSdkVersion 34

        versionName "1.0"



        applicationId 'com.android.inputmethod.latin'

        testApplicationId 'com.android.inputmethod.latin.tests'

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        vectorDrawables.useSupportLibrary = false



        signingConfig signingConfigs.debug
@@ -65,12 +54,6 @@ android { 
            java.srcDirs = ['common/src', 'java/src']

            manifest.srcFile 'java/AndroidManifest.xml'

        }



        androidTest {

            res.srcDirs = ['tests/res']

            java.srcDirs = ['tests/src']

            manifest.srcFile "tests/AndroidManifest.xml"

        }

    }
@@ -90,6 +73,7 @@ android { 
repositories {

    maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }

    maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }

    maven { url "https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven" }

    mavenCentral()

    google()

    jcenter()
@@ -101,12 +85,5 @@ dependencies { 
    implementation 'com.google.android.material:material:1.9.0'

    implementation 'androidx.preference:preference:1.2.1'



    testImplementation 'junit:junit:4.12'

    androidTestImplementation "org.mockito:mockito-core:1.9.5"

    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'

    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'

    androidTestImplementation 'androidx.test.ext:junit:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'

    androidTestImplementation 'androidx.annotation:annotation:1.0.0'

    implementation("foundation.e:elib:0.0.1-alpha11")

}

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/res/drawable/ic_ime_switch.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24"

    android:width="24dp">

    <path

        android:fillColor="@color/e_keyboard_key_text"

        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>

</vector>

java/res/layout/main_keyboard_frame.xml

+37 −19
Original line number Diff line number Diff line
@@ -18,10 +18,15 @@ 
*/

-->



<LinearLayout

<FrameLayout

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:orientation="vertical">
@@ -43,3 +48,16 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

    </LinearLayout>



    <ImageButton

        android:id="@+id/floating_button"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:padding="12dp"

        android:layout_gravity="top|end"

        android:background="@android:color/transparent"

        android:src="@drawable/ic_ime_switch"

        android:contentDescription="@string/ime_switch_button"

        android:focusable="true"

        android:clickable="true" />

</FrameLayout>

java/res/values/e_strings.xml

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

<!--

  ~ Copyright Murena SAS 2025

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

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

     <string name="ime_switch_button">Speech to text</string>

</resources>