Merge branch 'master' into honeycomb-release

                // The first/last pointer went down/up.

                action = maskedAction == AMOTION_EVENT_ACTION_POINTER_DOWN

                        ? AMOTION_EVENT_ACTION_DOWN : AMOTION_EVENT_ACTION_UP;

            } else {

                // A secondary pointer went down/up.

                uint32_t splitPointerIndex = 0;

                while (pointerId != splitPointerIds[splitPointerIndex]) {

                    splitPointerIndex += 1;

                }

                action = maskedAction | (splitPointerIndex

                        << AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT);

            }

        } else {

            // An unrelated pointer changed.

#########################################################################

# Test framerate and look for hiccups

#########################################################################

TOP_LOCAL_PATH:= $(call my-dir)

# Build activity

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := TestFramerate

include $(BUILD_PACKAGE)

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2009, 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.

*/

-->

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

    package="com.android.testframerate">

    <uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8" />

    <application

            android:label="@string/testFramerate_activity">

        <activity android:name="TestFramerateActivity"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

                android:launchMode="singleTask"

                android:configChanges="orientation|keyboardHidden">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2006, 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.

*/

-->

<!-- This file contains resource definitions for displayed strings, allowing

     them to be changed based on the locale and options. -->

<resources>

    <!-- Simple strings. -->

    <string name="testFramerate_activity">TestFramerate</string>

</resources>

/*

 * Copyright (C) 2007 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.testframerate;

import android.app.Activity;

import android.os.Bundle;

import android.util.Log;

import android.view.WindowManager;

import java.io.File;

public class TestFramerateActivity extends Activity {

    TestFramerateView mView;

    @Override protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        mView = new TestFramerateView(getApplication());

        setContentView(mView);

        mView.setFocusableInTouchMode(true);

    }

    @Override protected void onPause() {

        super.onPause();

        mView.onPause();

    }

    @Override protected void onResume() {

        super.onResume();

        mView.onResume();

    }

}