From a2376cd2b4fea6b655fdcdf794cf16b7bbe1a161 Mon Sep 17 00:00:00 2001 From: Chieu Nguyen Date: Wed, 22 Apr 2015 14:41:45 -0700 Subject: Restore switch for showing app icon. Bug: 20307420 Change-Id: I95969de40936d2ea992669324d0c4df7e8de2bd9 --- .../com/android/inputmethod/latin/SystemBroadcastReceiver.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java') diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java index 2a69d3650..0d081e0d2 100644 --- a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java +++ b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java @@ -20,9 +20,11 @@ import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Process; +import android.preference.PreferenceManager; import android.util.Log; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; @@ -30,6 +32,7 @@ import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.dictionarypack.CommonPreferences; import com.android.inputmethod.dictionarypack.DictionaryPackConstants; import com.android.inputmethod.keyboard.KeyboardLayoutSet; +import com.android.inputmethod.latin.settings.Settings; import com.android.inputmethod.latin.setup.SetupActivity; import com.android.inputmethod.latin.utils.UncachedInputMethodManagerUtils; @@ -112,11 +115,12 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver { if (Log.isLoggable(TAG, Log.INFO)) { Log.i(TAG, "toggleAppIcon() : FLAG_SYSTEM = " + isSystemApp); } + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); context.getPackageManager().setComponentEnabledSetting( new ComponentName(context, SetupActivity.class), - isSystemApp - ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED - : PackageManager.COMPONENT_ENABLED_STATE_ENABLED, + Settings.readShowSetupWizardIcon(prefs, context) + ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED + : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); } } -- cgit v1.2.3-83-g751a