Merge change 2462 (ecb109d1) · Commits · e / os / android_frameworks_base

libs/rs/Android.mk

+5 −4

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		ifeq ($(BUILD_RENDERSCRIPT),true)

		TOP_LOCAL_PATH:=$(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_PATH:= $(TOP_LOCAL_PATH)


		# Build rsg-generator

		LOCAL_MODULE := rsg-generator
		@@ -50,7 +50,7 @@ GEN := $(addprefix $(intermediates)/, \
		rsgApiFuncDecl.h \
		)

		$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
		$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec
		$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
		$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.h.rsg
		$(transform-generated-source)
		@@ -63,7 +63,7 @@ GEN := $(addprefix $(intermediates)/, \
		rsgApiReplay.cpp \
		)

		$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
		$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec
		$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
		$(GEN): $(intermediates)/%.cpp : $(LOCAL_PATH)/%.cpp.rsg
		$(transform-generated-source)
		@@ -129,4 +129,5 @@ LOCAL_MODULE:= libRS_jni

		include $(BUILD_SHARED_LIBRARY)

		include $(call all-subdir-makefiles)
		endif # BUILD_RENDERSCRIPT

libs/rs/java/Android.mk

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		include $(call all-subdir-makefiles)

libs/rs/java/Calc/Android.mk

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2008 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.
		#

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

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

		LOCAL_PACKAGE_NAME := Calc

		include $(BUILD_PACKAGE)
		##################################################
		include $(CLEAR_VARS)

		include $(BUILD_MULTI_PREBUILT)

		# Use the folloing include to make our test apk.
		include $(call all-makefiles-under,$(LOCAL_PATH))

libs/rs/java/Calc/AndroidManifest.xml

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.calc">
		<application android:label="Calc">
		<activity android:name="Calc"
		android:theme="@android:style/Theme.Black.NoTitleBar">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>
		</application>
		</manifest>

libs/rs/java/Calc/src/com/android/calc/Calc.java

0 → 100644

+87 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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.
		*/

		package com.android.calc;

		import android.app.Activity;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.provider.Settings.System;
		import android.util.Config;
		import android.util.Log;
		import android.view.Menu;
		import android.view.MenuItem;
		import android.view.View;
		import android.view.Window;
		import android.widget.Button;
		import android.widget.ListView;

		import java.lang.Runtime;

		public class Calc extends Activity {
		//EventListener mListener = new EventListener();

		private static final String LOG_TAG = "libRS_jni";
		private static final boolean DEBUG = false;
		private static final boolean LOG_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;

		private CalcView mView;

		// get the current looper (from your Activity UI thread for instance



		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		// Create our Preview view and set it as the content of our
		// Activity
		mView = new CalcView(this);
		setContentView(mView);
		}

		@Override
		protected void onResume() {
		// Ideally a game should implement onResume() and onPause()
		// to take appropriate action when the activity looses focus
		super.onResume();
		mView.onResume();
		}

		@Override
		protected void onPause() {
		// Ideally a game should implement onResume() and onPause()
		// to take appropriate action when the activity looses focus
		super.onPause();
		mView.onPause();

		Runtime.getRuntime().exit(0);
		}


		static void log(String message) {
		if (LOG_ENABLED) {
		Log.v(LOG_TAG, message);
		}
		}


		}