Commit ec2413b2 authored Apr 26, 2016 by Justin Klaassen Committed by android-build-merger Apr 26, 2016

Merge remote-tracking branch \'goog/ub-calculator-algebra\'

am: 61c83393

* commit '61c83393': (40 commits)
  Invoke View#performLongClick()
  Don't use Google proprietary launcher icon
  Add styles.xml for sw360dp-long-port.
  Allow clear if unprocessed chars
  Show/Hide Toolbar
  Persist "inv" selected state
  Tap to open/close advanced pad
  Always calculate textSize in CalculatorText#onMeasure
  Tune colors for accessibility
  Correctly set formula text size after rotation
  Fix factorial(0)
  Correct behavior with erroneous pasted text
  Account for scale in ActionMode.Callback2#onGetContentRect
  Cancel in-progress computations before saving state
  Cleanup of timeout handling and message
  Implicitly clear on incomplete keyboard input
  Import translations. DO NOT MERGE
  Generalize % operator: Handle 100+10% as expected
  Import translations. DO NOT MERGE
  Check for decimal point after adding ellipsis
  ...

Change-Id: Ibd54376161eeb201f408747c57d0c9d0b8fe71ce

parents 194ba6f1 61c83393

res/layout/display.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		limitations under the License.
		-->

		<RelativeLayout
		<com.android.calculator2.CalculatorDisplay
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/display"
		android:layout_width="match_parent"
		@@ -61,4 +61,4 @@
		android:singleLine="true"
		android:textColor="@color/display_result_text_color" />

		</RelativeLayout>
		</com.android.calculator2.CalculatorDisplay>

res/mipmap-hdpi/ic_launcher_calculator.png

100755 → 100644

+1.48 KiB (4.15 KiB)

Loading image diff...

res/mipmap-mdpi/ic_launcher_calculator.png

100755 → 100644

+622 B (2.3 KiB)

Loading image diff...

res/mipmap-xhdpi/ic_launcher_calculator.png

100755 → 100644

+3.01 KiB (6.47 KiB)

Loading image diff...

res/mipmap-xxhdpi/ic_launcher_calculator.png

100755 → 100644

+5.84 KiB (11.3 KiB)

Loading image diff...