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

Commit 08d5b8fa authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

More native work. 

Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
parent 091c5238

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -26460,6 +26460,17 @@ 
<parameter name="holder" type="android.view.SurfaceHolder">

</parameter>

</method>

<field name="KEY_NATIVE_SAVED_STATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android:native_state&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_DATA_LIB_NAME"

 type="java.lang.String"

 transient="false"

core/java/android/app/NativeActivity.java

+36 −5
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.AssetManager;

import android.content.res.Configuration;

import android.graphics.PixelFormat;

import android.os.Build;

import android.os.Bundle;
@@ -32,12 +33,27 @@ import java.lang.ref.WeakReference; 


/**

 * Convenience for implementing an activity that will be implemented

 * purely in native code.  That is, a game (or game-like thing).

 * purely in native code.  That is, a game (or game-like thing).  There

 * is no need to derive from this class; you can simply declare it in your

 * manifest, and use the NDK APIs from there.

 *

 * <p>A typical manifest would look like:

 *

 * {@sample development/ndk/platforms/android-9/samples/native-activity/AndroidManifest.xml

 *      manifest}

 *

 * <p>A very simple example of native code that is run by NativeActivity

 * follows.  This reads input events from the user and uses OpenGLES to

 * draw into the native activity's window.

 *

 * {@sample development/ndk/platforms/android-9/samples/native-activity/jni/main.c all}

 */

public class NativeActivity extends Activity implements SurfaceHolder.Callback2,

        InputQueue.Callback, OnGlobalLayoutListener {

    public static final String META_DATA_LIB_NAME = "android.app.lib_name";

    

    public static final String KEY_NATIVE_SAVED_STATE = "android:native_state";



    private NativeContentView mNativeContentView;

    private InputMethodManager mIMM;

    private InputMethodCallback mInputMethodCallback;
@@ -59,14 +75,15 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
    

    private native int loadNativeCode(String path, MessageQueue queue,

            String internalDataPath, String externalDataPath, int sdkVersion,

            AssetManager assetMgr);

            AssetManager assetMgr, byte[] savedState);

    private native void unloadNativeCode(int handle);

    

    private native void onStartNative(int handle);

    private native void onResumeNative(int handle);

    private native void onSaveInstanceStateNative(int handle);

    private native byte[] onSaveInstanceStateNative(int handle);

    private native void onPauseNative(int handle);

    private native void onStopNative(int handle);

    private native void onConfigurationChangedNative(int handle);

    private native void onLowMemoryNative(int handle);

    private native void onWindowFocusChangedNative(int handle, boolean focused);

    private native void onSurfaceCreatedNative(int handle, Surface surface);
@@ -165,10 +182,13 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
            throw new IllegalArgumentException("Unable to find native library: " + libname);

        }

        

        byte[] nativeSavedState = savedInstanceState != null

                ? savedInstanceState.getByteArray(KEY_NATIVE_SAVED_STATE) : null;



        mNativeHandle = loadNativeCode(path, Looper.myQueue(),

                 getFilesDir().toString(),

                 Environment.getExternalStorageAppFilesDirectory(ai.packageName).toString(),

                 Build.VERSION.SDK_INT, getAssets());

                 Build.VERSION.SDK_INT, getAssets(), nativeSavedState);

        

        if (mNativeHandle == 0) {

            throw new IllegalArgumentException("Unable to load native library: " + path);
@@ -206,7 +226,10 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
    @Override

    protected void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        onSaveInstanceStateNative(mNativeHandle);

        byte[] state = onSaveInstanceStateNative(mNativeHandle);

        if (state != null) {

            outState.putByteArray(KEY_NATIVE_SAVED_STATE, state);

        }

    }



    @Override
@@ -221,6 +244,14 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
        onStopNative(mNativeHandle);

    }



    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        if (!mDestroyed) {

            onConfigurationChangedNative(mNativeHandle);

        }

    }



    @Override

    public void onLowMemory() {

        super.onLowMemory();

core/java/android/content/res/Resources.java

+1 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ public class Resources { 
                height = mMetrics.widthPixels;

            }

            int keyboardHidden = mConfiguration.keyboardHidden;

            if (keyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO

            if (keyboardHidden == Configuration.KEYBOARDHIDDEN_NO

                    && mConfiguration.hardKeyboardHidden

                            == Configuration.HARDKEYBOARDHIDDEN_YES) {

                keyboardHidden = Configuration.KEYBOARDHIDDEN_SOFT;

core/java/com/android/internal/app/PlatLogoActivity.java

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 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.internal.app;



import android.app.Activity;

import android.os.Bundle;

import android.widget.ImageView;



public class PlatLogoActivity extends Activity {

    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        

        ImageView content = new ImageView(this);

        content.setImageResource(com.android.internal.R.drawable.platlogo);

        content.setScaleType(ImageView.ScaleType.FIT_CENTER);

        

        setContentView(content);

    }

}

core/jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ LOCAL_SRC_FILES:= \ 
	android_backup_BackupDataOutput.cpp \

	android_backup_FileBackupHelperBase.cpp \

	android_backup_BackupHelperDispatcher.cpp \

	android_content_res_ObbScanner.cpp

	android_content_res_ObbScanner.cpp \

    android_content_res_Configuration.cpp



LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE) \