auto import from //branches/cupcake/...@132569

3 files changed, 0 insertions, 376 deletions

diff --git a/core/java/android/webkit/gears/GearsPluginSettings.java b/core/java/android/webkit/gears/GearsPluginSettings.java
deleted file mode 100644
index d36d3fb..0000000
--- a/core/java/android/webkit/gears/GearsPluginSettings.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2008 The Android Open Source Project
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//  1. Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//  3. Neither the name of Google Inc. nor the names of its contributors may be
-//     used to endorse or promote products derived from this software without
-//     specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package android.webkit.gears;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.util.Log;
-import android.webkit.Plugin;
-import android.webkit.Plugin.PreferencesClickHandler;
-
-/**
- * Simple bridge class intercepting the click in the
- * browser plugin list and calling the Gears settings
- * dialog.
- */
-public class GearsPluginSettings {
-
-  private static final String TAG = "Gears-J-GearsPluginSettings";
-  private Context context;
-
-  public GearsPluginSettings(Plugin plugin) {
-    plugin.setClickHandler(new ClickHandler());
-  }
-
-  /**
-   * We do not need to call the dialog synchronously here (doing so
-   * actually cause a lot of problems as the main message loop is also
-   * blocked), which is why we simply call it via a thread.
-   */
-  private class ClickHandler implements PreferencesClickHandler {
-    public void handleClickEvent(Context aContext) {
-      context = aContext;
-      Thread startService = new Thread(new StartService());
-      startService.run();
-    }
-  }
-
-  private static native void runSettingsDialog(Context c);
-
-  /**
-   * StartService is the runnable we use to open the dialog.
-   * We bind the service to serviceConnection; upon
-   * onServiceConnected the dialog will be called from the
-   * native side using the runSettingsDialog method.
-   */
-  private class StartService implements Runnable {
-    public void run() {
-      HtmlDialogAndroid.bindToService(context, serviceConnection);
-    }
-  }
-
-  /**
-   * ServiceConnection instance.
-   * onServiceConnected is called upon connection with the service;
-   * we can then safely open the dialog.
-   */
-  private ServiceConnection serviceConnection = new ServiceConnection() {
-    public void onServiceConnected(ComponentName className, IBinder service) {
-      IGearsDialogService gearsDialogService =
-          IGearsDialogService.Stub.asInterface(service);
-      HtmlDialogAndroid.setGearsDialogService(gearsDialogService);
-      runSettingsDialog(context);
-      context.unbindService(serviceConnection);
-      HtmlDialogAndroid.setGearsDialogService(null);
-    }
-    public void onServiceDisconnected(ComponentName className) {
-      HtmlDialogAndroid.setGearsDialogService(null);
-    }
-  };
-}
diff --git a/core/java/android/webkit/gears/HtmlDialogAndroid.java b/core/java/android/webkit/gears/HtmlDialogAndroid.java
deleted file mode 100644
index 6209ab9..0000000
--- a/core/java/android/webkit/gears/HtmlDialogAndroid.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2008 The Android Open Source Project
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//  1. Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//  3. Neither the name of Google Inc. nor the names of its contributors may be
-//     used to endorse or promote products derived from this software without
-//     specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package android.webkit.gears;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.webkit.CacheManager;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-/**
- * Utility class to call a modal HTML dialog on Android
- */
-public class HtmlDialogAndroid {
-
-  private static final String TAG = "Gears-J-HtmlDialog";
-  private static final String DIALOG_PACKAGE = "com.android.browser";
-  private static final String DIALOG_SERVICE = DIALOG_PACKAGE
-      + ".GearsDialogService";
-  private static final String DIALOG_INTERFACE = DIALOG_PACKAGE
-      + ".IGearsDialogService";
-
-  private static IGearsDialogService gearsDialogService;
-
-  public static void setGearsDialogService(IGearsDialogService service) {
-    gearsDialogService = service;
-  }
-
-  /**
-   * Bind to the GearsDialogService.
-   */
-  public static boolean bindToService(Context context,
-      ServiceConnection serviceConnection) {
-    Intent dialogIntent = new Intent();
-    dialogIntent.setClassName(DIALOG_PACKAGE, DIALOG_SERVICE);
-    dialogIntent.setAction(DIALOG_INTERFACE);
-    return context.bindService(dialogIntent, serviceConnection,
-        Context.BIND_AUTO_CREATE);
-  }
-
-  /**
-   * Bind to the GearsDialogService synchronously.
-   * The service is started using our own defaultServiceConnection
-   * handler, and we wait until the handler notifies us.
-   */
-  public void synchronousBindToService(Context context) {
-    try {
-      if (bindToService(context, defaultServiceConnection)) {
-        if (gearsDialogService == null) {
-          synchronized(defaultServiceConnection) {
-            defaultServiceConnection.wait(3000); // timeout after 3s
-          }
-        }
-      }
-    } catch (InterruptedException e) {
-      Log.e(TAG, "exception: " + e);
-    }
-  }
-
-  /**
-   * Read the HTML content from the disk
-   */
-  public String readHTML(String filePath) {
-    FileInputStream inputStream = null;
-    String content = "";
-    try {
-      inputStream = new FileInputStream(filePath);
-      StringBuffer out = new StringBuffer();
-      byte[] buffer = new byte[4096];
-      for (int n; (n = inputStream.read(buffer)) != -1;) {
-        out.append(new String(buffer, 0, n));
-      }
-      content = out.toString();
-    } catch (IOException e) {
-      Log.e(TAG, "exception: " + e);
-    } finally {
-      if (inputStream != null) {
-        try {
-         inputStream.close();
-        } catch (IOException e) {
-          Log.e(TAG, "exception: " + e);
-        }
-      }
-    }
-    return content;
-  }
-
-  /**
-   * Open an HTML dialog synchronously and waits for its completion.
-   * The dialog is accessed through the GearsDialogService provided by
-   * the Android Browser.
-   * We can be called either directly, and then gearsDialogService will
-   * not be set and we will bind to the service synchronously, and unbind
-   * after calling the service, or called indirectly via GearsPluginSettings.
-   * In the latter case, GearsPluginSettings does the binding/unbinding.
-   */
-  public String showDialog(Context context, String htmlFilePath,
-      String arguments) {
-
-    CacheManager.endCacheTransaction();
-
-    String ret = null;
-    boolean synchronousCall = false;
-    if (gearsDialogService == null) {
-      synchronousCall = true;
-      synchronousBindToService(context);
-    }
-
-    try {
-      if (gearsDialogService != null) {
-        String htmlContent = readHTML(htmlFilePath);
-        if (htmlContent.length() > 0) {
-          ret = gearsDialogService.showDialog(htmlContent, arguments,
-              !synchronousCall);
-        }
-      } else {
-        Log.e(TAG, "Could not connect to the GearsDialogService!");
-      }
-      if (synchronousCall) {
-        context.unbindService(defaultServiceConnection);
-        gearsDialogService = null;
-      }
-    } catch (RemoteException e) {
-      Log.e(TAG, "remote exception: " + e);
-      gearsDialogService = null;
-    }
-
-    CacheManager.startCacheTransaction();
-
-    return ret;
-  }
-
-  private ServiceConnection defaultServiceConnection =
-      new ServiceConnection() {
-    public void onServiceConnected(ComponentName className, IBinder service) {
-      synchronized (defaultServiceConnection) {
-        gearsDialogService = IGearsDialogService.Stub.asInterface(service);
-        defaultServiceConnection.notify();
-      }
-    }
-    public void onServiceDisconnected(ComponentName className) {
-      gearsDialogService = null;
-    }
-  };
-}
diff --git a/core/java/android/webkit/gears/IGearsDialogService.java b/core/java/android/webkit/gears/IGearsDialogService.java
deleted file mode 100644
index 82a3bd9..0000000
--- a/core/java/android/webkit/gears/IGearsDialogService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is auto-generated.  DO NOT MODIFY.
- * Original file: android.webkit.gears/IGearsDialogService.aidl
- */
-package android.webkit.gears;
-import java.lang.String;
-import android.os.RemoteException;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.os.Binder;
-import android.os.Parcel;
-public interface IGearsDialogService extends android.os.IInterface
-{
-/** Local-side IPC implementation stub class. */
-public static abstract class Stub extends android.os.Binder implements android.webkit.gears.IGearsDialogService
-{
-private static final java.lang.String DESCRIPTOR = "com.android.browser.IGearsDialogService";
-/** Construct the stub at attach it to the interface. */
-public Stub()
-{
-this.attachInterface(this, DESCRIPTOR);
-}
-/**
- * Cast an IBinder object into an IGearsDialogService interface,
- * generating a proxy if needed.
- */
-public static android.webkit.gears.IGearsDialogService asInterface(android.os.IBinder obj)
-{
-if ((obj==null)) {
-return null;
-}
-android.webkit.gears.IGearsDialogService in = (android.webkit.gears.IGearsDialogService)obj.queryLocalInterface(DESCRIPTOR);
-if ((in!=null)) {
-return in;
-}
-return new android.webkit.gears.IGearsDialogService.Stub.Proxy(obj);
-}
-public android.os.IBinder asBinder()
-{
-return this;
-}
-public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
-{
-switch (code)
-{
-case INTERFACE_TRANSACTION:
-{
-reply.writeString(DESCRIPTOR);
-return true;
-}
-case TRANSACTION_showDialog:
-{
-data.enforceInterface(DESCRIPTOR);
-java.lang.String _arg0;
-_arg0 = data.readString();
-java.lang.String _arg1;
-_arg1 = data.readString();
-boolean _arg2;
-_arg2 = (0!=data.readInt());
-java.lang.String _result = this.showDialog(_arg0, _arg1, _arg2);
-reply.writeNoException();
-reply.writeString(_result);
-return true;
-}
-}
-return super.onTransact(code, data, reply, flags);
-}
-private static class Proxy implements android.webkit.gears.IGearsDialogService
-{
-private android.os.IBinder mRemote;
-Proxy(android.os.IBinder remote)
-{
-mRemote = remote;
-}
-public android.os.IBinder asBinder()
-{
-return mRemote;
-}
-public java.lang.String getInterfaceDescriptor()
-{
-return DESCRIPTOR;
-}
-public java.lang.String showDialog(java.lang.String htmlContent, java.lang.String dialogArguments, boolean inSettings) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-java.lang.String _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeString(htmlContent);
-_data.writeString(dialogArguments);
-_data.writeInt(((inSettings)?(1):(0)));
-mRemote.transact(Stub.TRANSACTION_showDialog, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readString();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-}
-static final int TRANSACTION_showDialog = (IBinder.FIRST_CALL_TRANSACTION + 0);
-}
-public java.lang.String showDialog(java.lang.String htmlContent, java.lang.String dialogArguments, boolean inSettings) throws android.os.RemoteException;
-}