summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0084b7182..e88109aef 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -152,6 +152,7 @@ public class Launcher extends Activity
private static final int REQUEST_PICK_WALLPAPER = 10;
private static final int REQUEST_BIND_APPWIDGET = 11;
+ static final int REQUEST_PICK_ICON = 13;
/**
* IntentStarter uses request codes starting with this. This must be greater than all activity
@@ -1383,6 +1384,15 @@ public class Launcher extends Activity
});
transitionEffectButton.setOnTouchListener(getHapticFeedbackTouchListener());
+ View iconPackButton = findViewById(R.id.icon_pack_button);
+ iconPackButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ IconPackHelper.pickIconPack(Launcher.this, false);
+ }
+ });
+ iconPackButton.setOnTouchListener(getHapticFeedbackTouchListener());
+
View sortButton = findViewById(R.id.sort_button);
sortButton.setOnClickListener(new OnClickListener() {
@Override
@@ -2914,6 +2924,7 @@ public class Launcher extends Activity
View wallpaperButton = mOverviewPanel.findViewById(R.id.wallpaper_button);
View sortButton = mOverviewPanel.findViewById(R.id.sort_button);
View filterButton = mOverviewPanel.findViewById(R.id.filter_button);
+ View iconPackButton = findViewById(R.id.icon_pack_button);
PagedView pagedView = !isAllAppsVisible() ? mWorkspace : mAppsCustomizeContent;
@@ -2926,6 +2937,13 @@ public class Launcher extends Activity
// filterButton.setVisibility(isAllAppsVisible() ? View.VISIBLE : View.GONE);
filterButton.setVisibility(View.GONE);
+ boolean isVisible = !isAllAppsVisible();
+ if (isVisible) {
+ int numIconPacks = IconPackHelper.getSupportedPackages(this).size();
+ isVisible = numIconPacks > 0;
+ }
+ iconPackButton.setVisibility(isVisible ? View.VISIBLE : View.GONE);
+
// Make sure overview panel is drawn above apps customize
mOverviewPanel.bringToFront();
}