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

Unverified Commit f052ec6f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r1' into lineage-23.0 

Android 16.0.0 release 1

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaEhhFQAKCRDorT+BmrEO
# eGfzAJ9l52bDFnS2376/AvaErebujT+T2gCfYPSFz4FxpQkoDhSeUVA6EHaTWRI=
# =CbQe
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 10 19:45:09 2025 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Adrian Roos (1) and others
# Via Android Build Coastguard Worker (8) and others
* tag 'android-16.0.0_r1':
  packages/inputmethods/LatinIME: remove deprecated Mockito usages
  Explicitly keep default constructor in rules without members
  Fix crash: NPE in SuggestionStripView in LatinIME

Change-Id: Ic916c37f6894b2b222b54c8a95ead314829b339e
parents ee576208 83c7f18f

java/proguard.flags

+28 −7
Original line number Diff line number Diff line 
# Keep classes and methods that have the @UsedForTesting annotation

-keep @com.android.inputmethod.annotations.UsedForTesting class *

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep @com.android.inputmethod.annotations.UsedForTesting class * {

    void <init>();

}

-keepclassmembers class * {

    @com.android.inputmethod.annotations.UsedForTesting *;

}



# Keep classes and methods that have the @ExternallyReferenced annotation

-keep @com.android.inputmethod.annotations.ExternallyReferenced class *

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep @com.android.inputmethod.annotations.ExternallyReferenced class * {

    void <init>();

}

-keepclassmembers class * {

    @com.android.inputmethod.annotations.ExternallyReferenced *;

}
@@ -17,11 +23,26 @@ 


# Keep classes that are used as a parameter type of methods that are also marked as keep

# to preserve changing those methods' signature.

-keep class com.android.inputmethod.latin.AssetFileAddress

-keep class com.android.inputmethod.latin.Dictionary

-keep class com.android.inputmethod.latin.NgramContext

-keep class com.android.inputmethod.latin.makedict.ProbabilityInfo

-keep class com.android.inputmethod.latin.utils.LanguageModelParam

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.inputmethod.latin.AssetFileAddress {

    void <init>();

}

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.inputmethod.latin.Dictionary {

    void <init>();

}

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.inputmethod.latin.NgramContext {

    void <init>();

}

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.inputmethod.latin.makedict.ProbabilityInfo {

    void <init>();

}

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.inputmethod.latin.utils.LanguageModelParam {

    void <init>();

}



# TODO: remove once used in code.

-keep class com.android.inputmethod.keyboard.KeyboardLayout { *; }

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java

+3 −0
Original line number Diff line number Diff line
@@ -343,6 +343,9 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick 
            new GestureDetector.SimpleOnGestureListener() {

        @Override

        public boolean onScroll(MotionEvent down, MotionEvent me, float deltaX, float deltaY) {

            if (down == null) {

                return false;

            }

            final float dy = me.getY() - down.getY();

            if (deltaY > 0 && dy < 0) {

                return showMoreSuggestions();

tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.inputmethod.latin; 


import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.validateMockitoUsage;

import static org.mockito.Mockito.when;

tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.inputmethod.latin.network; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.inputmethod.latin.settings; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.when;



import android.app.AlertDialog;