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

Commit d9b1367e authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3793-main-merge_ime' into 'main' 

Use same LatinIME for current supported Android version

See merge request !49
parents fccc0815 b30ec189

.gitlab-ci.yml

+28 −1
Original line number Diff line number Diff line 
image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest



stages:

  - auto-merge-main

  - update-from-upstream

  - build



include:

  - project: 'e/templates'
@@ -10,8 +13,32 @@ include: 
    ref: master

    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'



main:

auto_merge_main:

  extends: .auto-merge-main

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/

    TARGET_BRANCH: main



upstream_main:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-23.2

    LOCAL_BRANCH: main



before_script:

  - export GRADLE_USER_HOME="$CI_PROJECT_DIR/.gradle"

  - chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

    - .gradle/



build:

  stage: build

  script:

    - ./gradlew assembleDebug

  artifacts:

    when: always

    paths:

      - build/outputs/apk/debug

common/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ java_library { 
    host_supported: true,

    srcs: ["src/**/*.java"],

    static_libs: ["jsr305"],

    sdk_version: "34",

    sdk_version: "current",

}

java/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ android_app { 


    min_sdk_version: "30",

    target_sdk_version: "34",

    sdk_version: "35",

    sdk_version: "current",



    product_specific: true,

java/src/com/android/inputmethod/latin/utils/ResourceUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public final class ResourceUtils { 
    }



    public static int getDefaultKeyboardWidth(final Context context) {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {

        if (Build.VERSION.SDK_INT >= 35) { // Build.VERSION_CODES.VANILLA_ICE_CREAM

            // Since Android 15’s edge-to-edge enforcement, window insets should be considered.

            final WindowManager wm = context.getSystemService(WindowManager.class);

            final WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();