aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
diff options
context:
space:
mode:
authorJatin Matani <jatinm@google.com>2015-07-13 10:34:03 -0700
committerJatin Matani <jatinm@google.com>2015-07-13 10:40:26 -0700
commit80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1 (patch)
treedac73f877b51df06f1e8715c45e05761694e7f85 /java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
parentb4b19735182767df88f3a196a94c4a943423e72b (diff)
parent9cd60fe1bb67cec755c1cee6d541272e64129072 (diff)
downloadlatinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.tar.gz
latinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.tar.xz
latinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.zip
resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
index f2e1aed4c..a6fb7f1f1 100644
--- a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
@@ -26,6 +26,7 @@ import android.preference.Preference;
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
import com.android.inputmethod.latin.R;
+import com.android.inputmethod.latin.SystemBroadcastReceiver;
import com.android.inputmethod.latin.define.ProductionFlags;
/**
@@ -106,6 +107,8 @@ public final class AdvancedSettingsFragment extends SubScreenFragment {
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)) {
+ SystemBroadcastReceiver.toggleAppIcon(getActivity());
}
updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
refreshEnablingsOfKeypressSoundAndVibrationSettings();