merge allwinner code (part 1)

Android.mk

@@ -141,6 +141,7 @@ LOCAL_SRC_FILES += \
 	core/java/android/view/IWindow.aidl \
 	core/java/android/view/IWindowManager.aidl \
 	core/java/android/view/IWindowSession.aidl \
+	core/java/android/view/IDisplayManager.aidl \
 	core/java/android/speech/IRecognitionListener.aidl \
 	core/java/android/speech/IRecognitionService.aidl \
 	core/java/android/speech/tts/ITextToSpeechCallback.aidl \

build/tablet-dalvik-heap.mk

@@ -18,5 +18,5 @@
 
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapstartsize=5m \
-    dalvik.vm.heapgrowthlimit=48m \
+    dalvik.vm.heapgrowthlimit=64m \
     dalvik.vm.heapsize=256m

core/java/android/app/ContextImpl.java

@@ -88,6 +88,7 @@
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.WindowManagerImpl;
+import android.view.DisplayManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.InputMethodManager;
 import android.view.textservice.TextServicesManager;
@@ -452,6 +453,11 @@ public Object createService(ContextImpl ctx) {
                     IWifiP2pManager service = IWifiP2pManager.Stub.asInterface(b);
                     return new WifiP2pManager(service);
                 }});
+
+	registerService(DISPLAY_SERVICE, new ServiceFetcher() {
+                public Object createService(ContextImpl ctx) {
+                    return new DisplayManager();
+                }});
 
         registerService(WINDOW_SERVICE, new ServiceFetcher() {
                 public Object getService(ContextImpl ctx) {

core/java/android/content/Context.java

@@ -1680,6 +1680,16 @@ public abstract boolean startInstrumentation(ComponentName className,
      * @see android.telephony.TelephonyManager
      */
     public static final String TELEPHONY_SERVICE = "phone";
+
+    /**
+     * Use with {@link #getSystemService} to retrieve a
+     * {@link android.telephony.TelephonyManager} for handling management the
+     * display features of the device.
+     *
+     * @see #getSystemService
+     * @see android.view.DisplayManager
+     */
+    public static final String DISPLAY_SERVICE = "display";
 
     /**
      * Use with {@link #getSystemService} to retrieve a

core/java/android/content/Intent.java

@@ -1715,6 +1715,30 @@ public static Intent createChooser(Intent target, CharSequence title) {
      */
     @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
     public static final String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN";
+    /**
+     * Broadcast Action:  HDMI Hotplug Changed.
+     * This is broadcast when the hdmi hotplug status (completely turned
+     * off, not sleeping).  Once the broadcast is complete, the final shutdown
+     * will proceed and all unsaved data lost.  Apps will not normally need
+     * to handle this, since the foreground activity will be paused as well.
+     *
+     * <p class="note">This is a protected intent that can only be sent
+     * by the system.
+     */
+     @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    public static final String ACTION_HDMISTATUS_CHANGED = "android.intent.action.HDMISTATUS_CHANGED";
+    /**
+     * Broadcast Action:  tvdac Hotplug Changed.
+     * This is broadcast when the tvdac hotplug status (completely turned
+     * off, not sleeping).  Once the broadcast is complete, the final shutdown
+     * will proceed and all unsaved data lost.  Apps will not normally need
+     * to handle this, since the foreground activity will be paused as well.
+     *
+     * <p class="note">This is a protected intent that can only be sent
+     * by the system.
+     */
+     @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    public static final String ACTION_TVDACSTATUS_CHANGED = "android.intent.action.TVDACSTATUS_CHANGED";
     /**
      * Activity Action:  Start this activity to request system shutdown.
      * The optional boolean extra field {@link #EXTRA_KEY_CONFIRM} can be set to true

core/java/android/hardware/Camera.java

@@ -4628,4 +4628,6 @@ private boolean same(String s1, String s2) {
             return false;
         }
     };
+
+    public static native int setCameraScreen(int screen);
 }

core/java/android/provider/MediaStore.java

@@ -138,6 +138,11 @@ public final class MediaStore {
      * This is a boolean property that specifies whether or not to show action icons.
      */
     public static final String EXTRA_SHOW_ACTION_ICONS = "android.intent.extra.showActionIcons";
+
+    //by Bevis, for VideoPlayer to create playlist
+    public static final String PLAYLIST_TYPE = "android.intent.extra.playListType";
+    public static final String PLAYLIST_TYPE_CUR_FOLDER = "curFolder";
+    public static final String PLAYLIST_TYPE_MEDIA_PROVIDER = "mediaProvider";
 
     /**
      * The name of the Intent-extra used to control the onCompletion behavior of a MovieView.

core/java/android/view/DisplayManager.aidl

@@ -0,0 +1,21 @@
+/* //device/java/android/android/view/WindowManager.aidl
+**
+** Copyright 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 android.view;
+
+parcelable DisplayManager;
+