Prepare ExactCalculator for master fishfood
- Switched back to using com.android.calculator2 package name.
- Setup to replace Calculator package.
- Replaced launcher icon with fishfood variant.
Change-Id: Ie3a74249e4d1808c50bfd86a3030e0ae61165c67
diff --git a/Android.mk b/Android.mk
index 2f3e84d..39f475e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,18 +19,17 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := cr android-support-v4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_OVERRIDES_PACKAGES := Calculator
+LOCAL_PACKAGE_NAME := ExactCalculator
LOCAL_SDK_VERSION := current
-LOCAL_PACKAGE_NAME := ExactCalculator
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := cr android-support-v4
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_AAPT_FLAGS := --rename-manifest-package com.android.exactcalculator
-
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 8abdaba..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath "com.android.tools.build:gradle:0.12.+"
- }
-}
-
-apply plugin: "com.android.application"
-
-android {
- compileSdkVersion "android-L"
- buildToolsVersion "20"
-
- defaultConfig {
- applicationId "com.google.android.apps.calculator"
- }
-
- sourceSets {
- main {
- manifest.srcFile "AndroidManifest.xml"
- java.srcDirs = ["src"]
- res.srcDirs = ["res"]
- }
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
- }
-}
-
-repositories {
- mavenLocal()
-}
-
-dependencies {
- compile files("cr.jar")
- compile "com.android.support:support-v4:+"
-}
diff --git a/res/mipmap-hdpi/ic_launcher_calculator.png b/res/mipmap-hdpi/ic_launcher_calculator.png
index e943cb4..a85a16b 100644
--- a/res/mipmap-hdpi/ic_launcher_calculator.png
+++ b/res/mipmap-hdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_calculator.png b/res/mipmap-mdpi/ic_launcher_calculator.png
index c1cb23a..1051345 100644
--- a/res/mipmap-mdpi/ic_launcher_calculator.png
+++ b/res/mipmap-mdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_calculator.png b/res/mipmap-xhdpi/ic_launcher_calculator.png
index f09c7a6..c8992de 100644
--- a/res/mipmap-xhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_calculator.png b/res/mipmap-xxhdpi/ic_launcher_calculator.png
index 098f545..54a77b8 100644
--- a/res/mipmap-xxhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xxhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_calculator.png b/res/mipmap-xxxhdpi/ic_launcher_calculator.png
index 5e57435..57ca501 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/tests/Android.mk b/tests/Android.mk
index f4a73e7..8a84600 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,20 +1,13 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SDK_VERSION := current
-
-# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
-# LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
LOCAL_PACKAGE_NAME := ExactCalculatorTests
-
LOCAL_INSTRUMENTATION_FOR := ExactCalculator
-LOCAL_AAPT_FLAGS := --rename-manifest-package com.android.exactcalculator.tests
+LOCAL_SDK_VERSION := current
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_PACKAGE)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index a6183f0..62fe5c0 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,14 +17,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.calculator2.tests">
- <uses-sdk
- android:minSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="21" />
<instrumentation
android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.exactcalculator"
- android:label="BoundedRational and Calculator Functional Test">
- </instrumentation>
+ android:label="BoundedRational and Calculator Functional Test" />
<application>
<uses-library android:name="android.test.runner" />
