corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 850487 - More code cleanup (@Overrides and unused imports). r=kats

Browse Source
This commit is contained in:
Brian Nicholson
2013-03-13 13:20:57 -07:00
parent f34b31a533
commit 278a2f521d
69 changed files with 21 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/AboutHomeContent.java
View File

@@ -9,7 +9,6 @@ import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.BrowserContract.Thumbnails; import org.mozilla.gecko.db.BrowserContract.Thumbnails;
import org.mozilla.gecko.db.BrowserDB; import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.db.BrowserDB.URLColumns; import org.mozilla.gecko.db.BrowserDB.URLColumns;
import org.mozilla.gecko.db.BrowserDB.PinnedSite;
import org.mozilla.gecko.db.BrowserDB.TopSitesCursorWrapper; import org.mozilla.gecko.db.BrowserDB.TopSitesCursorWrapper;
import org.mozilla.gecko.sync.setup.SyncAccounts; import org.mozilla.gecko.sync.setup.SyncAccounts;
import org.mozilla.gecko.util.ActivityResultHandler; import org.mozilla.gecko.util.ActivityResultHandler;
@@ -62,7 +61,6 @@ import java.util.HashMap;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
@@ -787,6 +785,7 @@ public class AboutHomeContent extends ScrollView
super(context, attrs); super(context, attrs);
} }
@Override
public int getColumnWidth() { public int getColumnWidth() {
return getColumnWidth(getWidth()); return getColumnWidth(getWidth());
} }

1
mobile/android/base/AboutHomePromoBox.java
View File

@@ -18,7 +18,6 @@ import android.content.Intent;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;

1
mobile/android/base/App.java.in
View File

@@ -10,7 +10,6 @@ import android.view.MenuItem;
import org.mozilla.gecko.BrowserApp; import org.mozilla.gecko.BrowserApp;
import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoProfile; import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.R; import org.mozilla.gecko.R;

7
mobile/android/base/AwesomeBarTabs.java
View File

@@ -53,23 +53,27 @@ public class AwesomeBarTabs extends TabHost
super(); super();
} }
@Override
public Object instantiateItem(ViewGroup group, int index) { public Object instantiateItem(ViewGroup group, int index) {
AwesomeBarTab tab = mTabs[index]; AwesomeBarTab tab = mTabs[index];
group.addView(tab.getView()); group.addView(tab.getView());
return tab; return tab;
} }
@Override
public void destroyItem(ViewGroup group, int index, Object obj) { public void destroyItem(ViewGroup group, int index, Object obj) {
AwesomeBarTab tab = (AwesomeBarTab)obj; AwesomeBarTab tab = (AwesomeBarTab)obj;
group.removeView(tab.getView()); group.removeView(tab.getView());
} }
@Override
public int getCount() { public int getCount() {
if (mSearching) if (mSearching)
return 1; return 1;
return mTabs.length; return mTabs.length;
} }
@Override
public boolean isViewFromObject(View view, Object object) { public boolean isViewFromObject(View view, Object object) {
return getAwesomeBarTabForView(view) == object; return getAwesomeBarTabForView(view) == object;
} }
@@ -153,8 +157,11 @@ public class AwesomeBarTabs extends TabHost
mViewPager.setAdapter(mPagerAdapter); mViewPager.setAdapter(mPagerAdapter);
mViewPager.setCurrentItem(0); mViewPager.setCurrentItem(0);
mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrollStateChanged(int state) { } public void onPageScrollStateChanged(int state) { }
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { } public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { }
@Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
tabWidget.setCurrentTab(position); tabWidget.setCurrentTab(position);
styleSelectedTab(); styleSelectedTab();

2
mobile/android/base/BrowserToolbar.java
View File

