diff options
Diffstat (limited to 'src/com/android/launcher3/IconPackHelper.java')
| -rw-r--r-- | src/com/android/launcher3/IconPackHelper.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/IconPackHelper.java b/src/com/android/launcher3/IconPackHelper.java index 520e8df8b..ec206ce0d 100644 --- a/src/com/android/launcher3/IconPackHelper.java +++ b/src/com/android/launcher3/IconPackHelper.java @@ -31,9 +31,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; +import android.widget.RadioButton; import android.widget.TextView; import android.widget.Toast; +import com.android.launcher3.Launcher; import com.android.launcher3.settings.SettingsProvider; public class IconPackHelper { @@ -297,6 +299,7 @@ public class IconPackHelper { builder.setAdapter(adapter, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int position) { if (adapter.isOriginalIconPack(position)) { + ((Launcher) context).getWorkspace().exitOverviewMode(true); return; } String selectedPackage = adapter.getItem(position); @@ -304,6 +307,7 @@ public class IconPackHelper { SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, selectedPackage); LauncherAppState.getInstance().getIconCache().flush(); LauncherAppState.getInstance().getModel().forceReload(); + ((Launcher) context).getWorkspace().exitOverviewMode(true); } }); } else { @@ -427,9 +431,9 @@ public class IconPackHelper { txtView.setText(info.label); ImageView imgView = (ImageView) convertView.findViewById(R.id.icon); imgView.setImageDrawable(info.icon); - ImageView chk = (ImageView) convertView.findViewById(R.id.check); + RadioButton radioButton = (RadioButton) convertView.findViewById(R.id.radio); boolean isCurrentIconPack = info.packageName.equals(mCurrentIconPack); - chk.setVisibility(isCurrentIconPack ? View.VISIBLE : View.GONE); + radioButton.setChecked(isCurrentIconPack); if (isCurrentIconPack) { mCurrentIconPackPosition = position; } |