Index: mobile/android/base/BrowserApp.java |
=================================================================== |
--- a/mobile/android/base/BrowserApp.java |
+++ b/mobile/android/base/BrowserApp.java |
@@ -131,16 +131,18 @@ import android.widget.Button; |
import android.widget.ListView; |
import android.widget.RelativeLayout; |
import android.widget.Toast; |
import android.widget.ViewFlipper; |
import com.keepsafe.switchboard.AsyncConfigLoader; |
import com.keepsafe.switchboard.SwitchBoard; |
import com.nineoldandroids.animation.Animator; |
import com.nineoldandroids.animation.ObjectAnimator; |
+import org.adblockplus.browser.BrowserAppUtils; |
+import org.adblockplus.browser.StartPane; |
import org.json.JSONException; |
import org.json.JSONObject; |
import java.io.ByteArrayOutputStream; |
import java.io.File; |
import java.io.FileNotFoundException; |
import java.io.IOException; |
import java.lang.reflect.Method; |
@@ -301,18 +303,17 @@ public class BrowserApp extends GeckoApp |
// fall through |
case LOCATION_CHANGE: |
if (mZoomedView != null) { |
mZoomedView.stopZoomDisplay(false); |
} |
if (Tabs.getInstance().isSelectedTab(tab)) { |
updateHomePagerForTab(tab); |
if (mMenu != null) |
- org.adblockplus.browser.BrowserAppUtils.updateBlockAdsMenuItem( |
- mMenu.findItem(R.id.abb_block_ads)); |
+ BrowserAppUtils.updateBlockAdsMenuItem(mMenu.findItem(R.id.abb_block_ads)); |
} |
mDynamicToolbar.persistTemporaryVisibility(); |
break; |
case START: |
if (Tabs.getInstance().isSelectedTab(tab)) { |
invalidateOptionsMenu(); |
@@ -2423,17 +2424,17 @@ public class BrowserApp extends GeckoApp |
break; |
default: |
super.onActivityResult(requestCode, resultCode, data); |
} |
} |
private void showFirstrunPager() { |
- final DialogFragment dialog = new org.adblockplus.browser.StartPane(); |
+ final DialogFragment dialog = new StartPane(); |
dialog.show(getSupportFragmentManager(), "start_pane"); |
// Exiting here because we want to show our first run page instead of Mozilla's |
// see https://issues.adblockplus.org/ticket/2774 |
if (true) |
{ |
return; |
} |
@@ -2883,18 +2884,17 @@ public class BrowserApp extends GeckoApp |
final GeckoMenuItem quickShare = (GeckoMenuItem) mMenu.findItem(R.id.quickshare); |
GeckoActionProvider provider = GeckoActionProvider.getForType(GeckoActionProvider.DEFAULT_MIME_TYPE, this); |
share.setActionProvider(provider); |
quickShare.setActionProvider(provider); |
} |
- org.adblockplus.browser.BrowserAppUtils.updateBlockAdsMenuItem( |
- mMenu.findItem(R.id.abb_block_ads)); |
+ BrowserAppUtils.updateBlockAdsMenuItem(mMenu.findItem(R.id.abb_block_ads)); |
return true; |
} |
@Override |
public void openOptionsMenu() { |
// Disable menu access (for hardware buttons) when the software menu button is inaccessible. |
// Note that the software button is always accessible on new tablet. |
@@ -3372,17 +3372,17 @@ public class BrowserApp extends GeckoApp |
} catch (JSONException e) { |
Log.e(LOGTAG, "error building json arguments", e); |
} |
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("DesktopMode:Change", args.toString())); |
return true; |
} |
if (itemId == R.id.abb_block_ads) { |
- org.adblockplus.browser.BrowserAppUtils.updateCurrentTabWhitelisting(item); |
+ BrowserAppUtils.updateCurrentTabWhitelisting(item); |
return true; |
} |
if (itemId == R.id.new_tab) { |
addTab(); |
return true; |
} |