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

Merge "Add functions to enable / disable spell checker"

Browse Source
This commit is contained in:
satok
2011-08-25 01:21:05 -07:00
committed by Android (Google) Code Review
parent 7420f13394 a33c4fc5be
commit 1e3fac8bc6
4 changed files with 94 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@@ -3784,6 +3784,13 @@ public final class Settings {
public static final String SELECTED_SPELL_CHECKER_SUBTYPE =
"selected_spell_checker_subtype";
/**
* The {@link ComponentName} string whether spell checker is enabled or not.
*
* @hide
*/
public static final String SPELL_CHECKER_ENABLED = "spell_checker_enabled";
/**
* What happens when the user presses the Power button while in-call
* and the screen is on.<br/>

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

@@ -170,5 +170,26 @@ public final class TextServicesManager {
}
}
/**
* @hide
*/
public void setSpellCheckerEnabled(boolean enabled) {
try {
sService.setSpellCheckerEnabled(enabled);
} catch (RemoteException e) {
Log.e(TAG, "Error in setSpellCheckerSubtype:" + e);
}
}
/**
* @hide
*/
public boolean isSpellCheckerEnabled() {
try {
return sService.isSpellCheckerEnabled();
} catch (RemoteException e) {
Log.e(TAG, "Error in setSpellCheckerSubtype:" + e);
return false;
}
}
}

2
core/java/com/android/internal/textservice/ITextServicesManager.aidl
View File

@@ -37,5 +37,7 @@ interface ITextServicesManager {
oneway void finishSpellCheckerService(in ISpellCheckerSessionListener listener);
oneway void setCurrentSpellChecker(String locale, String sciId);
oneway void setCurrentSpellCheckerSubtype(String locale, int hashCode);
oneway void setSpellCheckerEnabled(boolean enabled);
boolean isSpellCheckerEnabled();
SpellCheckerInfo[] getEnabledSpellCheckers();
}

68
services/java/com/android/server/TextServicesManagerService.java
View File

@@ -173,7 +173,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
@Override
public SpellCheckerInfo getCurrentSpellChecker(String locale) {
synchronized (mSpellCheckerMap) {
String curSpellCheckerId =
final String curSpellCheckerId =
Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.SELECTED_SPELL_CHECKER);
if (DBG) {
@@ -197,10 +197,16 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
Slog.w(TAG, "getCurrentSpellChecker: " + subtypeHashCodeStr);
}
final SpellCheckerInfo sci = getCurrentSpellChecker(null);
if (sci.getSubtypeCount() == 0) {
if (sci == null || sci.getSubtypeCount() == 0) {
if (DBG) {
Slog.w(TAG, "Subtype not found.");
}
return null;
}
if (TextUtils.isEmpty(subtypeHashCodeStr)) {
if (DBG) {
Slog.w(TAG, "Return first subtype in " + sci.getId());
}
// Return the first Subtype if there is no settings for the current subtype.
return sci.getSubtypeAt(0);
}
@@ -208,9 +214,15 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
for (int i = 0; i < sci.getSubtypeCount(); ++i) {
final SpellCheckerSubtype scs = sci.getSubtypeAt(i);
if (scs.hashCode() == hashCode) {
if (DBG) {
Slog.w(TAG, "Return subtype " + scs.hashCode());
}
return scs;
}
}
if (DBG) {
Slog.w(TAG, "Return first subtype in " + sci.getId());
}
return sci.getSubtypeAt(0);
}
}
@@ -283,6 +295,13 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
return;
}
@Override
public boolean isSpellCheckerEnabled() {
synchronized(mSpellCheckerMap) {
return isSpellCheckerEnabledLocked();
}
}
private void startSpellCheckerServiceInnerLocked(SpellCheckerInfo info, String locale,
ITextServicesSessionListener tsListener, ISpellCheckerSessionListener scListener,
int uid, Bundle bundle) {
@@ -354,7 +373,21 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
"Requires permission "
+ android.Manifest.permission.WRITE_SECURE_SETTINGS);
}
setCurrentSpellCheckerLocked(hashCode);
setCurrentSpellCheckerSubtypeLocked(hashCode);
}
}
@Override
public void setSpellCheckerEnabled(boolean enabled) {
synchronized(mSpellCheckerMap) {
if (mContext.checkCallingOrSelfPermission(
android.Manifest.permission.WRITE_SECURE_SETTINGS)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException(
"Requires permission "
+ android.Manifest.permission.WRITE_SECURE_SETTINGS);
}
setSpellCheckerEnabledLocked(enabled);
}
}
@@ -372,7 +405,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
}
}
private void setCurrentSpellCheckerLocked(int hashCode) {
private void setCurrentSpellCheckerSubtypeLocked(int hashCode) {
if (DBG) {
Slog.w(TAG, "setCurrentSpellCheckerSubtype: " + hashCode);
}
@@ -397,6 +430,33 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
}
}
private void setSpellCheckerEnabledLocked(boolean enabled) {
if (DBG) {
Slog.w(TAG, "setSpellCheckerEnabled: " + enabled);
}
final long ident = Binder.clearCallingIdentity();
try {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.SPELL_CHECKER_ENABLED, enabled ? 1 : 0);
} finally {
Binder.restoreCallingIdentity(ident);
}
}
private boolean isSpellCheckerEnabledLocked() {
final long ident = Binder.clearCallingIdentity();
try {
final boolean retval = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.SPELL_CHECKER_ENABLED, 1) == 1;
if (DBG) {
Slog.w(TAG, "getSpellCheckerEnabled: " + retval);
}
return retval;
} finally {
Binder.restoreCallingIdentity(ident);
}
}
// SpellCheckerBindGroup contains active text service session listeners.
// If there are no listeners anymore, the SpellCheckerBindGroup instance will be removed from
// mSpellCheckerBindGroups