@@ -234,6 +234,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
// accessibility. // accessibility.
mTabsCount.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); mTabsCount.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
mTabsCount.setAccessibilityDelegate(new View.AccessibilityDelegate() { mTabsCount.setAccessibilityDelegate(new View.AccessibilityDelegate() {
@Override
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {} public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {}
}); });
} }
@@ -527,6 +528,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
show ? 0 : mLayout.getHeight()); show ? 0 : mLayout.getHeight());
if (delay > 0) { if (delay > 0) {
mDelayedVisibilityTask = new TimerTask() { mDelayedVisibilityTask = new TimerTask() {
@Override
public void run() { public void run() {
startVisibilityAnimation(); startVisibilityAnimation();
mDelayedVisibilityTask = null; mDelayedVisibilityTask = null;

3
mobile/android/base/BrowserToolbarLayout.java
View File

@@ -5,11 +5,8 @@
package org.mozilla.gecko; package org.mozilla.gecko;
import org.mozilla.gecko.gfx.LayerView;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.LinearLayout; import android.widget.LinearLayout;

1
mobile/android/base/Divider.java
View File

@@ -5,7 +5,6 @@
package org.mozilla.gecko; package org.mozilla.gecko;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.LinearLayout.LayoutParams; import android.widget.LinearLayout.LayoutParams;

2
mobile/android/base/Favicons.java
View File

@@ -13,12 +13,10 @@ import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.BufferedHttpEntity;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.net.http.AndroidHttpClient; import android.net.http.AndroidHttpClient;
import android.os.Handler; import android.os.Handler;
import android.support.v4.util.LruCache; import android.support.v4.util.LruCache;

1
mobile/android/base/GeckoActivity.java.in
View File

@@ -9,7 +9,6 @@ package org.mozilla.gecko;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
interface GeckoActivityStatus { interface GeckoActivityStatus {
public boolean isGeckoActivityOpened(); public boolean isGeckoActivityOpened();

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

@@ -16,7 +16,6 @@ import org.mozilla.gecko.util.GeckoBackgroundThread;
import org.mozilla.gecko.util.GeckoEventListener; import org.mozilla.gecko.util.GeckoEventListener;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.ClipData; import android.content.ClipData;
@@ -53,7 +52,6 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.MessageQueue; import android.os.MessageQueue;
import android.os.StatFs;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;

1
mobile/android/base/GeckoJarReader.java
View File

@@ -12,7 +12,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.util.Log; import android.util.Log;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
mobile/android/base/GeckoMenu.java
View File

@@ -19,8 +19,6 @@ import android.widget.AdapterView;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.LinearLayout.LayoutParams;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
mobile/android/base/LightweightTheme.java
View File

@@ -92,6 +92,7 @@ public class LightweightTheme implements GeckoEventListener {
final Bitmap bitmap = BitmapFactory.decodeStream(stream); final Bitmap bitmap = BitmapFactory.decodeStream(stream);
stream.close(); stream.close();
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override
public void run() { public void run() {
setLightweightTheme(bitmap); setLightweightTheme(bitmap);
} }
@@ -101,6 +102,7 @@ public class LightweightTheme implements GeckoEventListener {
} }
} else if (event.equals("LightweightTheme:Disable")) { } else if (event.equals("LightweightTheme:Disable")) {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override
public void run() { public void run() {
resetLightweightTheme(); resetLightweightTheme();
} }

3
mobile/android/base/MarketplaceApp.java.in
View File

@@ -11,11 +11,8 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log; import android.util.Log;
import android.view.MenuItem;
import org.json.JSONObject; import org.json.JSONObject;
import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.GeckoThread;

3
mobile/android/base/MenuItemDefault.java
View File

@@ -10,9 +10,6 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.AbsListView;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
public class MenuItemDefault extends TextView public class MenuItemDefault extends TextView

8
mobile/android/base/NotificationHandler.java.in
View File

@@ -6,22 +6,14 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@; package @ANDROID_PACKAGE_NAME@;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningAppProcessInfo;
import android.app.NotificationManager;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Process;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import java.util.List;
import org.mozilla.gecko.GeckoAppShell;
public class NotificationHandler extends BroadcastReceiver { public class NotificationHandler extends BroadcastReceiver {
private static final String LOGTAG = "GeckoNotificationHandler"; private static final String LOGTAG = "GeckoNotificationHandler";

2
mobile/android/base/RemoteTabs.java
View File

@@ -4,8 +4,6 @@
package org.mozilla.gecko; package org.mozilla.gecko;
import org.mozilla.gecko.widget.TwoWayView;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;

7
mobile/android/base/TabsPanel.java
View File

@@ -7,18 +7,11 @@ package org.mozilla.gecko;
import org.mozilla.gecko.widget.IconTabWidget; import org.mozilla.gecko.widget.IconTabWidget;
import org.mozilla.gecko.widget.TwoWayView;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;

2
mobile/android/base/TabsTray.java
View File

@@ -9,7 +9,6 @@ import org.mozilla.gecko.PropertyAnimator.Property;
import org.mozilla.gecko.widget.TwoWayView; import org.mozilla.gecko.widget.TwoWayView;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -25,7 +24,6 @@ import android.widget.BaseAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;

5
mobile/android/base/WebApp.java.in
View File

@@ -11,7 +11,6 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.content.Context; import android.content.Context;
@@ -24,20 +23,16 @@ import android.view.animation.AnimationUtils;
import android.view.animation.Animation; import android.view.animation.Animation;
import android.widget.ImageView; import android.widget.ImageView;
import android.view.Display; import android.view.Display;
import android.graphics.Point;
import java.net.URL; import java.net.URL;
import java.io.File; import java.io.File;
import org.mozilla.gecko.GeckoApp; import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.GeckoThread;
import org.mozilla.gecko.WebAppAllocator; import org.mozilla.gecko.WebAppAllocator;
import org.mozilla.gecko.Tab; import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs; import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.R; import org.mozilla.gecko.R;
import org.json.JSONObject;
public class WebApp extends GeckoApp { public class WebApp extends GeckoApp {
private static final String LOGTAG = "WebApp"; private static final String LOGTAG = "WebApp";

3
mobile/android/base/db/BrowserProvider.java.in
View File

@@ -16,7 +16,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -35,7 +34,6 @@ import org.mozilla.gecko.db.BrowserContract.SyncColumns;
import org.mozilla.gecko.db.BrowserContract.Thumbnails; import org.mozilla.gecko.db.BrowserContract.Thumbnails;
import org.mozilla.gecko.db.BrowserContract.URLColumns; import org.mozilla.gecko.db.BrowserContract.URLColumns;
import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.db.DBUtils; import org.mozilla.gecko.db.DBUtils;
import org.mozilla.gecko.gfx.BitmapUtils; import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.ProfileMigrator; import org.mozilla.gecko.ProfileMigrator;
@@ -61,7 +59,6 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder; import android.database.sqlite.SQLiteQueryBuilder;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;

17
mobile/android/base/db/FormHistoryProvider.java.in
View File

@@ -5,38 +5,21 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.db; package @ANDROID_PACKAGE_NAME@.db;
import java.io.File;
import java.io.IOException;
import java.lang.IllegalArgumentException; import java.lang.IllegalArgumentException;
import java.util.HashMap; import java.util.HashMap;
import java.util.ArrayList;
import java.util.Random;
import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.db.BrowserContract.CommonColumns;
import org.mozilla.gecko.db.DBUtils;
import org.mozilla.gecko.db.BrowserContract.FormHistory; import org.mozilla.gecko.db.BrowserContract.FormHistory;
import org.mozilla.gecko.db.BrowserContract.DeletedFormHistory; import org.mozilla.gecko.db.BrowserContract.DeletedFormHistory;
import org.mozilla.gecko.db.BrowserContract.SyncColumns;
import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.sqlite.SQLiteBridge; import org.mozilla.gecko.sqlite.SQLiteBridge;
import org.mozilla.gecko.sqlite.SQLiteBridgeException;
import org.mozilla.gecko.sync.Utils; import org.mozilla.gecko.sync.Utils;
import android.content.ContentProvider;
import android.content.ContentUris;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
public class FormHistoryProvider extends GeckoProvider { public class FormHistoryProvider extends GeckoProvider {
static final String TABLE_FORM_HISTORY = "moz_formhistory"; static final String TABLE_FORM_HISTORY = "moz_formhistory";

19
mobile/android/base/db/GeckoProvider.java.in
View File

@@ -6,40 +6,21 @@
package @ANDROID_PACKAGE_NAME@.db; package @ANDROID_PACKAGE_NAME@.db;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.lang.IllegalArgumentException;
import java.util.HashMap; import java.util.HashMap;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoProfile; import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.GeckoThread;
import org.mozilla.gecko.db.BrowserContract.CommonColumns;
import org.mozilla.gecko.db.DBUtils;
import org.mozilla.gecko.db.BrowserContract.Passwords;
import org.mozilla.gecko.db.BrowserContract.DeletedPasswords;
import org.mozilla.gecko.db.BrowserContract.SyncColumns;
import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.mozglue.GeckoLoader; import org.mozilla.gecko.mozglue.GeckoLoader;
import org.mozilla.gecko.sqlite.SQLiteBridge; import org.mozilla.gecko.sqlite.SQLiteBridge;
import org.mozilla.gecko.sqlite.SQLiteBridgeException; import org.mozilla.gecko.sqlite.SQLiteBridgeException;
import org.mozilla.gecko.sync.Utils;
import org.mozilla.gecko.util.GeckoEventListener;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentUris; import android.content.ContentUris;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;

14
mobile/android/base/db/PasswordsProvider.java.in
View File

@@ -5,38 +5,24 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.db; package @ANDROID_PACKAGE_NAME@.db;
import java.io.File;
import java.io.IOException;
import java.lang.IllegalArgumentException; import java.lang.IllegalArgumentException;
import java.util.HashMap; import java.util.HashMap;
import java.util.ArrayList;
import java.util.Random;
import org.mozilla.gecko.GeckoApp; import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.NSSBridge; import org.mozilla.gecko.NSSBridge;
import org.mozilla.gecko.db.DBUtils; import org.mozilla.gecko.db.DBUtils;
import org.mozilla.gecko.db.BrowserContract.Passwords; import org.mozilla.gecko.db.BrowserContract.Passwords;
import org.mozilla.gecko.db.BrowserContract.DeletedPasswords; import org.mozilla.gecko.db.BrowserContract.DeletedPasswords;
import org.mozilla.gecko.db.BrowserContract.SyncColumns;
import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.sqlite.MatrixBlobCursor; import org.mozilla.gecko.sqlite.MatrixBlobCursor;
import org.mozilla.gecko.sqlite.SQLiteBridge; import org.mozilla.gecko.sqlite.SQLiteBridge;
import org.mozilla.gecko.sqlite.SQLiteBridgeException;
import org.mozilla.gecko.sync.Utils; import org.mozilla.gecko.sync.Utils;
import org.mozilla.gecko.util.GeckoEventListener;
import android.content.ContentProvider;
import android.content.ContentUris;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;

5
mobile/android/base/db/TabsProvider.java.in
View File

@@ -6,19 +6,15 @@
package @ANDROID_PACKAGE_NAME@.db; package @ANDROID_PACKAGE_NAME@.db;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoProfile; import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.db.BrowserContract.CommonColumns;
import org.mozilla.gecko.db.BrowserContract.Clients; import org.mozilla.gecko.db.BrowserContract.Clients;
import org.mozilla.gecko.db.BrowserContract.Tabs; import org.mozilla.gecko.db.BrowserContract.Tabs;
import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.DBUtils; import org.mozilla.gecko.db.DBUtils;
import org.mozilla.gecko.sync.Utils;
import org.mozilla.gecko.util.GeckoBackgroundThread; import org.mozilla.gecko.util.GeckoBackgroundThread;
import android.content.ContentProvider; import android.content.ContentProvider;
@@ -27,7 +23,6 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.SQLException; import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;

1
mobile/android/base/gfx/GLController.java
View File

@@ -119,6 +119,7 @@ public class GLController {
// doing its thing. // doing its thing.
mView.post(new Runnable() { mView.post(new Runnable() {
@Override
public void run() { public void run() {
// If we haven't yet created the compositor, and the GfxInfoThread // If we haven't yet created the compositor, and the GfxInfoThread
// isn't done it's data gathering activities, then postpone creating // isn't done it's data gathering activities, then postpone creating

2
mobile/android/base/gfx/GeckoLayerClient.java
View File

@@ -17,7 +17,6 @@ import org.mozilla.gecko.util.FloatUtils;
import android.content.Context; import android.content.Context;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@@ -137,6 +136,7 @@ public class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
// This needs to run on the UI thread so that the surface validity can't change on // This needs to run on the UI thread so that the surface validity can't change on
// us while we're in the middle of creating the compositor. // us while we're in the middle of creating the compositor.
mView.post(new Runnable() { mView.post(new Runnable() {
@Override
public void run() { public void run() {
mView.getGLController().createCompositor(); mView.getGLController().createCompositor();
} }

2
mobile/android/base/gfx/GfxInfoThread.java
View File

@@ -8,8 +8,6 @@ package org.mozilla.gecko.gfx;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.util.Log; import android.util.Log;
import java.util.concurrent.SynchronousQueue;
import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLContext;

1
mobile/android/base/gfx/JavaPanZoomController.java
View File

@@ -750,6 +750,7 @@ class JavaPanZoomController
} }
private class AutoscrollRunnable extends AnimationRunnable { private class AutoscrollRunnable extends AnimationRunnable {
@Override
protected void animateFrame() { protected void animateFrame() {
if (mState != PanZoomState.AUTOSCROLL) { if (mState != PanZoomState.AUTOSCROLL) {
finishAnimation(); finishAnimation();

4
mobile/android/base/gfx/LayerView.java
View File

@@ -465,21 +465,25 @@ public class LayerView extends FrameLayout {
} }
private class SurfaceTextureListener implements TextureView.SurfaceTextureListener { private class SurfaceTextureListener implements TextureView.SurfaceTextureListener {
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) { public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
// We don't do this for surfaceCreated above because it is always followed by a surfaceChanged, // We don't do this for surfaceCreated above because it is always followed by a surfaceChanged,
// but that is not the case here. // but that is not the case here.
onSizeChanged(width, height); onSizeChanged(width, height);
} }
@Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) { public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
onDestroyed(); onDestroyed();
return true; // allow Android to call release() on the SurfaceTexture, we are done drawing to it return true; // allow Android to call release() on the SurfaceTexture, we are done drawing to it
} }
@Override
public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) { public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
onSizeChanged(width, height); onSizeChanged(width, height);
} }
@Override
public void onSurfaceTextureUpdated(SurfaceTexture surface) { public void onSurfaceTextureUpdated(SurfaceTexture surface) {
} }

2
mobile/android/base/mozglue/NativeZip.java
View File

@@ -43,6 +43,7 @@ public class NativeZip implements NativeReference {
release(); release();
} }
@Override
public void release() { public void release() {
if (mObj != 0) { if (mObj != 0) {
_release(mObj); _release(mObj);
@@ -51,6 +52,7 @@ public class NativeZip implements NativeReference {
mInput = null; mInput = null;
} }
@Override
public boolean isReleased() { public boolean isReleased() {
return (mObj == 0); return (mObj == 0);
} }

8
mobile/android/base/tests/ContentProviderTest.java.in
View File

@@ -1,10 +1,7 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentProviderClient;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.ContentProviderResult; import android.content.ContentProviderResult;
@@ -18,18 +15,13 @@ import android.database.Cursor;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.os.Build; import android.os.Build;
import android.net.Uri; import android.net.Uri;
import android.test.AndroidTestCase;
import android.test.IsolatedContext; import android.test.IsolatedContext;
import android.test.ProviderTestCase2;
import android.test.RenamingDelegatingContext; import android.test.RenamingDelegatingContext;
import android.test.mock.MockContentResolver; import android.test.mock.MockContentResolver;
import android.test.mock.MockContext; import android.test.mock.MockContext;
import android.util.Log;
import java.io.File; import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
/* /*

2
mobile/android/base/tests/MotionEventHelper.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.FloatMath; import android.util.FloatMath;

2
mobile/android/base/tests/MotionEventReplayer.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
mobile/android/base/tests/testAboutPage.java.in
View File

@@ -2,8 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.util.Log;
/* Tests related to the about: page: /* Tests related to the about: page:
* - check that about: loads from the awesome bar * - check that about: loads from the awesome bar

7
mobile/android/base/tests/testAddonManager.java.in
View File

@@ -2,16 +2,9 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.view.MenuItem;
import android.widget.TextView;
import android.widget.TabHost;
import android.content.ContentResolver;
import android.app.Instrumentation;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class testAddonManager extends PixelTest { public class testAddonManager extends PixelTest {

7
mobile/android/base/tests/testAllPagesTab.java.in
View File

@@ -1,26 +1,19 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import android.app.Activity;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.ExpandableListView;
import android.widget.LinearLayout;
import android.widget.TabHost; import android.widget.TabHost;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TabWidget; import android.widget.TabWidget;
import android.text.TextUtils; import android.text.TextUtils;
import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import java.util.Arrays; import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.io.File;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
/* Tests opening the all pages tab, that items look correct, clicking on an item /* Tests opening the all pages tab, that items look correct, clicking on an item

2
mobile/android/base/tests/testAwesomebar.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
public class testAwesomebar extends BaseTest { public class testAwesomebar extends BaseTest {
@Override @Override
protected int getTestType() { protected int getTestType() {

4
mobile/android/base/tests/testAwesomebarSwipes.java.in
View File

@@ -3,14 +3,10 @@ package @ANDROID_PACKAGE_NAME@.tests;
import com.jayway.android.robotium.solo.Solo; import com.jayway.android.robotium.solo.Solo;
import android.app.Activity;
import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TabWidget; import android.widget.TabWidget;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import java.util.ArrayList;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
/* Tests opening the all pages tab, that items look correct, clicking on an item /* Tests opening the all pages tab, that items look correct, clicking on an item

1
mobile/android/base/tests/testAxisLocking.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation;
/** /**
* Basic test for axis locking behaviour. * Basic test for axis locking behaviour.

6
mobile/android/base/tests/testBookmark.java.in
View File

@@ -2,15 +2,9 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.database.Cursor; import android.database.Cursor;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ListAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import android.widget.TabHost;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import android.content.ContentResolver; import android.content.ContentResolver;

3
mobile/android/base/tests/testBookmarklets.java.in
View File

@@ -2,12 +2,9 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.database.Cursor; import android.database.Cursor;
import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import java.util.ArrayList;
public class testBookmarklets extends PixelTest { public class testBookmarklets extends PixelTest {

6
mobile/android/base/tests/testBookmarksTab.java.in
View File

@@ -2,20 +2,14 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.ExpandableListView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TabHost;
import android.text.TextUtils; import android.text.TextUtils;
import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.io.File;
/** /**
* Tests the Bookmarks Tab * Tests the Bookmarks Tab

5
mobile/android/base/tests/testBrowserProvider.java.in
View File

@@ -1,21 +1,16 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.ContentUris; import android.content.ContentUris;
import android.content.ContentProviderResult; import android.content.ContentProviderResult;
import android.content.ContentProviderOperation; import android.content.ContentProviderOperation;
import android.content.OperationApplicationException; import android.content.OperationApplicationException;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.util.Log; import android.util.Log;
import java.io.File;
import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;

4
mobile/android/base/tests/testBrowserProviderPerf.java.in
View File

@@ -1,15 +1,11 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.UUID; import java.util.UUID;
import java.util.Random; import java.util.Random;

2
mobile/android/base/tests/testCheck.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
public class testCheck extends PixelTest { public class testCheck extends PixelTest {
private void pause(int length) { private void pause(int length) {
try { try {

2
mobile/android/base/tests/testCheck2.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
public class testCheck2 extends PixelTest { public class testCheck2 extends PixelTest {
@Override @Override
protected int getTestType() { protected int getTestType() {

7
mobile/android/base/tests/testClearPrivateData.java.in
View File

@@ -2,14 +2,7 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.widget.ListView; import android.widget.ListView;
import android.view.ViewGroup;
import android.view.View;
import android.widget.ExpandableListView;
import android.widget.TabHost;
import java.util.ArrayList;
public class testClearPrivateData extends PixelTest { public class testClearPrivateData extends PixelTest {

3
mobile/android/base/tests/testDistribution.java.in
View File

@@ -5,11 +5,8 @@ import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity; import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.util.Log;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.lang.ClassLoader; import java.lang.ClassLoader;

4
mobile/android/base/tests/testDoorHanger.java.in
View File

@@ -1,10 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentResolver;
/* This test will test if doorhangers are displayed and dismissed /* This test will test if doorhangers are displayed and dismissed
The test will test: The test will test:
* geolocation doorhangers - sharing and not sharing the location dismisses the doorhanger * geolocation doorhangers - sharing and not sharing the location dismisses the doorhanger

1
mobile/android/base/tests/testFlingCorrectness.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation;
/** /**
* Basic fling correctness test. * Basic fling correctness test.

4
mobile/android/base/tests/testFormHistory.java.in
View File

@@ -1,16 +1,12 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.Cursor;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import java.io.File; import java.io.File;
import java.lang.ClassLoader; import java.lang.ClassLoader;
import java.util.ArrayList;
/** /**
* A basic form history contentprovider test. * A basic form history contentprovider test.

2
mobile/android/base/tests/testHistory.java.in
View File

@@ -5,10 +5,8 @@ import @ANDROID_PACKAGE_NAME@.*;
import android.widget.ListView; import android.widget.ListView;
import android.app.Activity; import android.app.Activity;
import java.util.ArrayList; import java.util.ArrayList;
import android.widget.TabHost;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.util.Log;
public class testHistory extends PixelTest { public class testHistory extends PixelTest {
private View mFirstChild; private View mFirstChild;

7
mobile/android/base/tests/testHistoryTab.java.in
View File

@@ -3,25 +3,18 @@ package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.ExpandableListView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TabHost;
import android.text.TextUtils; import android.text.TextUtils;
import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import java.util.Arrays; import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.io.File;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;

9
mobile/android/base/tests/testJarReader.java.in
View File

@@ -1,18 +1,9 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.Bitmap;
import java.lang.ClassLoader; import java.lang.ClassLoader;
import java.util.ArrayList;
import java.io.Writer;
import java.io.InputStream; import java.io.InputStream;
import java.io.ByteArrayInputStream;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.io.StringWriter;
/** /**
* A basic jar reader test. Tests reading a png from fennec's apk, as well * A basic jar reader test. Tests reading a png from fennec's apk, as well

2
mobile/android/base/tests/testLoad.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
/** /**
* A basic page load test. * A basic page load test.
* - loads a page * - loads a page

7
mobile/android/base/tests/testMigration.java.in
View File

@@ -1,27 +1,20 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.database.Cursor; import android.database.Cursor;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.provider.Browser;
import android.util.Log; import android.util.Log;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.lang.ClassLoader;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;

1
mobile/android/base/tests/testOverscroll.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation;
/** /**
* Basic test to check bounce-back from overscroll. * Basic test to check bounce-back from overscroll.

2
mobile/android/base/tests/testPan.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
/** /**
* A panning performance test. * A panning performance test.
* Drags the page a bunch of times and measures the frames per second * Drags the page a bunch of times and measures the frames per second

1
mobile/android/base/tests/testPanCorrectness.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation;
/** /**
* A basic panning correctness test. * A basic panning correctness test.

2
mobile/android/base/tests/testPasswordEncrypt.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.Cursor; import android.database.Cursor;
@@ -12,7 +11,6 @@ import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class testPasswordEncrypt extends BaseTest { public class testPasswordEncrypt extends BaseTest {

2
mobile/android/base/tests/testPasswordProvider.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.Cursor; import android.database.Cursor;

2
mobile/android/base/tests/testSearchSuggestions.java.in
View File

@@ -7,8 +7,6 @@ import android.content.Context;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import android.util.Log;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

1
mobile/android/base/tests/testShareLink.java.in
View File

@@ -10,7 +10,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import android.widget.TextView;
import android.app.Activity; import android.app.Activity;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;

2
mobile/android/base/tests/testSystemPages.java.in
View File

@@ -2,8 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.util.Log;
import java.util.Arrays; import java.util.Arrays;
/** This patch tests the System Pages first by loading system pages from /** This patch tests the System Pages first by loading system pages from

3
mobile/android/base/tests/testTabHistory.java.in
View File

@@ -1,9 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.util.Log;
public class testTabHistory extends PixelTest { public class testTabHistory extends PixelTest {
@Override @Override

2
mobile/android/base/tests/testThumbnails.java.in
View File

@@ -1,8 +1,6 @@
#filter substitution #filter substitution
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;

1
mobile/android/base/tests/testWebContentContextMenu.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Activity;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
/* Test the context menu on web content: Long click on a link, /* Test the context menu on web content: Long click on a link,

1
mobile/android/base/tests/test_bug720538.java.in
View File

@@ -2,7 +2,6 @@
package @ANDROID_PACKAGE_NAME@.tests; package @ANDROID_PACKAGE_NAME@.tests;
import @ANDROID_PACKAGE_NAME@.*; import @ANDROID_PACKAGE_NAME@.*;
import android.app.Instrumentation;
public class test_bug720538 extends PixelTest { public class test_bug720538 extends PixelTest {
@Override @Override