Merge "Use fragment for advanced preference screen" into lmp-dev
Tadashi G. Takaoka
Android (Google) Code Review
commit
1e491d90f9
|
|
@ -41,37 +41,7 @@
|
|||
android:title="@string/settings_screen_correction"
|
||||
android:key="screen_correction" />
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.inputmethod.latin.settings.AdvancedSettingsFragment"
|
||||
android:title="@string/settings_screen_advanced"
|
||||
android:key="screen_advanced">
|
||||
<!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->
|
||||
<ListPreference
|
||||
android:key="pref_key_preview_popup_dismiss_delay"
|
||||
android:title="@string/key_preview_popup_dismiss_delay" />
|
||||
<com.android.inputmethod.latin.settings.SeekBarDialogPreference
|
||||
android:key="pref_vibration_duration_settings"
|
||||
android:title="@string/prefs_keypress_vibration_duration_settings"
|
||||
latin:maxValue="@integer/config_max_vibration_duration" />
|
||||
<com.android.inputmethod.latin.settings.SeekBarDialogPreference
|
||||
android:key="pref_keypress_sound_volume"
|
||||
android:title="@string/prefs_keypress_sound_volume_settings"
|
||||
latin:maxValue="100" /> <!-- percent -->
|
||||
<!-- The settigs for showing setup wizard application icon shouldn't be persistent and
|
||||
the default value is added programmatically. -->
|
||||
<CheckBoxPreference
|
||||
android:key="pref_show_setup_wizard_icon"
|
||||
android:title="@string/show_setup_wizard_icon"
|
||||
android:summary="@string/show_setup_wizard_icon_summary" />
|
||||
<!-- title will be set programmatically to embed application name -->
|
||||
<CheckBoxPreference
|
||||
android:key="pref_enable_metrics_logging"
|
||||
android:summary="@string/enable_metrics_logging_summary"
|
||||
android:defaultValue="true"
|
||||
android:persistent="true" />
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.inputmethod.latin.settings.DebugSettingsFragment"
|
||||
android:key="screen_debug"
|
||||
android:title="Debug settings"
|
||||
android:defaultValue="false"
|
||||
android:persistent="true" />
|
||||
</PreferenceScreen>
|
||||
android:key="screen_advanced" />
|
||||
</PreferenceScreen>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||
android:title="@string/settings_screen_advanced"
|
||||
android:key="screen_advanced">
|
||||
<!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->
|
||||
<ListPreference
|
||||
android:key="pref_key_preview_popup_dismiss_delay"
|
||||
android:title="@string/key_preview_popup_dismiss_delay" />
|
||||
<com.android.inputmethod.latin.settings.SeekBarDialogPreference
|
||||
android:key="pref_vibration_duration_settings"
|
||||
android:title="@string/prefs_keypress_vibration_duration_settings"
|
||||
latin:maxValue="@integer/config_max_vibration_duration" />
|
||||
<com.android.inputmethod.latin.settings.SeekBarDialogPreference
|
||||
android:key="pref_keypress_sound_volume"
|
||||
android:title="@string/prefs_keypress_sound_volume_settings"
|
||||
latin:maxValue="100" /> <!-- percent -->
|
||||
<!-- The settings for showing setup wizard application icon shouldn't be persistent and
|
||||
the default value is added programmatically. -->
|
||||
<CheckBoxPreference
|
||||
android:key="pref_show_setup_wizard_icon"
|
||||
android:title="@string/show_setup_wizard_icon"
|
||||
android:summary="@string/show_setup_wizard_icon_summary" />
|
||||
<!-- title will be set programmatically to embed application name -->
|
||||
<CheckBoxPreference
|
||||
android:key="pref_enable_metrics_logging"
|
||||
android:summary="@string/enable_metrics_logging_summary"
|
||||
android:defaultValue="true"
|
||||
android:persistent="true" />
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.inputmethod.latin.settings.DebugSettingsFragment"
|
||||
android:key="screen_debug"
|
||||
android:title="Debug settings"
|
||||
android:defaultValue="false"
|
||||
android:persistent="true" />
|
||||
</PreferenceScreen>
|
||||
|
|
@ -0,0 +1,248 @@
|
|||
/*
|
||||
* Copyright (C) 2014 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.inputmethod.latin.settings;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Resources;
|
||||
import android.media.AudioManager;
|
||||
import android.os.Bundle;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.TwoStatePreference;
|
||||
|
||||
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
|
||||
import com.android.inputmethod.latin.R;
|
||||
import com.android.inputmethod.latin.define.ProductionFlags;
|
||||
import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager;
|
||||
|
||||
/**
|
||||
* "Advanced" settings sub screen.
|
||||
*
|
||||
* This settings sub screen handles the following advanced preferences.
|
||||
* - Key popup dismiss delay
|
||||
* - Keypress vibration duration
|
||||
* - Keypress sound volume
|
||||
* - Show app icon
|
||||
* - Improve keyboard
|
||||
* - Debug settings
|
||||
*/
|
||||
public final class AdvancedSettingsFragment extends SubScreenFragment {
|
||||
@Override
|
||||
public void onCreate(final Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
addPreferencesFromResource(R.xml.prefs_screen_advanced);
|
||||
|
||||
final Resources res = getResources();
|
||||
final Context context = getActivity();
|
||||
|
||||
// When we are called from the Settings application but we are not already running, some
|
||||
// singleton and utility classes may not have been initialized. We have to call
|
||||
// initialization method of these classes here. See {@link LatinIME#onCreate()}.
|
||||
AudioAndHapticFeedbackManager.init(context);
|
||||
|
||||
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
|
||||
|
||||
if (!Settings.isInternal(prefs)) {
|
||||
removePreference(Settings.SCREEN_DEBUG);
|
||||
}
|
||||
|
||||
if (!AudioAndHapticFeedbackManager.getInstance().hasVibrator()) {
|
||||
removePreference(Settings.PREF_VIBRATION_DURATION_SETTINGS);
|
||||
}
|
||||
|
||||
// TODO: consolidate key preview dismiss delay with the key preview animation parameters.
|
||||
if (!Settings.readFromBuildConfigIfToShowKeyPreviewPopupOption(res)) {
|
||||
removePreference(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
} else {
|
||||
// TODO: Cleanup this setup.
|
||||
final ListPreference keyPreviewPopupDismissDelay =
|
||||
(ListPreference) findPreference(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
final String popupDismissDelayDefaultValue = Integer.toString(res.getInteger(
|
||||
R.integer.config_key_preview_linger_timeout));
|
||||
keyPreviewPopupDismissDelay.setEntries(new String[] {
|
||||
res.getString(R.string.key_preview_popup_dismiss_no_delay),
|
||||
res.getString(R.string.key_preview_popup_dismiss_default_delay),
|
||||
});
|
||||
keyPreviewPopupDismissDelay.setEntryValues(new String[] {
|
||||
"0",
|
||||
popupDismissDelayDefaultValue
|
||||
});
|
||||
if (null == keyPreviewPopupDismissDelay.getValue()) {
|
||||
keyPreviewPopupDismissDelay.setValue(popupDismissDelayDefaultValue);
|
||||
}
|
||||
keyPreviewPopupDismissDelay.setEnabled(
|
||||
Settings.readKeyPreviewPopupEnabled(prefs, res));
|
||||
}
|
||||
|
||||
if (!res.getBoolean(R.bool.config_setup_wizard_available)) {
|
||||
removePreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
|
||||
}
|
||||
|
||||
if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
|
||||
final Preference enableMetricsLogging =
|
||||
findPreference(Settings.PREF_ENABLE_METRICS_LOGGING);
|
||||
if (enableMetricsLogging != null) {
|
||||
final int applicationLabelRes = context.getApplicationInfo().labelRes;
|
||||
final String applicationName = res.getString(applicationLabelRes);
|
||||
final String enableMetricsLoggingTitle = res.getString(
|
||||
R.string.enable_metrics_logging, applicationName);
|
||||
enableMetricsLogging.setTitle(enableMetricsLoggingTitle);
|
||||
}
|
||||
} else {
|
||||
removePreference(Settings.PREF_ENABLE_METRICS_LOGGING);
|
||||
}
|
||||
|
||||
setupKeypressVibrationDurationSettings();
|
||||
setupKeypressSoundVolumeSettings();
|
||||
refreshEnablingsOfKeypressSoundAndVibrationSettings();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
|
||||
final TwoStatePreference showSetupWizardIcon =
|
||||
(TwoStatePreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
|
||||
if (showSetupWizardIcon != null) {
|
||||
showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
|
||||
}
|
||||
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
|
||||
final Resources res = getResources();
|
||||
if (key.equals(Settings.PREF_POPUP_ON)) {
|
||||
setPreferenceEnabled(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY,
|
||||
Settings.readKeyPreviewPopupEnabled(prefs, res));
|
||||
} else if (key.equals(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) {
|
||||
LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
|
||||
}
|
||||
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
refreshEnablingsOfKeypressSoundAndVibrationSettings();
|
||||
}
|
||||
|
||||
private void refreshEnablingsOfKeypressSoundAndVibrationSettings() {
|
||||
final SharedPreferences prefs = getSharedPreferences();
|
||||
final Resources res = getResources();
|
||||
setPreferenceEnabled(Settings.PREF_VIBRATION_DURATION_SETTINGS,
|
||||
Settings.readVibrationEnabled(prefs, res));
|
||||
setPreferenceEnabled(Settings.PREF_KEYPRESS_SOUND_VOLUME,
|
||||
Settings.readKeypressSoundEnabled(prefs, res));
|
||||
}
|
||||
|
||||
private void setupKeypressVibrationDurationSettings() {
|
||||
final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(
|
||||
Settings.PREF_VIBRATION_DURATION_SETTINGS);
|
||||
if (pref == null) {
|
||||
return;
|
||||
}
|
||||
final SharedPreferences prefs = getSharedPreferences();
|
||||
final Resources res = getResources();
|
||||
pref.setInterface(new SeekBarDialogPreference.ValueProxy() {
|
||||
@Override
|
||||
public void writeValue(final int value, final String key) {
|
||||
prefs.edit().putInt(key, value).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDefaultValue(final String key) {
|
||||
prefs.edit().remove(key).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readValue(final String key) {
|
||||
return Settings.readKeypressVibrationDuration(prefs, res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readDefaultValue(final String key) {
|
||||
return Settings.readDefaultKeypressVibrationDuration(res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void feedbackValue(final int value) {
|
||||
AudioAndHapticFeedbackManager.getInstance().vibrate(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValueText(final int value) {
|
||||
if (value < 0) {
|
||||
return res.getString(R.string.settings_system_default);
|
||||
}
|
||||
return res.getString(R.string.abbreviation_unit_milliseconds, value);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setupKeypressSoundVolumeSettings() {
|
||||
final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(
|
||||
Settings.PREF_KEYPRESS_SOUND_VOLUME);
|
||||
if (pref == null) {
|
||||
return;
|
||||
}
|
||||
final SharedPreferences prefs = getSharedPreferences();
|
||||
final Resources res = getResources();
|
||||
final AudioManager am = (AudioManager)getActivity().getSystemService(Context.AUDIO_SERVICE);
|
||||
pref.setInterface(new SeekBarDialogPreference.ValueProxy() {
|
||||
private static final float PERCENTAGE_FLOAT = 100.0f;
|
||||
|
||||
private float getValueFromPercentage(final int percentage) {
|
||||
return percentage / PERCENTAGE_FLOAT;
|
||||
}
|
||||
|
||||
private int getPercentageFromValue(final float floatValue) {
|
||||
return (int)(floatValue * PERCENTAGE_FLOAT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeValue(final int value, final String key) {
|
||||
prefs.edit().putFloat(key, getValueFromPercentage(value)).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDefaultValue(final String key) {
|
||||
prefs.edit().remove(key).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readValue(final String key) {
|
||||
return getPercentageFromValue(Settings.readKeypressSoundVolume(prefs, res));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readDefaultValue(final String key) {
|
||||
return getPercentageFromValue(Settings.readDefaultKeypressSoundVolume(res));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValueText(final int value) {
|
||||
if (value < 0) {
|
||||
return res.getString(R.string.settings_system_default);
|
||||
}
|
||||
return Integer.toString(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void feedbackValue(final int value) {
|
||||
am.playSoundEffect(
|
||||
AudioManager.FX_KEYPRESS_STANDARD, getValueFromPercentage(value));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -22,13 +22,9 @@ import android.content.Context;
|
|||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Resources;
|
||||
import android.media.AudioManager;
|
||||
import android.os.Bundle;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceGroup;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.preference.TwoStatePreference;
|
||||
import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
|
|
@ -37,8 +33,6 @@ import android.view.MenuItem;
|
|||
import com.android.inputmethod.keyboard.KeyboardTheme;
|
||||
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
|
||||
import com.android.inputmethod.latin.R;
|
||||
import com.android.inputmethod.latin.define.ProductionFlags;
|
||||
import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager;
|
||||
import com.android.inputmethod.latin.utils.ApplicationUtils;
|
||||
import com.android.inputmethod.latin.utils.FeedbackUtils;
|
||||
import com.android.inputmethodcommon.InputMethodSettingsFragment;
|
||||
|
|
@ -51,13 +45,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
|
|||
private static final int MENU_FEEDBACK = Menu.FIRST; // The first menu item id and order.
|
||||
private static final int MENU_ABOUT = Menu.FIRST + 1; // The second menu item id and order.
|
||||
|
||||
private void setPreferenceEnabled(final String preferenceKey, final boolean enabled) {
|
||||
final Preference preference = findPreference(preferenceKey);
|
||||
if (preference != null) {
|
||||
preference.setEnabled(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateListPreferenceSummaryToCurrentValue(final String prefKey) {
|
||||
// Because the "%s" summary trick of {@link ListPreference} doesn't work properly before
|
||||
// KitKat, we need to update the summary programmatically.
|
||||
|
|
@ -70,16 +57,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
|
|||
listPreference.setSummary(entryIndex < 0 ? null : entries[entryIndex]);
|
||||
}
|
||||
|
||||
private static void removePreference(final String preferenceKey, final PreferenceGroup parent) {
|
||||
if (parent == null) {
|
||||
return;
|
||||
}
|
||||
final Preference preference = parent.findPreference(preferenceKey);
|
||||
if (preference != null) {
|
||||
parent.removePreference(preference);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(final Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
|
|
@ -103,82 +80,17 @@ public final class SettingsFragment extends InputMethodSettingsFragment
|
|||
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
|
||||
prefs.registerOnSharedPreferenceChangeListener(this);
|
||||
|
||||
final PreferenceScreen advancedScreen =
|
||||
(PreferenceScreen) findPreference(Settings.SCREEN_ADVANCED);
|
||||
final PreferenceScreen debugScreen =
|
||||
(PreferenceScreen) findPreference(Settings.SCREEN_DEBUG);
|
||||
|
||||
if (!Settings.isInternal(prefs)) {
|
||||
advancedScreen.removePreference(debugScreen);
|
||||
}
|
||||
|
||||
if (!AudioAndHapticFeedbackManager.getInstance().hasVibrator()) {
|
||||
removePreference(Settings.PREF_VIBRATION_DURATION_SETTINGS, advancedScreen);
|
||||
}
|
||||
|
||||
// TODO: consolidate key preview dismiss delay with the key preview animation parameters.
|
||||
if (!Settings.readFromBuildConfigIfToShowKeyPreviewPopupOption(res)) {
|
||||
removePreference(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY, advancedScreen);
|
||||
} else {
|
||||
// TODO: Cleanup this setup.
|
||||
final ListPreference keyPreviewPopupDismissDelay =
|
||||
(ListPreference) findPreference(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
final String popupDismissDelayDefaultValue = Integer.toString(res.getInteger(
|
||||
R.integer.config_key_preview_linger_timeout));
|
||||
keyPreviewPopupDismissDelay.setEntries(new String[] {
|
||||
res.getString(R.string.key_preview_popup_dismiss_no_delay),
|
||||
res.getString(R.string.key_preview_popup_dismiss_default_delay),
|
||||
});
|
||||
keyPreviewPopupDismissDelay.setEntryValues(new String[] {
|
||||
"0",
|
||||
popupDismissDelayDefaultValue
|
||||
});
|
||||
if (null == keyPreviewPopupDismissDelay.getValue()) {
|
||||
keyPreviewPopupDismissDelay.setValue(popupDismissDelayDefaultValue);
|
||||
}
|
||||
keyPreviewPopupDismissDelay.setEnabled(
|
||||
Settings.readKeyPreviewPopupEnabled(prefs, res));
|
||||
}
|
||||
|
||||
if (!res.getBoolean(R.bool.config_setup_wizard_available)) {
|
||||
removePreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON, advancedScreen);
|
||||
}
|
||||
|
||||
if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
|
||||
final Preference enableMetricsLogging =
|
||||
findPreference(Settings.PREF_ENABLE_METRICS_LOGGING);
|
||||
if (enableMetricsLogging != null) {
|
||||
final int applicationLabelRes = context.getApplicationInfo().labelRes;
|
||||
final String applicationName = res.getString(applicationLabelRes);
|
||||
final String enableMetricsLoggingTitle = res.getString(
|
||||
R.string.enable_metrics_logging, applicationName);
|
||||
enableMetricsLogging.setTitle(enableMetricsLoggingTitle);
|
||||
}
|
||||
} else {
|
||||
removePreference(Settings.PREF_ENABLE_METRICS_LOGGING, advancedScreen);
|
||||
}
|
||||
|
||||
if (!Settings.readFromBuildConfigIfGestureInputEnabled(res)) {
|
||||
getPreferenceScreen().removePreference(findPreference(Settings.SCREEN_GESTURE));
|
||||
}
|
||||
|
||||
AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(context, this);
|
||||
|
||||
setupKeypressVibrationDurationSettings(prefs, res);
|
||||
setupKeypressSoundVolumeSettings(prefs, res);
|
||||
refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
|
||||
final TwoStatePreference showSetupWizardIcon =
|
||||
(TwoStatePreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
|
||||
if (showSetupWizardIcon != null) {
|
||||
showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
|
||||
}
|
||||
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
final ListPreference keyboardThemePref = (ListPreference)findPreference(
|
||||
Settings.PREF_KEYBOARD_THEME);
|
||||
if (keyboardThemePref != null) {
|
||||
|
|
@ -219,121 +131,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
|
|||
return;
|
||||
}
|
||||
(new BackupManager(activity)).dataChanged();
|
||||
final Resources res = getResources();
|
||||
if (key.equals(Settings.PREF_POPUP_ON)) {
|
||||
setPreferenceEnabled(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY,
|
||||
Settings.readKeyPreviewPopupEnabled(prefs, res));
|
||||
} else if (key.equals(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) {
|
||||
LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
|
||||
}
|
||||
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
|
||||
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEYBOARD_THEME);
|
||||
refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, getResources());
|
||||
}
|
||||
|
||||
private void refreshEnablingsOfKeypressSoundAndVibrationSettings(
|
||||
final SharedPreferences sp, final Resources res) {
|
||||
setPreferenceEnabled(Settings.PREF_VIBRATION_DURATION_SETTINGS,
|
||||
Settings.readVibrationEnabled(sp, res));
|
||||
setPreferenceEnabled(Settings.PREF_KEYPRESS_SOUND_VOLUME,
|
||||
Settings.readKeypressSoundEnabled(sp, res));
|
||||
}
|
||||
|
||||
private void setupKeypressVibrationDurationSettings(final SharedPreferences sp,
|
||||
final Resources res) {
|
||||
final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(
|
||||
Settings.PREF_VIBRATION_DURATION_SETTINGS);
|
||||
if (pref == null) {
|
||||
return;
|
||||
}
|
||||
pref.setInterface(new SeekBarDialogPreference.ValueProxy() {
|
||||
@Override
|
||||
public void writeValue(final int value, final String key) {
|
||||
sp.edit().putInt(key, value).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDefaultValue(final String key) {
|
||||
sp.edit().remove(key).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readValue(final String key) {
|
||||
return Settings.readKeypressVibrationDuration(sp, res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readDefaultValue(final String key) {
|
||||
return Settings.readDefaultKeypressVibrationDuration(res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void feedbackValue(final int value) {
|
||||
AudioAndHapticFeedbackManager.getInstance().vibrate(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValueText(final int value) {
|
||||
if (value < 0) {
|
||||
return res.getString(R.string.settings_system_default);
|
||||
}
|
||||
return res.getString(R.string.abbreviation_unit_milliseconds, value);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setupKeypressSoundVolumeSettings(final SharedPreferences sp, final Resources res) {
|
||||
final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(
|
||||
Settings.PREF_KEYPRESS_SOUND_VOLUME);
|
||||
if (pref == null) {
|
||||
return;
|
||||
}
|
||||
final AudioManager am = (AudioManager)getActivity().getSystemService(Context.AUDIO_SERVICE);
|
||||
pref.setInterface(new SeekBarDialogPreference.ValueProxy() {
|
||||
private static final float PERCENTAGE_FLOAT = 100.0f;
|
||||
|
||||
private float getValueFromPercentage(final int percentage) {
|
||||
return percentage / PERCENTAGE_FLOAT;
|
||||
}
|
||||
|
||||
private int getPercentageFromValue(final float floatValue) {
|
||||
return (int)(floatValue * PERCENTAGE_FLOAT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeValue(final int value, final String key) {
|
||||
sp.edit().putFloat(key, getValueFromPercentage(value)).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDefaultValue(final String key) {
|
||||
sp.edit().remove(key).apply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readValue(final String key) {
|
||||
return getPercentageFromValue(Settings.readKeypressSoundVolume(sp, res));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int readDefaultValue(final String key) {
|
||||
return getPercentageFromValue(Settings.readDefaultKeypressSoundVolume(res));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValueText(final int value) {
|
||||
if (value < 0) {
|
||||
return res.getString(R.string.settings_system_default);
|
||||
}
|
||||
return Integer.toString(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void feedbackValue(final int value) {
|
||||
am.playSoundEffect(
|
||||
AudioManager.FX_KEYPRESS_STANDARD, getValueFromPercentage(value));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ package com.android.inputmethod.latin.utils;
|
|||
|
||||
import com.android.inputmethod.dictionarypack.DictionarySettingsFragment;
|
||||
import com.android.inputmethod.latin.about.AboutPreferences;
|
||||
import com.android.inputmethod.latin.settings.AdvancedSettingsFragment;
|
||||
import com.android.inputmethod.latin.settings.CorrectionSettingsFragment;
|
||||
import com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment;
|
||||
import com.android.inputmethod.latin.settings.DebugSettingsFragment;
|
||||
|
|
@ -43,6 +44,7 @@ public class FragmentUtils {
|
|||
sLatinImeFragments.add(CustomInputStyleSettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(GestureSettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(CorrectionSettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(AdvancedSettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(DebugSettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(SettingsFragment.class.getName());
|
||||
sLatinImeFragments.add(SpellCheckerSettingsFragment.class.getName());
|
||||
|
|
|
|||
Loading…
Reference in New Issue