Merge remote-tracking branch 'goog/ub-calculator-euler'

Bug: 35489652
Test: lunch aosp_bullhead-userdebug && make -j24
Change-Id: Ibe8659f257b1106213df8befe88678d05ae576bf

1 files changed, 34 insertions, 0 deletions

diff --git a/res/layout/activity_calculator_main.xml b/res/layout/activity_calculator_main.xml
new file mode 100644
index 0000000..2e9d62d
--- /dev/null
+++ b/res/layout/activity_calculator_main.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2016 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.android.calculator2.DragLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drag_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/main_calculator"
+        layout="@layout/activity_calculator" />
+
+    <FrameLayout
+        android:id="@+id/history_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible" />
+
+</com.android.calculator2.DragLayout>