Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed509cb authored by Fan Zhang's avatar Fan Zhang
Browse files

Some code cleanup 

- Formatting
- Remove unused code

Test: robotests
Change-Id: If259c7c3893df96744f3c0ad62a378ef6ce01de7
parent a0372028

src/com/android/settings/dashboard/DashboardAdapter.java

+30 −49
Original line number Diff line number Diff line
@@ -94,19 +94,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
        }

    };



    private View.OnClickListener mConditionClickListener = new View.OnClickListener() {



        @Override

        public void onClick(View v) {

            Condition condition = (Condition) v.getTag();

            //TODO: get rid of setTag/getTag

            mMetricsFeatureProvider.action(mContext,

                    MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,

                    condition.getMetricsConstant());

            condition.onPrimaryClick();

        }

    };



    public DashboardAdapter(Context context, Bundle savedInstanceState,

            List<Condition> conditions, SuggestionParser suggestionParser,

            SuggestionDismissController.Callback callback) {
@@ -454,11 +441,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
    }



    private void onBindTile(DashboardItemHolder holder, Tile tile) {

        if (tile.remoteViews != null) {

            final ViewGroup itemView = (ViewGroup) holder.itemView;

            itemView.removeAllViews();

            itemView.addView(tile.remoteViews.apply(itemView.getContext(), itemView));

        } else {

        holder.icon.setImageDrawable(mCache.getIcon(tile.icon));

        holder.title.setText(tile.title);

        if (!TextUtils.isEmpty(tile.summary)) {
@@ -468,7 +450,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
            holder.summary.setVisibility(View.GONE);

        }

    }

    }



    private void tintIcons(DashboardCategory category, List<Tile> suggestions) {

        if (!mDashboardFeatureProvider.shouldTintIcon()) {

src/com/android/settings/dashboard/DashboardData.java

+2 −26
Original line number Diff line number Diff line
@@ -171,30 +171,6 @@ public class DashboardData { 
        return POSITION_NOT_FOUND;

    }



    /**

     * Get the count of suggestions to display

     *

     * The displayable count mainly depends on the {@link #mSuggestionConditionMode}

     * and the size of suggestions list.

     *

     * When in default mode, displayable count couldn't be larger than

     * {@link #DEFAULT_SUGGESTION_COUNT}.

     *

     * When in expanded mode, display all the suggestions.

     *

     * @return the count of suggestions to display

     */

    public int getDisplayableSuggestionCount() {

        final int suggestionSize = sizeOf(mSuggestions);

        if (mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {

            return 0;

        }

        if (mSuggestionConditionMode == HEADER_MODE_DEFAULT) {

            return Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize);

        }

        return suggestionSize;

    }



    /**

     * Add item into list when {@paramref add} is true.

     *
@@ -280,7 +256,7 @@ public class DashboardData { 
        if (conditions == null) {

            return null;

        }

        List<Condition> result = new ArrayList<Condition>();

        List<Condition> result = new ArrayList<>();

        final int size = conditions == null ? 0 : conditions.size();

        for (int i = 0; i < size; i++) {

            final Condition condition = conditions.get(i);
@@ -482,7 +458,7 @@ public class DashboardData { 
            conditionCount = sizeOf(conditions);

            this.hiddenSuggestionCount = hiddenSuggestionCount;

            title = conditionCount > 0 ? conditions.get(0).getTitle() : null;

            conditionIcons = new ArrayList<Icon>();

            conditionIcons = new ArrayList<>();

            for (int i = 0; conditions != null && i < conditions.size(); i++) {

                final Condition condition = conditions.get(i);

                conditionIcons.add(condition.getIcon());