wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 709230 part 1 - Add missing access modifiers to GeckoAppShell.java. r=dougt

Browse Source
This commit is contained in:
Chris Peterson 2012-01-24 17:52:34 -08:00
parent 2e90aac2df
commit 7de968bff5
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
mobile/android/base/GeckoAppShell.java
View File

@ -254,7 +254,7 @@ public class GeckoAppShell
return sFreeSpace;
}
static boolean moveFile(File inFile, File outFile)
private static boolean moveFile(File inFile, File outFile)
{
Log.i(LOGTAG, "moving " + inFile + " to " + outFile);
if (outFile.isDirectory())
@ -293,7 +293,7 @@ public class GeckoAppShell
return true;
}
static boolean moveDir(File from, File to) {
private static boolean moveDir(File from, File to) {
try {
to.mkdirs();
if (from.renameTo(to))
@ -513,7 +513,7 @@ public class GeckoAppShell
layerController.notifyLayerClientOfGeometryChange();
}
static void sendPendingEventsToGecko() {
public static void sendPendingEventsToGecko() {
try {
while (!gPendingEvents.isEmpty()) {
GeckoEvent e = gPendingEvents.removeFirst();
@ -579,8 +579,8 @@ public class GeckoAppShell
tmp.countDown();
}
static Sensor gAccelerometerSensor = null;
static Sensor gOrientationSensor = null;
private static Sensor gAccelerometerSensor = null;
private static Sensor gOrientationSensor = null;
public static void enableDeviceMotion(boolean enable) {
LayerView v = GeckoApp.mAppContext.getLayerController().getView();
@ -639,7 +639,7 @@ public class GeckoAppShell
mInputConnection.returnIMEQueryResult(result, selectionStart, selectionLength);
}
static void onXreExit() {
public static void onXreExit() {
// mLaunchState can only be Launched or GeckoRunning at this point
GeckoApp.setLaunchState(GeckoApp.LaunchState.GeckoExiting);
Log.i(LOGTAG, "XRE exited");
@ -653,13 +653,15 @@ public class GeckoAppShell
Log.w(LOGTAG, "Killing via System.exit()");
System.exit(0);
}
static void scheduleRestart() {
public static void scheduleRestart() {
Log.i(LOGTAG, "scheduling restart");
gRestartScheduled = true;
}
// "Installs" an application by creating a shortcut
static void createShortcut(String aTitle, String aURI, String aIconData, String aType) {
public static void createShortcut(String aTitle, String aURI,
String aIconData, String aType) {
byte[] raw = Base64.decode(aIconData.substring(22), Base64.DEFAULT);
Bitmap bitmap = BitmapFactory.decodeByteArray(raw, 0, raw.length);
createShortcut(aTitle, aURI, bitmap, aType);
@ -765,14 +767,14 @@ public class GeckoAppShell
return bitmap;
}
static String[] getHandlersForMimeType(String aMimeType, String aAction) {
public static String[] getHandlersForMimeType(String aMimeType, String aAction) {
Intent intent = getIntentForActionString(aAction);
if (aMimeType != null && aMimeType.length() > 0)
intent.setType(aMimeType);
return getHandlersForIntent(intent);
}
static String[] getHandlersForURL(String aURL, String aAction) {
public static String[] getHandlersForURL(String aURL, String aAction) {
// aURL may contain the whole URL or just the protocol
Uri uri = aURL.indexOf(':') >= 0 ? Uri.parse(aURL) : new Uri.Builder().scheme(aURL).build();
Intent intent = getIntentForActionString(aAction);
@ -780,7 +782,7 @@ public class GeckoAppShell
return getHandlersForIntent(intent);
}
static String[] getHandlersForIntent(Intent intent) {
private static String[] getHandlersForIntent(Intent intent) {
PackageManager pm = GeckoApp.mAppContext.getPackageManager();
List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
int numAttr = 4;
@ -798,7 +800,7 @@ public class GeckoAppShell
return ret;
}
static Intent getIntentForActionString(String aAction) {
private static Intent getIntentForActionString(String aAction) {
// Default to the view action if no other action as been specified.
if (aAction != null && aAction.length() > 0)
return new Intent(aAction);
@ -806,11 +808,11 @@ public class GeckoAppShell
return new Intent(Intent.ACTION_VIEW);
}
static String getExtensionFromMimeType(String aMimeType) {
public static String getExtensionFromMimeType(String aMimeType) {
return MimeTypeMap.getSingleton().getExtensionFromMimeType(aMimeType);
}
static String getMimeTypeFromExtensions(String aFileExt) {
public static String getMimeTypeFromExtensions(String aFileExt) {
MimeTypeMap mtm = MimeTypeMap.getSingleton();
StringTokenizer st = new StringTokenizer(aFileExt, "., ");
String type = null;
@ -835,8 +837,8 @@ public class GeckoAppShell
return type + "/" + subType;
}
static boolean openUriExternal(String aUriSpec, String aMimeType, String aPackageName,
String aClassName, String aAction, String aTitle) {
public static boolean openUriExternal(String aUriSpec, String aMimeType, String aPackageName,
String aClassName, String aAction, String aTitle) {
Intent intent = getIntentForActionString(aAction);
if (aAction.equalsIgnoreCase(Intent.ACTION_SEND)) {
intent.putExtra(Intent.EXTRA_TEXT, aUriSpec);
@ -887,16 +889,16 @@ public class GeckoAppShell
}
}
static SynchronousQueue<String> sClipboardQueue =
private static final SynchronousQueue<String> sClipboardQueue =
new SynchronousQueue<String>();
private static String EMPTY_STRING = new String();
private static final String EMPTY_STRING = new String();
// On some devices, access to the clipboard service needs to happen
// on a thread with a looper, so dispatch this to our looper thread
// Note: the main looper won't work because it may be blocked on the
// gecko thread, which is most likely this thread
static String getClipboardText() {
getHandler().post(new Runnable() {
public static String getClipboardText() {
getHandler().post(new Runnable() {
@SuppressWarnings("deprecation")
public void run() {
Context context = GeckoApp.mAppContext;
@ -928,8 +930,8 @@ public class GeckoAppShell
return null;
}
static void setClipboardText(final String text) {
getHandler().post(new Runnable() {
public static void setClipboardText(final String text) {
getHandler().post(new Runnable() {
@SuppressWarnings("deprecation")
public void run() {
Context context = GeckoApp.mAppContext;
@ -1236,14 +1238,14 @@ public class GeckoAppShell
return visitor.otherPidExist;
}
interface GeckoProcessesVisitor{
private interface GeckoProcessesVisitor{
boolean callback(int pid);
}
static int sPidColumn = -1;
static int sUserColumn = -1;
private static void EnumerateGeckoProcesses(GeckoProcessesVisitor visiter) {
private static int sPidColumn = -1;
private static int sUserColumn = -1;
private static void EnumerateGeckoProcesses(GeckoProcessesVisitor visiter) {
try {
// run ps and parse its output
@ -1413,9 +1415,9 @@ public class GeckoAppShell
return null;
}
static native void executeNextRunnable();
private static native void executeNextRunnable();
static class GeckoRunnableCallback implements Runnable {
private static class GeckoRunnableCallback implements Runnable {
public void run() {
Log.i(LOGTAG, "run GeckoRunnableCallback");
GeckoAppShell.executeNextRunnable();
@ -1426,15 +1428,16 @@ public class GeckoAppShell
Log.i(LOGTAG, "post to " + (mainThread ? "main " : "") + "java thread");
getMainHandler().post(new GeckoRunnableCallback());
}
public static android.hardware.Camera sCamera = null;
static native void cameraCallbackBridge(byte[] data);
static int kPreferedFps = 25;
static byte[] sCameraBuffer = null;
private static android.hardware.Camera sCamera = null;
static int[] initCamera(String aContentType, int aCamera, int aWidth, int aHeight) {
private static native void cameraCallbackBridge(byte[] data);
private static final int kPreferedFps = 25;
private static byte[] sCameraBuffer = null;
public static int[] initCamera(String aContentType, int aCamera,
int aWidth, int aHeight) {
Log.i(LOGTAG, "initCamera(" + aContentType + ", " + aWidth + "x" + aHeight + ") on thread " + Thread.currentThread().getId());
getMainHandler().post(new Runnable() {
@ -1530,7 +1533,7 @@ public class GeckoAppShell
return result;
}
static synchronized void closeCamera() {
public static synchronized void closeCamera() {
Log.i(LOGTAG, "closeCamera() on thread " + Thread.currentThread().getId());
getMainHandler().post(new Runnable() {
public void run() {
@ -1547,7 +1550,7 @@ public class GeckoAppShell
}
}
static SynchronousQueue<String> sPromptQueue = null;
public static SynchronousQueue<String> sPromptQueue = null;
public static void registerGeckoEventListener(String event, GeckoEventListener listener) {
if (mEventListeners == null)
@ -1661,11 +1664,11 @@ public class GeckoAppShell
return GeckoBatteryManager.getCurrentInformation();
}
static void checkUriVisited(String uri) { // invoked from native JNI code
public static void checkUriVisited(String uri) { // invoked from native JNI code
GlobalHistory.getInstance().checkUriVisited(uri);
}
static void markUriVisited(final String uri) { // invoked from native JNI code
public static void markUriVisited(final String uri) { // invoked from native JNI code
getHandler().post(new Runnable() {
public void run() {
GlobalHistory.getInstance().add(uri);
@ -1673,7 +1676,7 @@ public class GeckoAppShell
});
}
static void hideProgressDialog() {
public static void hideProgressDialog() {
// unused stub
}