diff options
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsGridAdapter.java')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index a48390732..17d106731 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -41,6 +41,7 @@ import com.android.launcher3.BubbleTextView; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.Thunk; import java.util.HashMap; @@ -356,7 +357,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. @Thunk Paint mSectionTextPaint; @Thunk Paint mPredictedAppsDividerPaint; - private int mIconSize; private int mAllAppsTextColor; public AllAppsGridAdapter(Launcher launcher, AlphabeticalAppsList apps, @@ -381,11 +381,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. res.getDimensionPixelSize(R.dimen.all_apps_grid_view_start_margin) : res.getDimensionPixelSize(R.dimen.all_apps_grid_view_start_margin_with_sections); - mIconSize = mSectionStrategy == - AllAppsContainerView.SECTION_STRATEGY_GRID ? - res.getDimensionPixelSize(R.dimen.all_apps_icon_size_grid) : - res.getDimensionPixelSize(R.dimen.all_apps_icon_size_ragged); - mAllAppsTextColor = mGridTheme == AllAppsContainerView.GRID_THEME_DARK ? res.getColor(R.color.quantum_panel_text_color_dark) : res.getColor(R.color.quantum_panel_text_color); @@ -440,10 +435,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. AllAppsContainerView.SECTION_STRATEGY_GRID ? res.getDimensionPixelSize(R.dimen.all_apps_grid_view_start_margin) : res.getDimensionPixelSize(R.dimen.all_apps_grid_view_start_margin_with_sections); - mIconSize = mSectionStrategy == - AllAppsContainerView.SECTION_STRATEGY_GRID ? - res.getDimensionPixelSize(R.dimen.all_apps_icon_size_grid) : - res.getDimensionPixelSize(R.dimen.all_apps_icon_size_ragged); } /** @@ -487,12 +478,18 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + boolean hideIconLabels = SettingsProvider.getBoolean(mLauncher, + SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS, + R.bool.preferences_interface_drawer_hide_icon_labels_default); switch (viewType) { case SECTION_BREAK_VIEW_TYPE: return new ViewHolder(new View(parent.getContext())); case ICON_VIEW_TYPE: { BubbleTextView icon = (BubbleTextView) mLayoutInflater.inflate( R.layout.all_apps_icon, parent, false); + if (hideIconLabels) { + icon.setTextVisibility(!hideIconLabels); + } icon.setOnTouchListener(mTouchListener); icon.setOnClickListener(mIconClickListener); icon.setOnLongClickListener(mIconLongClickListener); @@ -504,6 +501,9 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. case PREDICTION_ICON_VIEW_TYPE: { BubbleTextView icon = (BubbleTextView) mLayoutInflater.inflate( R.layout.all_apps_prediction_bar_icon, parent, false); + if (hideIconLabels) { + icon.setTextVisibility(!hideIconLabels); + } icon.setOnTouchListener(mTouchListener); icon.setOnClickListener(mIconClickListener); icon.setOnLongClickListener(mIconLongClickListener); @@ -535,12 +535,17 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. @Override public void onBindViewHolder(ViewHolder holder, int position) { + boolean hideIconLabels = SettingsProvider.getBoolean(mLauncher, + SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS, + R.bool.preferences_interface_drawer_hide_icon_labels_default); switch (holder.getItemViewType()) { case ICON_VIEW_TYPE: { AppInfo info = mApps.getAdapterItems().get(position).appInfo; BubbleTextView icon = (BubbleTextView) holder.mContent; - icon.setIconSize(mIconSize); icon.setTextColor(mAllAppsTextColor); + if (hideIconLabels) { + icon.setTextVisibility(!hideIconLabels); + } icon.applyFromApplicationInfo(info); icon.setFastScrollDimmed(mIconsDimmed, !mIconsDimmed); break; @@ -548,8 +553,10 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. case PREDICTION_ICON_VIEW_TYPE: { AppInfo info = mApps.getAdapterItems().get(position).appInfo; BubbleTextView icon = (BubbleTextView) holder.mContent; - icon.setIconSize(mIconSize); icon.setTextColor(mAllAppsTextColor); + if (hideIconLabels) { + icon.setTextVisibility(!hideIconLabels); + } icon.applyFromApplicationInfo(info); break; } |