diff options
author | Danesh M <daneshm90@gmail.com> | 2014-06-05 22:25:24 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:03:33 -0700 |
commit | 737960c9f6df4a1c5f011442155868370c5abec1 (patch) | |
tree | 7fe11273dc0f9de0810554742f295ef4e6322b7b | |
parent | 671ee3eefeada570197c81e4db0837b7d95dae65 (diff) | |
download | android_packages_apps_Trebuchet-737960c9f6df4a1c5f011442155868370c5abec1.tar.gz android_packages_apps_Trebuchet-737960c9f6df4a1c5f011442155868370c5abec1.tar.bz2 android_packages_apps_Trebuchet-737960c9f6df4a1c5f011442155868370c5abec1.zip |
Revert "Trebuchet : Improve iconpack selection UI"
This reverts commit 5f1823ecd69b1fb45a5e9f098d3019d31f1ca51e.
-rw-r--r-- | res/layout/iconpack_chooser.xml | 17 | ||||
-rw-r--r-- | src/com/android/launcher3/IconPackHelper.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/res/layout/iconpack_chooser.xml b/res/layout/iconpack_chooser.xml index 105a95969..6caf9f765 100644 --- a/res/layout/iconpack_chooser.xml +++ b/res/layout/iconpack_chooser.xml @@ -16,14 +16,13 @@ android:paddingEnd="8dip" android:layout_gravity="center_vertical" android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textSize="19sp"/> - <RadioButton - android:id="@+id/radio" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge"/> + <ImageView + android:src="@*android:drawable/ic_cab_done_holo_dark" + android:id="@+id/check" android:layout_gravity="center_vertical" - android:focusable="false" - android:clickable="false" - android:duplicateParentState="true" /> + android:layout_width="@dimen/app_icon_size" + android:layout_height="@dimen/app_icon_size" + android:layout_margin="8dp"/> + </LinearLayout> diff --git a/src/com/android/launcher3/IconPackHelper.java b/src/com/android/launcher3/IconPackHelper.java index ec206ce0d..520e8df8b 100644 --- a/src/com/android/launcher3/IconPackHelper.java +++ b/src/com/android/launcher3/IconPackHelper.java @@ -31,11 +31,9 @@ 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 { @@ -299,7 +297,6 @@ 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); @@ -307,7 +304,6 @@ 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 { @@ -431,9 +427,9 @@ public class IconPackHelper { txtView.setText(info.label); ImageView imgView = (ImageView) convertView.findViewById(R.id.icon); imgView.setImageDrawable(info.icon); - RadioButton radioButton = (RadioButton) convertView.findViewById(R.id.radio); + ImageView chk = (ImageView) convertView.findViewById(R.id.check); boolean isCurrentIconPack = info.packageName.equals(mCurrentIconPack); - radioButton.setChecked(isCurrentIconPack); + chk.setVisibility(isCurrentIconPack ? View.VISIBLE : View.GONE); if (isCurrentIconPack) { mCurrentIconPackPosition = position; } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0ed481cfd..a811b5ed0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2865,7 +2865,7 @@ public class Launcher extends Activity } } - protected Workspace getWorkspace() { + Workspace getWorkspace() { return mWorkspace; } |