summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in oc-release history after reset to oc-devlineage-15.0gitbuildkicker2017-05-110-0/+0
|\
| * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-300-0/+0
| |\
| | * merge in oc-release history after reset to mastergitbuildkicker2017-03-130-0/+0
| | |\
| | | * merge in oc-release history after reset to d0d3a22d1a64e1b03c82f64bbacb515d9f...gitbuildkicker2017-03-130-0/+0
| | | |\ | | | |/ | | |/|
* | / | Import translations. DO NOT MERGEBill Yi2017-05-105-8/+8
|/ / /
* / / Import translations. DO NOT MERGEBill Yi2017-04-2821-31/+31
|/ /
* / Import translations. DO NOT MERGEBill Yi2017-03-121-1/+1
|/
* Import translations. DO NOT MERGEBill Yi2017-02-2781-162/+891
* Merge remote-tracking branch 'goog/ub-calculator-euler' am: e5459bb447 am: 0e...Justin Klaassen2017-02-2782-2212/+5646
|\
| * Merge remote-tracking branch 'goog/ub-calculator-euler' am: e5459bb447Justin Klaassen2017-02-2782-2212/+5646
| |\
| | * Merge remote-tracking branch 'goog/ub-calculator-euler'Justin Klaassen2017-02-2782-2212/+5646
| |/|
| | * Merge remote-tracking branch 'goog/ub-calculator-euler'Justin Klaassen2017-02-2482-2212/+5646
| | |\
| | | * Merge "Fix "disappearing history fragment" issue." into ub-calculator-eulerTreeHugger Robot2017-02-093-35/+15
| | | |\
| | | | * Fix "disappearing history fragment" issue.Annie Chin2017-02-093-35/+15
| | | * | Do not evaluate when in RESULT state.Annie Chin2017-02-091-2/+3
| | | |/
| | | * Merge "Null-check the mainResult before calling .exactlyDisplayable()" into u...Annie Chin2017-02-031-2/+6
| | | |\
| | | | * Null-check the mainResult before calling .exactlyDisplayable()Annie Chin2017-02-021-2/+6
| | | * | Merge "Deal with small displays and a cancellation race" into ub-calculator-e...Hans Boehm2017-02-032-1/+13
| | | |\ \
| | | | * | Deal with small displays and a cancellation raceHans Boehm2017-02-022-1/+13
| | | * | | Null-check result string.Annie Chin2017-02-021-1/+3
| | | | |/ | | | |/|
| | | * | Catch IllegalArgumentException in CalculatorPadViewPager.Annie Chin2017-02-021-39/+50
| | | * | Cancel drag in DragLayout if pointer is invalid.Annie Chin2017-02-022-1/+11
| | | * | Merge "Snapshot display empty state once on creation of HistoryFragment." int...TreeHugger Robot2017-02-024-46/+31
| | | |\ \
| | | | * | Snapshot display empty state once on creation of HistoryFragment.Annie Chin2017-01-314-46/+31
| | | * | | Consider error message invalid for ActionMode/ContextMenu operations.Annie Chin2017-02-021-3/+2
| | | | |/ | | | |/|
| | | * | Merge "Change popBackStackImmediate to popBackStack." into ub-calculator-eulerAnnie Chin2017-02-011-2/+1
| | | |\ \
| | | | * | Change popBackStackImmediate to popBackStack.Annie Chin2017-01-311-2/+1
| | | | |/
| | | * / Do not use HISTORY_MAIN_INDEX as clipboard or memory indexHans Boehm2017-02-013-38/+70
| | | |/
| | | * Merge "Move values-w230dp-h220dp to values/" into ub-calculator-eulerTreeHugger Robot2017-01-315-109/+71
| | | |\
| | | | * Move values-w230dp-h220dp to values/Annie Chin2017-01-315-109/+71
| | | * | Annotate Evaluator.getInstance as NonNullAnnie Chin2017-01-302-27/+27
| | | |/
| | | * Merge "Null-check mEvaluator onDestroy()" into ub-calculator-eulerAnnie Chin2017-01-301-3/+5
| | | |\
| | | | * Null-check mEvaluator onDestroy()Annie Chin2017-01-301-3/+5
| | | * | Add android-support-v7-recyclerview dependencyJustin Klaassen2017-01-274-94/+4
| | | |/
| | | * Merge "Fix potential inconsistent DragLayout state" into ub-calculator-eulerTreeHugger Robot2017-01-091-27/+22
| | | |\
| | | | * Fix potential inconsistent DragLayout stateJustin Klaassen2017-01-091-27/+22
| | | * | Merge "Correct Unicode representation of "M-"" into ub-calculator-eulerChristine Franks2017-01-091-1/+1
| | | |\ \ | | | | |/ | | | |/|
| | | | * Correct Unicode representation of "M-"Christine Franks2017-01-091-1/+1
| | | * | Don't re-use mHistoryFragmentJustin Klaassen2017-01-087-181/+230
| | | * | Merge "Set mIsOpen in DragLayout.setClosed()/Open()" into ub-calculator-eulerAnnie Chin2017-01-061-2/+2
| | | |\ \
| | | | * | Set mIsOpen in DragLayout.setClosed()/Open()Annie Chin2016-12-191-2/+2
| | | * | | Merge "Polish History multiwindow support." into ub-calculator-eulerAnnie Chin2017-01-069-29/+51
| | | |\ \ \
| | | | * | | Polish History multiwindow support.Annie Chin2017-01-059-29/+51
| | | * | | | Remove HistoryFragment.onCreateAnimator.Annie Chin2017-01-052-23/+3
| | | * | | | Directly implement CloseCallback/DragCallback.Annie Chin2017-01-052-74/+81
| | | * | | | Merge "Changes for testing CalculatorFormula" into ub-calculator-eulerJustin Klaassen2017-01-054-44/+64
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Changes for testing CalculatorFormulaChristine Franks2017-01-044-44/+64
| | | * | | | Merge "Import translations. DO NOT MERGE" into ub-calculator-eulerTreeHugger Robot2017-01-051-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Import translations. DO NOT MERGEBill Yi2017-01-051-1/+1
| | | | |/ /
| | | * / / Make onSaveInstanceState wait for database writesHans Boehm2017-01-043-0/+54
| | | |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:57:34 +0000