github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Part 1 of 2: CB-2657 Moving DroidGap in git so we don't lose random commits. This is irritating

Browse Source
This commit is contained in:
Joe Bowser 2013-05-07 09:45:50 -07:00
parent dbeb252fee
commit 35d53a0684
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/org/apache/cordova/DroidGap.java → framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -137,7 +137,7 @@ import android.widget.LinearLayout;
* ... * ...
* </plugins> * </plugins>
*/ */
public class DroidGap extends Activity implements CordovaInterface { public class CordovaActivity extends Activity implements CordovaInterface {
public static String TAG = "DroidGap"; public static String TAG = "DroidGap";
// The webview for our app // The webview for our app
@ -314,7 +314,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* Create and initialize web container with default web view objects. * Create and initialize web container with default web view objects.
*/ */
public void init() { public void init() {
CordovaWebView webView = new CordovaWebView(DroidGap.this); CordovaWebView webView = new CordovaWebView(CordovaActivity.this);
CordovaWebViewClient webViewClient; CordovaWebViewClient webViewClient;
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
{ {
@ -780,8 +780,8 @@ public class DroidGap extends Activity implements CordovaInterface {
this.spinnerDialog.dismiss(); this.spinnerDialog.dismiss();
this.spinnerDialog = null; this.spinnerDialog = null;
} }
final DroidGap me = this; final CordovaActivity me = this;
this.spinnerDialog = ProgressDialog.show(DroidGap.this, title, message, true, true, this.spinnerDialog = ProgressDialog.show(CordovaActivity.this, title, message, true, true,
new DialogInterface.OnCancelListener() { new DialogInterface.OnCancelListener() {
public void onCancel(DialogInterface dialog) { public void onCancel(DialogInterface dialog) {
me.spinnerDialog = null; me.spinnerDialog = null;
@ -886,7 +886,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param failingUrl The url that failed to load. * @param failingUrl The url that failed to load.
*/ */
public void onReceivedError(final int errorCode, final String description, final String failingUrl) { public void onReceivedError(final int errorCode, final String description, final String failingUrl) {
final DroidGap me = this; final CordovaActivity me = this;
// If errorUrl specified, then load it // If errorUrl specified, then load it
final String errorUrl = me.getStringProperty("errorUrl", null); final String errorUrl = me.getStringProperty("errorUrl", null);
@ -924,7 +924,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param exit * @param exit
*/ */
public void displayError(final String title, final String message, final String button, final boolean exit) { public void displayError(final String title, final String message, final String button, final boolean exit) {
final DroidGap me = this; final CordovaActivity me = this;
me.runOnUiThread(new Runnable() { me.runOnUiThread(new Runnable() {
public void run() { public void run() {
try { try {
@ -1025,7 +1025,7 @@ public class DroidGap extends Activity implements CordovaInterface {
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void showSplashScreen(final int time) { protected void showSplashScreen(final int time) {
final DroidGap that = this; final CordovaActivity that = this;
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
public void run() { public void run() {

4
framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
View File

@ -35,13 +35,13 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
private int oldWidth = 0; // Need to save old width for orientation change private int oldWidth = 0; // Need to save old width for orientation change
private int screenWidth = 0; private int screenWidth = 0;
private int screenHeight = 0; private int screenHeight = 0;
private DroidGap app = null; private CordovaActivity app = null;
public LinearLayoutSoftKeyboardDetect(Context context, int width, int height) { public LinearLayoutSoftKeyboardDetect(Context context, int width, int height) {
super(context); super(context);
screenWidth = width; screenWidth = width;
screenHeight = height; screenHeight = height;
app = (DroidGap) context; app = (CordovaActivity) context;
} }
@Override @Override