Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update TextServicesManager API." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-09 04:31:24 +00:00
committed by Android (Google) Code Review
parent 039e9a41cd f9fa524ff6
commit bc77f26761
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -52267,9 +52267,8 @@ package android.view.textservice {
}
public final class TextServicesManager {
method @Nullable public android.view.textservice.SpellCheckerInfo getCurrentSpellChecker();
method @Nullable public android.view.textservice.SpellCheckerSubtype getCurrentSpellCheckerSubtype(boolean);
method @Nullable public java.util.List<android.view.textservice.SpellCheckerInfo> getEnabledSpellCheckersList();
method @Nullable public android.view.textservice.SpellCheckerInfo getCurrentSpellCheckerInfo();
method @Nullable public java.util.List<android.view.textservice.SpellCheckerInfo> getEnabledSpellCheckerInfos();
method public boolean isSpellCheckerEnabled();
method @Nullable public android.view.textservice.SpellCheckerSession newSpellCheckerSession(@Nullable android.os.Bundle, @Nullable java.util.Locale, @NonNull android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean);
method @Nullable public android.view.textservice.SpellCheckerSession newSpellCheckerSession(@Nullable android.os.Bundle, @Nullable java.util.Locale, @NonNull android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean, int);

22
core/java/android/view/textservice/TextServicesManager.java
View File

@@ -257,9 +257,11 @@ public final class TextServicesManager {
}
/**
* Deprecated. Use {@link #getEnabledSpellCheckerInfos()} instead.
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553,
publicAlternatives = "Use {@link #getEnabledSpellCheckerInfos()} instead.")
public SpellCheckerInfo[] getEnabledSpellCheckers() {
try {
final SpellCheckerInfo[] retval = mService.getEnabledSpellCheckers(mUserId);
@@ -279,7 +281,7 @@ public final class TextServicesManager {
*/
@Nullable
@SuppressLint("NullableCollection")
public List<SpellCheckerInfo> getEnabledSpellCheckersList() {
public List<SpellCheckerInfo> getEnabledSpellCheckerInfos() {
final SpellCheckerInfo[] enabledSpellCheckers = getEnabledSpellCheckers();
return enabledSpellCheckers != null ? Arrays.asList(enabledSpellCheckers) : null;
}
@@ -290,7 +292,7 @@ public final class TextServicesManager {
* @return The current active spell checker info.
*/
@Nullable
public SpellCheckerInfo getCurrentSpellChecker() {
public SpellCheckerInfo getCurrentSpellCheckerInfo() {
try {
// Passing null as a locale for ICS
return mService.getCurrentSpellChecker(mUserId, null);
@@ -299,13 +301,27 @@ public final class TextServicesManager {
}
}
/**
* Deprecated. Use {@link #getCurrentSpellCheckerInfo()} instead.
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R,
publicAlternatives = "Use {@link #getCurrentSpellCheckerInfo()} instead.")
@Nullable
public SpellCheckerInfo getCurrentSpellChecker() {
return getCurrentSpellCheckerInfo();
}
/**
* Retrieve the selected subtype of the selected spell checker, or null if there is none.
*
* @param allowImplicitlySelectedSubtype {@code true} to return the default language matching
* system locale if there's no subtype selected explicitly, otherwise, returns null.
* @return The meta information of the selected subtype of the selected spell checker.
*
* @hide
*/
@UnsupportedAppUsage
@Nullable
public SpellCheckerSubtype getCurrentSpellCheckerSubtype(
boolean allowImplicitlySelectedSubtype) {