diff options
Diffstat (limited to 'src/com/android/settings/AccessibilitySettings.java')
| -rw-r--r-- | src/com/android/settings/AccessibilitySettings.java | 106 |
1 files changed, 78 insertions, 28 deletions
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index 826410d..bbb3678 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -16,14 +16,18 @@ package com.android.settings; +import android.accessibilityservice.AccessibilityServiceInfo; +import android.app.ActivityManagerNative; import android.app.AlertDialog; import android.app.Dialog; import android.app.Service; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ServiceInfo; +import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; +import android.os.RemoteException; import android.os.SystemProperties; import android.preference.CheckBoxPreference; import android.preference.ListPreference; @@ -50,7 +54,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private static final String DEFAULT_SCREENREADER_MARKET_LINK = "market://search?q=pname:com.google.android.marvin.talkback"; - private final String TOGGLE_ACCESSIBILITY_CHECKBOX = + private static final float LARGE_FONT_SCALE = 1.3f; + + private static final String TOGGLE_LARGE_TEXT_CHECKBOX = + "toggle_large_text_checkbox"; + + private static final String TOGGLE_ACCESSIBILITY_CHECKBOX = "toggle_accessibility_service_checkbox"; private static final String ACCESSIBILITY_SERVICES_CATEGORY = @@ -65,10 +74,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private static final String POWER_BUTTON_ENDS_CALL_CHECKBOX = "power_button_ends_call"; - private final String KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX = + private static final String KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX = "key_toggle_accessibility_service_checkbox"; - private final String KEY_LONG_PRESS_TIMEOUT_LIST_PREFERENCE = + private static final String KEY_LONG_PRESS_TIMEOUT_LIST_PREFERENCE = "long_press_timeout_list_preference"; private static final int DIALOG_ID_DISABLE_ACCESSIBILITY = 1; @@ -76,9 +85,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private static final int DIALOG_ID_ENABLE_ACCESSIBILITY_SERVICE = 3; private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 4; + private CheckBoxPreference mToggleLargeTextCheckBox; private CheckBoxPreference mToggleAccessibilityCheckBox; private CheckBoxPreference mToggleScriptInjectionCheckBox; - private CheckBoxPreference mToggleAccessibilityServiceCheckBox; + private SettingsCheckBoxPreference mToggleAccessibilityServiceCheckBox; private PreferenceCategory mPowerButtonCategory; private CheckBoxPreference mPowerButtonEndsCallCheckBox; @@ -87,8 +97,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private ListPreference mLongPressTimeoutListPreference; - private Map<String, ServiceInfo> mAccessibilityServices = - new LinkedHashMap<String, ServiceInfo>(); + private final Configuration mCurConfig = new Configuration(); + + private Map<String, AccessibilityServiceInfo> mAccessibilityServices = + new LinkedHashMap<String, AccessibilityServiceInfo>(); private TextUtils.SimpleStringSplitter mStringColonSplitter = new TextUtils.SimpleStringSplitter(':'); @@ -99,6 +111,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements addPreferencesFromResource(R.xml.accessibility_settings); + mToggleLargeTextCheckBox = (CheckBoxPreference) findPreference( + TOGGLE_LARGE_TEXT_CHECKBOX); + mAccessibilityServicesCategory = (PreferenceGroup) findPreference(ACCESSIBILITY_SERVICES_CATEGORY); @@ -144,7 +159,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements @Override public void onActivityCreated(Bundle savedInstanceState) { - addAccessibilitServicePreferences(); + addAccessibilityServicePreferences(); final HashSet<String> enabled = new HashSet<String>(); String settingValue = Settings.Secure.getString(getContentResolver(), @@ -157,7 +172,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } } - Map<String, ServiceInfo> accessibilityServices = mAccessibilityServices; + Map<String, AccessibilityServiceInfo> accessibilityServices = mAccessibilityServices; for (String key : accessibilityServices.keySet()) { CheckBoxPreference preference = (CheckBoxPreference) findPreference(key); @@ -191,6 +206,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES); } + readFontSizePreference(); + super.onActivityCreated(savedInstanceState); } @@ -230,9 +247,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements throw new IllegalArgumentException( KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX + " must be mapped to an instance of a " - + CheckBoxPreference.class.getName()); + + SettingsCheckBoxPreference.class.getName()); } - mToggleAccessibilityServiceCheckBox = (CheckBoxPreference) preference; + mToggleAccessibilityServiceCheckBox = (SettingsCheckBoxPreference) preference; } } @@ -250,10 +267,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements int count = mAccessibilityServicesCategory.getPreferenceCount(); for (int i = 0; i < count; i++) { Preference pref = mAccessibilityServicesCategory.getPreference(i); - pref.setEnabled(isEnabled); + if (pref != mToggleAccessibilityCheckBox) { + pref.setEnabled(isEnabled); + } } - - mToggleScriptInjectionCheckBox.setEnabled(isEnabled); } @Override @@ -262,6 +279,13 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements if (TOGGLE_ACCESSIBILITY_CHECKBOX.equals(key)) { handleEnableAccessibilityStateChange((CheckBoxPreference) preference); + } else if (TOGGLE_LARGE_TEXT_CHECKBOX.equals(key)) { + try { + mCurConfig.fontScale = mToggleLargeTextCheckBox.isChecked() + ? LARGE_FONT_SCALE : 1; + ActivityManagerNative.getDefault().updateConfiguration(mCurConfig); + } catch (RemoteException e) { + } } else if (POWER_BUTTON_ENDS_CALL_CHECKBOX.equals(key)) { boolean isChecked = ((CheckBoxPreference) preference).isChecked(); // The checkbox is labeled "Power button ends call"; thus the in-call @@ -274,7 +298,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } else if (TOGGLE_ACCESSIBILITY_SCRIPT_INJECTION_CHECKBOX.equals(key)) { handleToggleAccessibilityScriptInjection((CheckBoxPreference) preference); } else if (preference instanceof CheckBoxPreference) { - handleEnableAccessibilityServiceStateChange((CheckBoxPreference) preference); + handleEnableAccessibilityServiceStateChange((SettingsCheckBoxPreference) preference); } return super.onPreferenceTreeClick(preferenceScreen, preference); @@ -318,7 +342,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements * * @param preference The preference. */ - private void handleEnableAccessibilityServiceStateChange(CheckBoxPreference preference) { + private void handleEnableAccessibilityServiceStateChange( + SettingsCheckBoxPreference preference) { if (preference.isChecked()) { mToggleAccessibilityServiceCheckBox = preference; // set right enabled state since the user may press back @@ -353,32 +378,56 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements /** * Adds {@link CheckBoxPreference} for enabling or disabling an accessibility services. */ - private void addAccessibilitServicePreferences() { + private void addAccessibilityServicePreferences() { AccessibilityManager accessibilityManager = (AccessibilityManager) getSystemService(Service.ACCESSIBILITY_SERVICE); - List<ServiceInfo> installedServices = accessibilityManager.getAccessibilityServiceList(); + List<AccessibilityServiceInfo> installedServices = + accessibilityManager.getInstalledAccessibilityServiceList(); - if (installedServices.isEmpty()) { - getPreferenceScreen().removePreference(mAccessibilityServicesCategory); - return; + for (int i = 0; i < mAccessibilityServicesCategory.getPreferenceCount(); i++) { + Preference pref = mAccessibilityServicesCategory.getPreference(i); + if (pref != mToggleAccessibilityCheckBox + && pref != mToggleScriptInjectionCheckBox) { + mAccessibilityServicesCategory.removePreference(pref); + i--; + } } - getPreferenceScreen().addPreference(mAccessibilityServicesCategory); - for (int i = 0, count = installedServices.size(); i < count; ++i) { - ServiceInfo serviceInfo = installedServices.get(i); - String key = serviceInfo.packageName + "/" + serviceInfo.name; - - if (mAccessibilityServices.put(key, serviceInfo) == null) { - CheckBoxPreference preference = new CheckBoxPreference(getActivity()); + AccessibilityServiceInfo accessibilityServiceInfo = installedServices.get(i); + String key = accessibilityServiceInfo.getId(); + + if (mAccessibilityServices.put(key, accessibilityServiceInfo) == null) { + String settingsActivityName = accessibilityServiceInfo.getSettingsActivityName(); + Intent settingsIntent = null; + if (!TextUtils.isEmpty(settingsActivityName)) { + String packageName = accessibilityServiceInfo.getResolveInfo() + .serviceInfo.packageName; + settingsIntent = new Intent(Intent.ACTION_MAIN); + settingsIntent.setClassName(packageName, settingsActivityName); + } + SettingsCheckBoxPreference preference = new SettingsCheckBoxPreference( + getActivity(), settingsIntent); preference.setKey(key); + preference.setOrder(i); + ServiceInfo serviceInfo = accessibilityServiceInfo.getResolveInfo().serviceInfo; preference.setTitle(serviceInfo.loadLabel(getActivity().getPackageManager())); mAccessibilityServicesCategory.addPreference(preference); } } } + public void readFontSizePreference() { + try { + mCurConfig.updateFrom( + ActivityManagerNative.getDefault().getConfiguration()); + } catch (RemoteException e) { + } + mToggleLargeTextCheckBox.setChecked(Float.compare(mCurConfig.fontScale, + LARGE_FONT_SCALE) == 0); + } + @Override public Dialog onCreateDialog(int dialogId) { switch (dialogId) { @@ -424,7 +473,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements .setMessage(getResources().getString( R.string.accessibility_service_security_warning, mAccessibilityServices.get(mToggleAccessibilityServiceCheckBox.getKey()) - .applicationInfo.loadLabel(getActivity().getPackageManager()))) + .getResolveInfo().serviceInfo.applicationInfo.loadLabel( + getActivity().getPackageManager()))) .setCancelable(true) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { |