Merge "Add a test program for Sapphire viewport rotation issue."

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

# OpenGL ES JNI sample

# This makefile builds both an activity and a shared library.

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

ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean

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 := TestViewport

include $(BUILD_PACKAGE)

endif # TARGET_SIMULATOR

<?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.test">

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application

            android:label="@string/test_activity">

        <activity android:name="TestActivity"

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

            	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>

Repro steps:

build, install and run the attached test program TestViewport.apk

Run on Sapphire with Froyo.

The program clears the screen to blue, then draws a full screen white quad that

is alligned to the screen.

(Therefore the whole screen should appear to be white.)

Note that screen is all white.

Rotate screen 90 degrees.

Expected: screen is still all white.

Actual: screen is blue with offset white rectangle.

This bug only happens on Sapphire, it works correctly on Passion.

What happens:

I think the bug is that the gl.glViewport() call in onSurfaceChanged() is

being ignored by the OpenGL driver.

NOTE: If a gl.glViewport call is added at the beginning of the onDrawFrame()

call (which means it is called before every draw), the program runs correctly.

<?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="test_activity">Test Viewport</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.test;

import android.app.Activity;

import android.os.Bundle;

import android.util.Log;

public class TestActivity extends Activity {

    private final static String TAG = "TestActivity";

    TestView mView;

    @Override

    protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        mView = new TestView(getApplication());

	    mView.setFocusableInTouchMode(true);

	    setContentView(mView);

    }

    @Override

    protected void onPause() {

        super.onPause();

        mView.onPause();

    }

    @Override

    protected void onResume() {

        super.onResume();

        mView.onResume();

    }

}