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

Commit c4dce219 authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Do not use Fragment#getContext()" into ub-calculator-euler

parents e0a5df00 7d03963e

src/com/android/calculator2/HistoryAdapter.java

+7 −10
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold 
    private static final int EMPTY_VIEW_TYPE = 0;

    private static final int HISTORY_VIEW_TYPE = 1;



    private final Evaluator mEvaluator;

    /* Text/accessibility descriptor for the current expression item. */

    private final String mCurrentExpressionDescription;

    private Evaluator mEvaluator;



    private final Calendar mCalendar = Calendar.getInstance();
@@ -46,11 +44,8 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold 


    private boolean mIsResultLayout;



    public HistoryAdapter(Calculator calculator, ArrayList<HistoryItem> dataSet,

            String currentExpressionDescription) {

        mEvaluator = Evaluator.getInstance(calculator);

    public HistoryAdapter(ArrayList<HistoryItem> dataSet) {

        mDataSet = dataSet;

        mCurrentExpressionDescription = currentExpressionDescription;

        setHasStableIds(true);

    }
@@ -79,8 +74,7 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold 
        // Note: HistoryItems that are not the current expression will always have interesting ops.

        holder.mResult.setEvaluator(mEvaluator, item.getEvaluatorIndex());

        if (item.getEvaluatorIndex() == Evaluator.HISTORY_MAIN_INDEX) {

            holder.mDate.setText(mCurrentExpressionDescription);

            holder.mDate.setContentDescription(mCurrentExpressionDescription);

            holder.mDate.setText(R.string.title_current_expression);

        } else {

            // If the previous item occurred on the same date, the current item does not need

            // a date header.
@@ -105,7 +99,6 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold 


        holder.mDate.setVisibility(View.VISIBLE);

        holder.mDivider.setVisibility(View.VISIBLE);

        holder.mDate.setContentDescription(null);

        holder.mDate.setText(null);

        holder.mFormula.setText(null);

        holder.mResult.setText(null);
@@ -136,6 +129,10 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold 
        mIsResultLayout = isResult;

    }



    public void setEvaluator(Evaluator evaluator) {

        mEvaluator = evaluator;

    }



    private int getEvaluatorIndex(int position) {

        if (EvaluatorStateUtils.isDisplayEmpty(mEvaluator) || mIsResultLayout) {

            return (int) (mEvaluator.getMaxIndex() - position);

src/com/android/calculator2/HistoryFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ public class HistoryFragment extends Fragment { 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        mAdapter = new HistoryAdapter((Calculator) getActivity(), mDataSet,

                getContext().getResources().getString(R.string.title_current_expression));

        mAdapter = new HistoryAdapter(mDataSet);

    }



    @Override
@@ -138,6 +137,9 @@ public class HistoryFragment extends Fragment { 
        super.onActivityCreated(savedInstanceState);



        final Calculator activity = (Calculator) getActivity();



        mAdapter.setEvaluator(Evaluator.getInstance(activity));



        final boolean isResultLayout = activity.isResultLayout();



        mDragLayout = (DragLayout) activity.findViewById(R.id.drag_layout);