Merge "Trebuchet : Improve iconpack selection UI" into cm-11.0

3 files changed, 16 insertions, 11 deletions

diff --git a/res/layout/iconpack_chooser.xml b/res/layout/iconpack_chooser.xml
index 6caf9f765..105a95969 100644
--- a/res/layout/iconpack_chooser.xml
+++ b/res/layout/iconpack_chooser.xml
@@ -16,13 +16,14 @@
         android:paddingEnd="8dip"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-    <ImageView
-        android:src="@*android:drawable/ic_cab_done_holo_dark"
-        android:id="@+id/check"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="19sp"/>
+    <RadioButton
+        android:id="@+id/radio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_width="@dimen/app_icon_size"
-        android:layout_height="@dimen/app_icon_size"
-        android:layout_margin="8dp"/>
-
+        android:focusable="false"
+        android:clickable="false"
+        android:duplicateParentState="true" />
 </LinearLayout>
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;
             }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e88109aef..0073b4ca4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2913,7 +2913,7 @@ public class Launcher extends Activity
         }
     }
 
-    Workspace getWorkspace() {
+    protected Workspace getWorkspace() {
         return mWorkspace;
     }