PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor spell checker settings a bit

Browse Source 
This CL removes unnecessary SpellCheckerUtils class.

Change-Id: I1b94b76620fee9119df726b86cec73fb32c0ee8b
This commit is contained in:
Tadashi G. Takaoka
2014-07-04 21:28:17 +09:00
parent 550913497f
commit 47f6f81b72
2 changed files with 40 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/inputmethod/SpellCheckerUtils.java
View File

@@ -1,47 +0,0 @@
/*
* Copyright (C) 2011 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import android.util.Log;
import android.view.textservice.SpellCheckerInfo;
import android.view.textservice.TextServicesManager;
public class SpellCheckerUtils {
private static final String TAG = SpellCheckerUtils.class.getSimpleName();
private static final boolean DBG = false;
public static void setSpellCheckersEnabled(TextServicesManager tsm, boolean enable) {
}
public static boolean getSpellCheckersEnabled(TextServicesManager tsm) {
return true;
}
public static void setCurrentSpellChecker(TextServicesManager tsm, SpellCheckerInfo info) {
}
public static SpellCheckerInfo getCurrentSpellChecker(TextServicesManager tsm) {
final SpellCheckerInfo retval = tsm.getCurrentSpellChecker();
if (DBG) {
Log.d(TAG, "getCurrentSpellChecker: " + retval);
}
return retval;
}
public static SpellCheckerInfo[] getEnabledSpellCheckers(TextServicesManager tsm) {
final SpellCheckerInfo[] retval = tsm.getEnabledSpellCheckers();
if (DBG) {
Log.d(TAG, "get spell checkers: " + retval.length);
}
return retval;
}
}

95
src/com/android/settings/inputmethod/SpellCheckersSettings.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -31,6 +28,9 @@ import android.util.Log;
import android.view.textservice.SpellCheckerInfo; import android.view.textservice.SpellCheckerInfo;
import android.view.textservice.TextServicesManager; import android.view.textservice.TextServicesManager;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.ArrayList; import java.util.ArrayList;
public class SpellCheckersSettings extends SettingsPreferenceFragment public class SpellCheckersSettings extends SettingsPreferenceFragment
@@ -42,19 +42,20 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
private SpellCheckerInfo mCurrentSci; private SpellCheckerInfo mCurrentSci;
private SpellCheckerInfo[] mEnabledScis; private SpellCheckerInfo[] mEnabledScis;
private TextServicesManager mTsm; private TextServicesManager mTsm;
private final ArrayList<SingleSpellCheckerPreference> mSpellCheckers = private final ArrayList<SingleSpellCheckerPreference> mSpellCheckers = new ArrayList<>();
new ArrayList<SingleSpellCheckerPreference>();
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(final Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
mTsm = (TextServicesManager) getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE); mTsm = (TextServicesManager) getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
addPreferencesFromResource(R.xml.spellchecker_prefs); addPreferencesFromResource(R.xml.spellchecker_prefs);
updateScreen(); updateScreen();
} }
// Override the behavior of {@link PreferenceFragment}.
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) { public boolean onPreferenceTreeClick(final PreferenceScreen screen,
final Preference preference) {
return false; return false;
} }
@@ -64,28 +65,18 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
updateScreen(); updateScreen();
} }
@Override
public void onPause() {
super.onPause();
saveState();
}
private void saveState() {
SpellCheckerUtils.setCurrentSpellChecker(mTsm, mCurrentSci);
}
private void updateScreen() { private void updateScreen() {
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
updateEnabledSpellCheckers(); updateEnabledSpellCheckers();
} }
private void updateEnabledSpellCheckers() { private void updateEnabledSpellCheckers() {
final PackageManager pm = getPackageManager(); mCurrentSci = mTsm.getCurrentSpellChecker();
mCurrentSci = SpellCheckerUtils.getCurrentSpellChecker(mTsm); mEnabledScis = mTsm.getEnabledSpellCheckers();
mEnabledScis = SpellCheckerUtils.getEnabledSpellCheckers(mTsm);
if (mCurrentSci == null || mEnabledScis == null) { if (mCurrentSci == null || mEnabledScis == null) {
return; return;
} }
final PackageManager pm = getPackageManager();
mSpellCheckers.clear(); mSpellCheckers.clear();
for (int i = 0; i < mEnabledScis.length; ++i) { for (int i = 0; i < mEnabledScis.length; ++i) {
final SpellCheckerInfo sci = mEnabledScis[i]; final SpellCheckerInfo sci = mEnabledScis[i];
@@ -99,18 +90,15 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
} }
@Override @Override
public boolean onPreferenceClick(Preference pref) { public boolean onPreferenceClick(final Preference pref) {
SingleSpellCheckerPreference targetScp = null; for (final SingleSpellCheckerPreference scp : mSpellCheckers) {
for (SingleSpellCheckerPreference scp : mSpellCheckers) {
if (pref.equals(scp)) { if (pref.equals(scp)) {
targetScp = scp; if (isSystemApp(scp.getSpellCheckerInfo())) {
} changeCurrentSpellChecker(scp);
} } else {
if (targetScp != null) { showSecurityWarnDialog(scp);
if (!isSystemApp(targetScp.getSpellCheckerInfo())) { }
showSecurityWarnDialog(targetScp); return true;
} else {
changeCurrentSpellChecker(targetScp);
} }
} }
return true; return true;
@@ -120,39 +108,36 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
if (mDialog != null && mDialog.isShowing()) { if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss(); mDialog.dismiss();
} }
mDialog = (new AlertDialog.Builder(getActivity())) final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
.setTitle(android.R.string.dialog_alert_title) builder.setTitle(android.R.string.dialog_alert_title);
.setCancelable(true) final PackageManager pm = getPackageManager();
.setPositiveButton(android.R.string.ok, builder.setMessage(getString(R.string.spellchecker_security_warning,
new DialogInterface.OnClickListener() { scp.getSpellCheckerInfo().getServiceInfo().applicationInfo.loadLabel(pm)));
@Override builder.setCancelable(true);
public void onClick(DialogInterface dialog, int which) { builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
changeCurrentSpellChecker(scp); @Override
} public void onClick(final DialogInterface dialog, final int which) {
}) changeCurrentSpellChecker(scp);
.setNegativeButton(android.R.string.cancel, }
new DialogInterface.OnClickListener() { });
@Override builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { @Override
} public void onClick(final DialogInterface dialog, final int which) {
}) }
.create(); });
mDialog.setMessage(getResources().getString(R.string.spellchecker_security_warning, mDialog = builder.create();
scp.getSpellCheckerInfo().getServiceInfo().applicationInfo.loadLabel(
getActivity().getPackageManager())));
mDialog.show(); mDialog.show();
} }
private void changeCurrentSpellChecker(SingleSpellCheckerPreference scp) { private void changeCurrentSpellChecker(final SingleSpellCheckerPreference scp) {
mTsm.setCurrentSpellChecker(scp.getSpellCheckerInfo()); mTsm.setCurrentSpellChecker(scp.getSpellCheckerInfo());
if (DBG) { if (DBG) {
Log.d(TAG, "Current spell check is " Log.d(TAG, "Current spell check is " + mTsm.getCurrentSpellChecker().getId());
+ SpellCheckerUtils.getCurrentSpellChecker(mTsm).getId());
} }
updateScreen(); updateScreen();
} }
private static boolean isSystemApp(SpellCheckerInfo sci) { private static boolean isSystemApp(final SpellCheckerInfo sci) {
return (sci.getServiceInfo().applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; return (sci.getServiceInfo().applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
} }
} }