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

Commit d48dbd3a authored by Justin Klaassen's avatar Justin Klaassen Committed by android-build-merger
Browse files

Merge remote-tracking branch 'goog/ub-calculator-euler' am: e5459bb4 

am: 0e0cf472

Change-Id: I77b914a99b678518efe0f688fc78c64e318773e1
parents 8b6ca823 0e0cf472

Android.mk

+22 −7
Original line number Diff line number Diff line
@@ -17,19 +17,34 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional

LOCAL_RESOURCE_DIR := packages/apps/ExactCalculator/res



LOCAL_OVERRIDES_PACKAGES := Calculator

LOCAL_PACKAGE_NAME := ExactCalculator

ifeq ($(TARGET_BUILD_APPS),)

LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res

else

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res

endif



LOCAL_MODULE_TAGS := optional

LOCAL_SDK_VERSION := current



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_PACKAGE_NAME := ExactCalculator

LOCAL_OVERRIDES_PACKAGES := Calculator



LOCAL_STATIC_JAVA_LIBRARIES := cr android-support-v4

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro



include $(BUILD_PACKAGE)

LOCAL_STATIC_JAVA_LIBRARIES := cr

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview



include $(call all-makefiles-under,$(LOCAL_PATH))
 
LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview



include $(BUILD_PACKAGE)

res/drawable/ic_history_grey600_48dp.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?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.

  -->

<vector

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="24dp"

    android:width="24dp"

    android:viewportHeight="48.0"

    android:viewportWidth="48.0">

    <path

        android:fillColor="#757575"

        android:pathData="M25.99,6C16.04,6 8,14.06 8,24H2l7.79,7.79 0.14,0.29L18,24h-6c0,-7.73

        6.27,-14 14,-14s14,6.27 14,14 -6.27,14 -14,14c-3.87,0 -7.36,-1.58

        -9.89,-4.11l-2.83,2.83C16.53,39.98 21.02,42 25.99,42 35.94,42 44,33.94 44,24S35.94,6

        25.99,6zM24,16v10l8.56,5.08L34,28.65l-7,-4.15V16h-3z" />

</vector>
 
 No newline at end of file

res/layout/activity_calculator_main.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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>

res/layout/dialog_message.xml

+4 −5
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ 
  limitations under the License.

  -->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/message"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingBottom="20dip"

    android:paddingEnd="16dip"

    android:paddingStart="20dip"

    android:paddingTop="20dip"

    android:padding="20dip"

    android:ellipsize="none"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textIsSelectable="true" />

res/layout/display_one_line.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
            android:overScrollMode="never"

            android:scrollbars="none">



            <com.android.calculator2.CalculatorText

            <com.android.calculator2.CalculatorFormula

                android:id="@+id/formula"

                style="@style/DisplayTextStyle.Formula"

                android:layout_width="wrap_content"