Changes for testing CalculatorFormula
Bug: 33458518
Test: manual - compiles, and can still enter, calculate, and inflate
the context menus on API 21 and 25.
Change-Id: Ib5f01e89854248c77cb6484bca46086f34be1ca7
diff --git a/src/com/android/calculator2/CalculatorFormula.java b/src/com/android/calculator2/CalculatorFormula.java
index b342792..2911df8 100644
--- a/src/com/android/calculator2/CalculatorFormula.java
+++ b/src/com/android/calculator2/CalculatorFormula.java
@@ -55,9 +55,9 @@
private final ClipboardManager mClipboardManager;
private int mWidthConstraint = -1;
- protected ActionMode mActionMode;
+ private ActionMode mActionMode;
private ActionMode.Callback mPasteActionModeCallback;
- protected ContextMenu mContextMenu;
+ private ContextMenu mContextMenu;
private OnTextSizeChangeListener mOnTextSizeChangeListener;
private OnFormulaContextMenuClickListener mOnContextMenuClickListener;
private Calculator.OnDisplayMemoryOperationsListener mOnDisplayMemoryOperationsListener;
@@ -184,20 +184,6 @@
return lastFitTextSize;
}
- private static boolean startsWith(CharSequence whole, CharSequence prefix) {
- int wholeLen = whole.length();
- int prefixLen = prefix.length();
- if (prefixLen > wholeLen) {
- return false;
- }
- for (int i = 0; i < prefixLen; ++i) {
- if (prefix.charAt(i) != whole.charAt(i)) {
- return false;
- }
- }
- return true;
- }
-
/**
* Functionally equivalent to setText(), but explicitly announce changes.
* If the new text is an extension of the old one, announce the addition.
@@ -377,7 +363,7 @@
}
private boolean isMemoryEnabled() {
- return !(mOnDisplayMemoryOperationsListener == null || mOnContextMenuClickListener == null)
+ return mOnDisplayMemoryOperationsListener != null
&& mOnDisplayMemoryOperationsListener.shouldDisplayMemory();
}