--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -166,32 +166,34 @@ public class AboutHomeContent extends Sc
     }
 
     private void inflate() {
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mInflater.inflate(R.layout.abouthome_content, this);
 
         mTopSitesGrid = (TopSitesGridView)findViewById(R.id.top_sites_grid);
         mTopSitesGrid.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
                 TopSitesViewHolder holder = (TopSitesViewHolder) v.getTag();
                 String spec = holder.getUrl();
 
                 // If we don't have a url, this must be an empty row. Show the edit dialog box
                 if (TextUtils.isEmpty(spec)) {
                     editSite(spec, position);
                     return;
                 }
 
                 if (mUriLoadCallback != null)
                     mUriLoadCallback.callback(spec);
             }
         });
 
         mTopSitesGrid.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
+            @Override
             public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
                 AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo)menuInfo;
                 mTopSitesGrid.setSelectedPosition(info.position);
 
                 MenuInflater inflater = mActivity.getMenuInflater();
                 inflater.inflate(R.menu.abouthome_topsites_contextmenu, menu);
 
                 // If nothing is pinned at all, hide both clear items
@@ -212,23 +214,25 @@ public class AboutHomeContent extends Sc
         });
 
         mPromoBox = (AboutHomePromoBox) findViewById(R.id.promo_box);
         mAddons = (AboutHomeSection) findViewById(R.id.recommended_addons);
         mLastTabs = (AboutHomeSection) findViewById(R.id.last_tabs);
         mRemoteTabs = (AboutHomeSection) findViewById(R.id.remote_tabs);
 
         mAddons.setOnMoreTextClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 if (mUriLoadCallback != null)
                     mUriLoadCallback.callback("https://addons.mozilla.org/android");
             }
         });
 
         mRemoteTabs.setOnMoreTextClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 mActivity.showRemoteTabs();
             }
         });
 
         setTopSitesConstants();
     }
 
@@ -276,16 +280,17 @@ public class AboutHomeContent extends Sc
         setTopSitesVisibility(hasTopSites);
         mPromoBox.showRandomPromo();
     }
 
     private void updateLayoutForSync() {
         final GeckoApp.StartupMode startupMode = mActivity.getStartupMode();
 
         post(new Runnable() {
+            @Override
             public void run() {
                 // The listener might run before the UI is initially updated.
                 // In this case, we should simply wait for the initial setup
                 // to happen.
                 if (mTopSitesAdapter != null)
                     updateLayout();
             }
         });
@@ -297,16 +302,17 @@ public class AboutHomeContent extends Sc
         if (mTopSitesAdapter != null) {
             old = mTopSitesAdapter.getCursor();
         }
         // Swap in the new cursor.
         final Cursor oldCursor = old;
         final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
 
         post(new Runnable() {
+            @Override
             public void run() {
                 if (mTopSitesAdapter == null) {
                     mTopSitesAdapter = new TopSitesCursorAdapter(mActivity,
                                                                  R.layout.abouthome_topsite_item,
                                                                  newCursor,
                                                                  new String[] { URLColumns.TITLE },
                                                                  new int[] { R.id.title });
 
@@ -432,16 +438,17 @@ public class AboutHomeContent extends Sc
             public void onPostExecute(Cursor c) {
                 updateTopSitesThumbnails(getThumbnailsFromCursor(c));
             }
         }).execute();
     }
 
     void update(final EnumSet<UpdateFlags> flags) {
         GeckoAppShell.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 if (flags.contains(UpdateFlags.TOP_SITES))
                     loadTopSites();
 
                 if (flags.contains(UpdateFlags.PREVIOUS_TABS))
                     readLastTabs();
 
                 if (flags.contains(UpdateFlags.RECOMMENDED_ADDONS))
@@ -570,16 +577,17 @@ public class AboutHomeContent extends Sc
                 addonsArray = new JSONObject(jsonString).getJSONArray("addons");
             } catch (JSONException e) {
                 Log.i(LOGTAG, "error reading json file", e);
             }
         }
 
         final JSONArray array = addonsArray;
         post(new Runnable() {
+            @Override
             public void run() {
                 try {
                     if (array == null || array.length() == 0) {
                         mAddons.hide();
                         return;
                     }
 
                     for (int i = 0; i < array.length(); i++) {
@@ -598,25 +606,27 @@ public class AboutHomeContent extends Sc
                         drawable.setBounds(sIconBounds);
                         row.setCompoundDrawables(drawable, null, null, null);
 
                         String iconUrl = jsonobj.getString("iconURL");
                         String pageUrl = getPageUrlFromIconUrl(iconUrl);
 
                         final String homepageUrl = jsonobj.getString("homepageURL");
                         row.setOnClickListener(new View.OnClickListener() {
+                            @Override
                             public void onClick(View v) {
                                 if (mUriLoadCallback != null)
                                     mUriLoadCallback.callback(homepageUrl);
                             }
                         });
 
                         Favicons favicons = Favicons.getInstance();
                         favicons.loadFavicon(pageUrl, iconUrl, true,
                                     new Favicons.OnFaviconLoadedListener() {
+                            @Override
                             public void onFaviconLoaded(String url, Bitmap favicon) {
                                 if (favicon != null) {
                                     Drawable drawable = new BitmapDrawable(favicon);
                                     drawable.setBounds(sIconBounds);
                                     row.setCompoundDrawables(drawable, null, null, null);
                                 }
                             }
                         });
@@ -649,25 +659,27 @@ public class AboutHomeContent extends Sc
                     return;
                 }
 
                 ContentResolver resolver = mActivity.getContentResolver();
                 final Bitmap favicon = BrowserDB.getFaviconForUrl(resolver, url);
                 lastTabUrlsList.add(url);
 
                 AboutHomeContent.this.post(new Runnable() {
+                    @Override
                     public void run() {
                         View container = mInflater.inflate(R.layout.abouthome_last_tabs_row, mLastTabs.getItemsContainer(), false);
                         ((TextView) container.findViewById(R.id.last_tab_title)).setText(tab.getSelectedTitle());
                         ((TextView) container.findViewById(R.id.last_tab_url)).setText(tab.getSelectedUrl());
                         if (favicon != null) {
                             ((ImageView) container.findViewById(R.id.last_tab_favicon)).setImageBitmap(favicon);
                         }
 
                         container.setOnClickListener(new View.OnClickListener() {
+                            @Override
                             public void onClick(View v) {
                                 int flags = Tabs.LOADURL_NEW_TAB;
                                 if (Tabs.getInstance().getSelectedTab().isPrivate())
                                     flags |= Tabs.LOADURL_PRIVATE;
                                 Tabs.getInstance().loadUrl(url, flags);
                             }
                         });
 
@@ -675,20 +687,22 @@ public class AboutHomeContent extends Sc
                     }
                 });
             }
         }.parse(jsonString);
 
         final int numLastTabs = lastTabUrlsList.size();
         if (numLastTabs >= 1) {
             post(new Runnable() {
+                @Override
                 public void run() {
                     if (numLastTabs > 1) {
                         mLastTabs.showMoreText();
                         mLastTabs.setOnMoreTextClickListener(new View.OnClickListener() {
+                            @Override
                             public void onClick(View v) {
                                 int flags = Tabs.LOADURL_NEW_TAB;
                                 if (Tabs.getInstance().getSelectedTab().isPrivate())
                                     flags |= Tabs.LOADURL_PRIVATE;
                                 for (String url : lastTabUrlsList) {
                                     Tabs.getInstance().loadUrl(url, flags);
                                 }
                             }
@@ -700,16 +714,17 @@ public class AboutHomeContent extends Sc
                 }
             });
         }
     }
 
     private void loadRemoteTabs() {
         if (!SyncAccounts.syncAccountsExist(mActivity)) {
             post(new Runnable() {
+                @Override
                 public void run() {
                     mRemoteTabs.hide();
                 }
             });
             return;
         }
 
         TabsAccessor.getTabs(getContext(), NUMBER_OF_REMOTE_TABS, this);
@@ -1038,16 +1053,17 @@ public class AboutHomeContent extends Sc
         Intent intent = new Intent(mContext, AwesomeBar.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         intent.putExtra(AwesomeBar.TARGET_KEY, AwesomeBar.Target.PICK_SITE.toString());
         if (url != null && !TextUtils.isEmpty(url)) {
             intent.putExtra(AwesomeBar.CURRENT_URL_KEY, url);
         }
 
         int requestCode = GeckoAppShell.sActivityHelper.makeRequestCode(new ActivityResultHandler() {
+            @Override
             public void onActivityResult(int resultCode, Intent data) {
                 if (resultCode == Activity.RESULT_CANCELED || data == null)
                     return;
 
                 final View v = mTopSitesGrid.getChildAt(position);
                 final TopSitesViewHolder holder = (TopSitesViewHolder) v.getTag();
 
                 final String title = data.getStringExtra(AwesomeBar.TITLE_KEY);

--- a/mobile/android/base/AboutHomePromoBox.java
+++ b/mobile/android/base/AboutHomePromoBox.java
@@ -61,16 +61,17 @@ public class AboutHomePromoBox extends T
     }
 
     private class SyncType extends Type {
         private OnAccountsUpdateListener mAccountListener;
         public SyncType(int aText, int aBoldText, int aImage) {
             super(aText, aBoldText, aImage);
             // The listener will run on the background thread (see 2nd argument)
             mAccountListener = new OnAccountsUpdateListener() {
+                @Override
                 public void onAccountsUpdated(Account[] accounts) {
                     showRandomPromo();
                 }
             };
             AccountManager.get(mContext).addOnAccountsUpdatedListener(mAccountListener, GeckoAppShell.getHandler(), false);
         }
         @Override
         public boolean canShow() {
@@ -120,16 +121,17 @@ public class AboutHomePromoBox extends T
             @Override
             public void onClick(View v) {
                 Tabs.getInstance().loadUrl("https://marketplace.firefox.com/", Tabs.LOADURL_NEW_TAB);
 
                 // this isn't as good as being notified whenever this url is added to the database,
                 // if the user visits the marketplace through some other means, we'll have to wait
                 // until we are refreshed or restarted to get the correct value
                 v.postDelayed(new Runnable() {
+                    @Override
                     public void run() {
                         showRandomPromo();
                     }
                 }, 5000);
             }
         });
     }
 
@@ -144,16 +146,17 @@ public class AboutHomePromoBox extends T
     }
 
     /**
      * Shows the specified promo box. If a promo box is already active, it will be overidden with a
      * promo box of the specified type.
      */
     public void showRandomPromo() {
         getAvailableTypes(new GetTypesCallback() {
+            @Override
             public void onGotTypes(ArrayList<Type> types) {
                 if (types.size() == 0) {
                     hide();
                     return;
                 }
 
                 // Try to maintain a promo type for the lifetime of the application
                 if (AboutHomePromoBox.sTypeIndex == -1 || AboutHomePromoBox.sTypeIndex >= types.size()) {

--- a/mobile/android/base/ActivityHandlerHelper.java
+++ b/mobile/android/base/ActivityHandlerHelper.java
@@ -235,13 +235,14 @@ class ActivityHandlerHelper {
         private final String mTitle;
         private final PromptService.PromptListItem[] mItems;
 
         public FilePickerPromptRunnable(String aTitle, PromptService.PromptListItem[] aItems) {
             mTitle = aTitle;
             mItems = aItems;
         }
 
+        @Override
         public void run() {
             GeckoApp.mAppContext.getPromptService().show(mTitle, "", mItems, false);
         }
     }
 }

--- a/mobile/android/base/AndroidImportPreference.java
+++ b/mobile/android/base/AndroidImportPreference.java
@@ -69,28 +69,31 @@ class AndroidImportPreference extends Mu
 
         final ProgressDialog dialog =
             ProgressDialog.show(mContext,
                                 dialogTitle,
                                 mContext.getString(R.string.bookmarkhistory_import_wait),
                                 true);
 
         final Runnable stopCallback = new Runnable() {
+            @Override
             public void run() {
                 GeckoApp.mAppContext.runOnUiThread(new Runnable() {
+                    @Override
                     public void run() {
                         dialog.dismiss();
                     }
                 });
             }
         };
 
         GeckoBackgroundThread.getHandler().post(
             // Constructing AndroidImport may need finding the profile,
             // which hits disk, so it needs to go into a Runnable too.
             new Runnable() {
+                @Override
                 public void run() {
                     new AndroidImport(mContext, stopCallback, doBookmarks, doHistory).run();
                 }
             }
         );
     }
 }

--- a/mobile/android/base/AnimatedHeightLayout.java
+++ b/mobile/android/base/AnimatedHeightLayout.java
@@ -29,20 +29,24 @@ public class AnimatedHeightLayout extend
             mAnimating = true;
             setMeasuredDimension(getMeasuredWidth(), oldHeight);
 
             // Animate the difference of suggestion row height
             Animation anim = new HeightChangeAnimation(this, oldHeight, newHeight);
             anim.setDuration(ANIMATION_DURATION);
             anim.setInterpolator(new DecelerateInterpolator());
             anim.setAnimationListener(new Animation.AnimationListener() {
+                @Override
                 public void onAnimationStart(Animation animation) {}
+                @Override
                 public void onAnimationRepeat(Animation animation) {}
+                @Override
                 public void onAnimationEnd(Animation animation) {
                     post(new Runnable() {
+                        @Override
                         public void run() {
                             finishAnimation();
                         }
                     });
                 }
             });
             startAnimation(anim);
         }

--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -83,38 +83,43 @@ public class AwesomeBar extends GeckoAct
         mGoButton = (ImageButton) findViewById(R.id.awesomebar_button);
         mText = (CustomEditText) findViewById(R.id.awesomebar_text);
 
         TabWidget tabWidget = (TabWidget) findViewById(android.R.id.tabs);
         tabWidget.setDividerDrawable(null);
 
         mAwesomeTabs = (AwesomeBarTabs) findViewById(R.id.awesomebar_tabs);
         mAwesomeTabs.setOnUrlOpenListener(new AwesomeBarTabs.OnUrlOpenListener() {
+            @Override
             public void onUrlOpen(String url, String title) {
                 openUrlAndFinish(url, title, false);
             }
 
+            @Override
             public void onSearch(String engine, String text) {
                 openSearchAndFinish(text, engine);
             }
 
+            @Override
             public void onEditSuggestion(final String text) {
                 GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         mText.setText(text);
                         mText.setSelection(mText.getText().length());
                         mText.requestFocus();
                         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
                         imm.showSoftInput(mText, InputMethodManager.SHOW_IMPLICIT);
                     }
                 });
             }
         });
 
         mGoButton.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 openUserEnteredAndFinish(mText.getText().toString());
             }
         });
 
         Intent intent = getIntent();
         String currentUrl = intent.getStringExtra(CURRENT_URL_KEY);
         if (currentUrl != null) {
@@ -134,16 +139,17 @@ public class AwesomeBar extends GeckoAct
                     mTabs.setPrivateMode(true);
 
                 mText.setPrivateMode(true);
             }
         }
         mAwesomeTabs.setTarget(mTarget);
 
         mText.setOnKeyPreImeListener(new CustomEditText.OnKeyPreImeListener() {
+            @Override
             public boolean onKeyPreIme(View v, int keyCode, KeyEvent event) {
                 // We only want to process one event per tap
                 if (event.getAction() != KeyEvent.ACTION_DOWN)
                     return false;
 
                 if (keyCode == KeyEvent.KEYCODE_ENTER) {
                     // If the AwesomeBar has a composition string, don't submit the text yet.
                     // ENTER is needed to commit the composition string.
@@ -170,57 +176,62 @@ public class AwesomeBar extends GeckoAct
                     return true;
                 }
 
                 return false;
             }
         });
 
         mText.addTextChangedListener(new TextWatcher() {
+            @Override
             public void afterTextChanged(Editable s) {
                 String text = s.toString();
                 mAwesomeTabs.filter(text);
 
                 // If the AwesomeBar has a composition string, don't call updateGoButton().
                 // That method resets IME and composition state will be broken.
                 if (!hasCompositionString(s)) {
                     updateGoButton(text);
                 }
 
                 if (Build.VERSION.SDK_INT >= 11) {
                     getActionBar().hide();
                 }
             }
 
+            @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                                           int after) {
                 // do nothing
             }
 
+            @Override
             public void onTextChanged(CharSequence s, int start, int before,
                                       int count) {
                 // do nothing
             }
         });
 
         mText.setOnKeyListener(new View.OnKeyListener() {
+            @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_ENTER) {
                     if (event.getAction() != KeyEvent.ACTION_DOWN)
                         return true;
 
                     openUserEnteredAndFinish(mText.getText().toString());
                     return true;
                 } else {
                     return false;
                 }
             }
         });
 
         mText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 if (v == null || hasFocus) {
                     return;
                 }
 
                 InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
                 try {
                     imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
@@ -560,16 +571,17 @@ public class AwesomeBar extends GeckoAct
                 final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name));
                 final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location));
                 final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword));
                 nameText.setText(title);
                 locationText.setText(url);
                 keywordText.setText(keyword);
 
                 editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                         (new UiAsyncTask<Void, Void, Void>(GeckoAppShell.getHandler()) {
                             @Override
                             public Void doInBackground(Void... params) {
                                 String newUrl = locationText.getText().toString().trim();
                                 BrowserDB.updateBookmark(getContentResolver(), id, newUrl, nameText.getText().toString(),
                                                          keywordText.getText().toString());
                                 return null;
@@ -579,31 +591,35 @@ public class AwesomeBar extends GeckoAct
                             public void onPostExecute(Void result) {
                                 Toast.makeText(AwesomeBar.this, R.string.bookmark_updated, Toast.LENGTH_SHORT).show();
                             }
                         }).execute();
                     }
                 });
 
                 editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
-                      public void onClick(DialogInterface dialog, int whichButton) {
+                    @Override
+                    public void onClick(DialogInterface dialog, int whichButton) {
                           // do nothing
                       }
                 });
 
                 final AlertDialog dialog = editPrompt.create();
 
                 // disable OK button if the URL is empty
                 locationText.addTextChangedListener(new TextWatcher() {
                     private boolean mEnabled = true;
 
+                    @Override
                     public void afterTextChanged(Editable s) {}
 
+                    @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
+                    @Override
                     public void onTextChanged(CharSequence s, int start, int before, int count) {
                         boolean enabled = (s.toString().trim().length() > 0);
                         if (mEnabled != enabled) {
                             dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
                             mEnabled = enabled;
                         }
                     }
                 });

--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -125,16 +125,17 @@ public class AwesomeBarTabs extends TabH
 
         mInflated = true;
 
         // This should be called before adding any tabs
         // to the TabHost.
         setup();
 
         mListTouchListener = new View.OnTouchListener() {
+            @Override
             public boolean onTouch(View view, MotionEvent event) {
                 if (event.getActionMasked() == MotionEvent.ACTION_DOWN)
                     hideSoftInput(view);
                 return false;
             }
         };
 
         mTabs = new AwesomeBarTab[] {
@@ -259,16 +260,17 @@ public class AwesomeBarTabs extends TabH
         GeckoTextView indicatorView = (GeckoTextView) mInflater.inflate(R.layout.awesomebar_tab_indicator, null);
         indicatorView.setText(titleId);
 
         getTabWidget().addView(indicatorView);
 
         // this MUST be done after tw.addView to overwrite the listener added by tabWidget
         // which delegates to TabHost (which we don't have)
         indicatorView.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 mViewPager.setCurrentItem(contentId, true);
             }
         });
 
         return indicatorView;
     }
 

--- a/mobile/android/base/AwesomebarResultHandler.java
+++ b/mobile/android/base/AwesomebarResultHandler.java
@@ -6,16 +6,17 @@ package org.mozilla.gecko;
 
 import org.mozilla.gecko.util.ActivityResultHandler;
 
 import android.content.Intent;
 
 class AwesomebarResultHandler implements ActivityResultHandler {
     private static final String LOGTAG = "GeckoAwesomebarResultHandler";
 
+    @Override
     public void onActivityResult(int resultCode, Intent data) {
         if (data != null) {
             String url = data.getStringExtra(AwesomeBar.URL_KEY);
             AwesomeBar.Target target = AwesomeBar.Target.valueOf(data.getStringExtra(AwesomeBar.TARGET_KEY));
             String searchEngine = data.getStringExtra(AwesomeBar.SEARCH_KEY);
             if (url != null && url.length() > 0) {
                 int flags = Tabs.LOADURL_NONE;
                 if (target == AwesomeBar.Target.NEW_TAB) {

--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -70,16 +70,17 @@ abstract public class BrowserApp extends
         public int parent;
     }
 
     private Vector<MenuItemInfo> mAddonMenuItemsCache;
 
     private PropertyAnimator mMainLayoutAnimator;
 
     private static final Interpolator sTabsInterpolator = new Interpolator() {
+        @Override
         public float getInterpolation(float t) {
             t -= 1.0f;
             return t * t * t * t * t + 1.0f;
         }
     };
 
     private FindInPageBar mFindInPageBar;
 
@@ -105,16 +106,17 @@ abstract public class BrowserApp extends
                     SiteIdentityPopup.getInstance().dismiss();
 
                     final TabsPanel.Panel panel = tab.isPrivate()
                                                 ? TabsPanel.Panel.PRIVATE_TABS
                                                 : TabsPanel.Panel.NORMAL_TABS;
                     // Delay calling showTabs so that it does not modify the mTabsChangedListeners
                     // array while we are still iterating through the array.
                     mMainHandler.post(new Runnable() {
+                        @Override
                         public void run() {
                             if (areTabsShown() && mTabsPanel.getCurrentPanel() != panel)
                                 showTabs(panel);
                         }
                     });
                 }
                 break;
             case LOAD_ERROR:
@@ -149,35 +151,38 @@ abstract public class BrowserApp extends
 
     void handleReaderAdded(boolean success, final String title, final String url) {
         if (!success) {
             showToast(R.string.reading_list_failed, Toast.LENGTH_SHORT);
             return;
         }
 
         GeckoAppShell.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 BrowserDB.addReadingListItem(getContentResolver(), title, url);
                 showToast(R.string.reading_list_added, Toast.LENGTH_SHORT);
             }
         });
     }
 
     void handleReaderRemoved(final String url) {
         GeckoAppShell.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 BrowserDB.removeReadingListItemWithURL(getContentResolver(), url);
                 showToast(R.string.reading_list_removed, Toast.LENGTH_SHORT);
             }
         });
     }
 
     @Override
     void onStatePurged() {
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 if (mAboutHomeContent != null)
                     mAboutHomeContent.setLastTabsVisibility(false);
             }
         });
 
         super.onStatePurged();
     }
@@ -271,16 +276,17 @@ abstract public class BrowserApp extends
                 Tabs.getInstance().loadUrl(uri, flags);
             }
         }
     }
 
     @Override
     void toggleChrome(final boolean aShow) {
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 if (aShow) {
                     mBrowserToolbar.show();
                 } else {
                     mBrowserToolbar.hide();
                     if (hasTabsSideBar()) {
                         hideTabs();
                     }
@@ -289,16 +295,17 @@ abstract public class BrowserApp extends
         });
 
         super.toggleChrome(aShow);
     }
 
     @Override
     void focusChrome() {
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 mBrowserToolbar.show();
                 mBrowserToolbar.requestFocusFromTouch();
             }
         });
     }
 
     @Override
@@ -416,31 +423,34 @@ abstract public class BrowserApp extends
                 try {
                     info.checkable = message.getBoolean("checkable");
                 } catch (Exception ex) { }
                 try { // parent is optional
                     info.parent = message.getInt("parent") + ADDON_MENU_OFFSET;
                 } catch (Exception ex) { }
                 final MenuItemInfo menuItemInfo = info;
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         addAddonMenuItem(menuItemInfo);
                     }
                 });
             } else if (event.equals("Menu:Remove")) {
                 final int id = message.getInt("id") + ADDON_MENU_OFFSET;
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         removeAddonMenuItem(id);
                     }
                 });
             } else if (event.equals("Menu:Update")) {
                 final int id = message.getInt("id") + ADDON_MENU_OFFSET;
                 final JSONObject options = message.getJSONObject("options");
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         updateAddonMenuItem(id, options);
                     }
                 });
             } else if (event.equals("CharEncoding:Data")) {
                 final JSONArray charsets = message.getJSONArray("charsets");
                 int selected = message.getInt("selected");
 
@@ -448,41 +458,45 @@ abstract public class BrowserApp extends
                 final String[] titleArray = new String[len];
                 for (int i = 0; i < len; i++) {
                     JSONObject charset = charsets.getJSONObject(i);
                     titleArray[i] = charset.getString("title");
                 }
 
                 final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
                 dialogBuilder.setSingleChoiceItems(titleArray, selected, new AlertDialog.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         try {
                             JSONObject charset = charsets.getJSONObject(which);
                             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("CharEncoding:Set", charset.getString("code")));
                             dialog.dismiss();
                         } catch (JSONException e) {
                             Log.e(LOGTAG, "error parsing json", e);
                         }
                     }
                 });
                 dialogBuilder.setNegativeButton(R.string.button_cancel, new AlertDialog.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();
                     }
                 });
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         dialogBuilder.show();
                     }
                 });
             } else if (event.equals("CharEncoding:State")) {
                 final boolean visible = message.getString("visible").equals("true");
                 GeckoPreferences.setCharEncodingState(visible);
                 final Menu menu = mMenu;
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         if (menu != null)
                             menu.findItem(R.id.char_encoding).setVisible(visible);
                     }
                 });
             } else if (event.equals("Feedback:OpenPlayStore")) {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setData(Uri.parse("market://details?id=" + getPackageName()));
@@ -492,16 +506,17 @@ abstract public class BrowserApp extends
             } else if (event.equals("Feedback:LastUrl")) {
                 getLastUrl();
             } else if (event.equals("Gecko:Ready")) {
                 // Handle this message in GeckoApp, but also enable the Settings
                 // menuitem, which is specific to BrowserApp.
                 super.handleMessage(event, message);
                 final Menu menu = mMenu;
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         if (menu != null)
                             menu.findItem(R.id.settings).setEnabled(true);
                     }
                 });
             } else if (event.equals("Telemetry:Gather")) {
                 Telemetry.HistogramAdd("PLACES_PAGES_COUNT", BrowserDB.getCount(getContentResolver(), "history"));
                 Telemetry.HistogramAdd("PLACES_BOOKMARKS_COUNT", BrowserDB.getCount(getContentResolver(), "bookmarks"));
@@ -658,16 +673,17 @@ abstract public class BrowserApp extends
 
     /* Favicon methods */
     private void loadFavicon(final Tab tab) {
         maybeCancelFaviconLoad(tab);
 
         long id = Favicons.getInstance().loadFavicon(tab.getURL(), tab.getFaviconURL(), !tab.isPrivate(),
                         new Favicons.OnFaviconLoadedListener() {
 
+            @Override
             public void onFaviconLoaded(String pageUrl, Bitmap favicon) {
                 // Leave favicon UI untouched if we failed to load the image
                 // for some reason.
                 if (favicon == null)
                     return;
 
                 // The tab might be pointing to another URL by the time the
                 // favicon is finally loaded, in which case we simply ignore it.
@@ -730,29 +746,32 @@ abstract public class BrowserApp extends
     }
 
     private class AboutHomeRunnable implements Runnable {
         boolean mShow;
         AboutHomeRunnable(boolean show) {
             mShow = show;
         }
 
+        @Override
         public void run() {
             if (mShow) {
                 if (mAboutHomeContent == null) {
                     mAboutHomeContent = (AboutHomeContent) findViewById(R.id.abouthome_content);
                     mAboutHomeContent.init();
                     mAboutHomeContent.update(AboutHomeContent.UpdateFlags.ALL);
                     mAboutHomeContent.setUriLoadCallback(new AboutHomeContent.UriLoadCallback() {
+                        @Override
                         public void callback(String url) {
                             mBrowserToolbar.setProgressVisibility(true);
                             Tabs.getInstance().loadUrl(url);
                         }
                     });
                     mAboutHomeContent.setLoadCompleteCallback(new AboutHomeContent.VoidCallback() {
+                        @Override
                         public void callback() {
                             mAboutHomeStartupTimer.stop();
                         }
                     });
                 } else {
                     mAboutHomeContent.update(EnumSet.of(AboutHomeContent.UpdateFlags.TOP_SITES,
                                                         AboutHomeContent.UpdateFlags.REMOTE_TABS));
                 }
@@ -847,16 +866,17 @@ abstract public class BrowserApp extends
 
         if (info.icon != null) {
             if (info.icon.startsWith("data")) {
                 BitmapDrawable drawable = new BitmapDrawable(BitmapUtils.getBitmapFromDataURI(info.icon));
                 item.setIcon(drawable);
             }
             else if (info.icon.startsWith("jar:") || info.icon.startsWith("file://")) {
                 GeckoAppShell.getHandler().post(new Runnable() {
+                    @Override
                     public void run() {
                         try {
                             URL url = new URL(info.icon);
                             InputStream is = (InputStream) url.getContent();
                             try {
                                 Drawable drawable = Drawable.createFromStream(is, "src");
                                 item.setIcon(drawable);
                             } finally {
@@ -986,25 +1006,26 @@ abstract public class BrowserApp extends
     @Override
     public void closeOptionsMenu() {
         if (!mBrowserToolbar.closeOptionsMenu())
             super.closeOptionsMenu();
     }
 
     @Override
     public void setFullScreen(final boolean fullscreen) {
-      super.setFullScreen(fullscreen);
-      mMainHandler.post(new Runnable() {
-          public void run() {
-              if (fullscreen)
-                  mBrowserToolbar.hide();
-              else
-                  mBrowserToolbar.show();
-          }
-      });
+        super.setFullScreen(fullscreen);
+        mMainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (fullscreen)
+                    mBrowserToolbar.hide();
+                else
+                    mBrowserToolbar.show();
+            }
+        });
     }
 
     @Override
     public boolean onPrepareOptionsMenu(Menu aMenu) {
         if (aMenu == null)
             return false;
 
         if (!GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning))

--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -122,16 +122,17 @@ public class BrowserToolbar implements V
 
     public void from(LinearLayout layout) {
         if (mLayout != null) {
             // make sure we retain the visibility property on rotation
             layout.setVisibility(mLayout.getVisibility());
         }
         mLayout = layout;
         mLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
             }
         });
 
         mShowSiteSecurity = false;
         mShowReader = false;
 
         mAddressBarBg = (BrowserToolbarBackground) mLayout.findViewById(R.id.address_bar_bg);
@@ -148,22 +149,24 @@ public class BrowserToolbar implements V
 
         mTitle = (GeckoTextView) mLayout.findViewById(R.id.awesome_bar_title);
         mTitlePadding = mTitle.getPaddingRight();
         if (Build.VERSION.SDK_INT >= 16)
             mTitle.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 
         mAwesomeBar = mLayout.findViewById(R.id.awesome_bar);
         mAwesomeBar.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 mActivity.autoHideTabs();
                 onAwesomeBarSearch();
             }
         });
         mAwesomeBar.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
+            @Override
             public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
                 MenuInflater inflater = mActivity.getMenuInflater();
                 inflater.inflate(R.menu.titlebar_contextmenu, menu);
 
                 String clipboard = GeckoAppShell.getClipboardText();
                 if (clipboard == null || TextUtils.isEmpty(clipboard)) {
                     menu.findItem(R.id.pasteandgo).setVisible(false);
                     menu.findItem(R.id.paste).setVisible(false);
@@ -183,16 +186,17 @@ public class BrowserToolbar implements V
                     menu.findItem(R.id.share).setVisible(false);
                     menu.findItem(R.id.add_to_launcher).setVisible(false);
                 }
             }
         });
 
         mTabs = (TabsButton) mLayout.findViewById(R.id.tabs);
         mTabs.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 toggleTabs();
             }
         });
         mTabs.setImageLevel(0);
 
         mTabsCount = (GeckoTextSwitcher) mLayout.findViewById(R.id.tabs_count);
         mTabsCount.removeAllViews();
@@ -208,40 +212,45 @@ public class BrowserToolbar implements V
             mTabsCount.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
             mTabsCount.setAccessibilityDelegate(new View.AccessibilityDelegate() {
                     public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {}
                 });
         }
 
         mBack = (ImageButton) mLayout.findViewById(R.id.back);
         mBack.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View view) {
                 Tabs.getInstance().getSelectedTab().doBack();
             }
         });
         mBack.setOnLongClickListener(new Button.OnLongClickListener() {
+            @Override
             public boolean onLongClick(View view) {
                 return Tabs.getInstance().getSelectedTab().showBackHistory();
             }
         });
 
         mForward = (ImageButton) mLayout.findViewById(R.id.forward);
         mForward.setEnabled(false); // initialize the forward button to not be enabled
         mForward.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View view) {
                 Tabs.getInstance().getSelectedTab().doForward();
             }
         });
         mForward.setOnLongClickListener(new Button.OnLongClickListener() {
+            @Override
             public boolean onLongClick(View view) {
                 return Tabs.getInstance().getSelectedTab().showForwardHistory();
             }
         });
 
         Button.OnClickListener faviconListener = new Button.OnClickListener() {
+            @Override
             public void onClick(View view) {
                 if (mSiteSecurity.getVisibility() != View.VISIBLE)
                     return;
 
                 SiteIdentityPopup.getInstance().show(mSiteSecurity);
             }
         };
 
@@ -254,26 +263,28 @@ public class BrowserToolbar implements V
         mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security);
         mSiteSecurity.setOnClickListener(faviconListener);
         mSiteSecurityVisible = (mSiteSecurity.getVisibility() == View.VISIBLE);
 
         mProgressSpinner = (AnimationDrawable) mActivity.getResources().getDrawable(R.drawable.progress_spinner);
         
         mStop = (ImageButton) mLayout.findViewById(R.id.stop);
         mStop.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 Tab tab = Tabs.getInstance().getSelectedTab();
                 if (tab != null)
                     tab.doStop();
                 setProgressVisibility(false);
             }
         });
 
         mReader = (ImageButton) mLayout.findViewById(R.id.reader);
         mReader.setOnClickListener(new Button.OnClickListener() {
+            @Override
             public void onClick(View view) {
                 Tab tab = Tabs.getInstance().getSelectedTab();
                 if (tab != null)
                     tab.readerMode();
             }
         });
 
         mShadow = (ImageView) mLayout.findViewById(R.id.shadow);
@@ -312,16 +323,17 @@ public class BrowserToolbar implements V
 
         mMenu = (GeckoImageButton) mLayout.findViewById(R.id.menu);
         mActionItemBar = (LinearLayout) mLayout.findViewById(R.id.menu_items);
         mHasSoftMenuButton = !mActivity.hasPermanentMenuKey();
 
         if (mHasSoftMenuButton) {
             mMenu.setVisibility(View.VISIBLE);
             mMenu.setOnClickListener(new Button.OnClickListener() {
+                @Override
                 public void onClick(View view) {
                     mActivity.openOptionsMenu();
                 }
             });
 
             // Set a touch delegate to Tabs button, so the touch events on its tail
             // are passed to the menu button.
             mLayout.post(new Runnable() {
@@ -348,16 +360,17 @@ public class BrowserToolbar implements V
                 mActivity.onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, null);
                 panel = mActivity.getMenuPanel();
 
                 if (mHasSoftMenuButton) {
                     mMenuPopup = new MenuPopup(mActivity);
                     mMenuPopup.setPanelView(panel);
 
                     mMenuPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                        @Override
                         public void onDismiss() {
                             mActivity.onOptionsMenuClosed(null);
                         }
                     });
                 }
             }
         }
 
@@ -370,16 +383,17 @@ public class BrowserToolbar implements V
 
     public void refreshBackground() {
         mAddressBarBg.requestLayout();
 
         if (mAwesomeBarRightEdge != null)
             mAwesomeBarRightEdge.requestLayout();
     }
 
+    @Override
     public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
         switch(msg) {
             case TITLE:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     setTitle(tab.getDisplayTitle());
                 }
                 break;
             case START:
@@ -625,16 +639,17 @@ public class BrowserToolbar implements V
                                        PropertyAnimator.Property.ALPHA,
                                        1);
 
                 buttonsAnimator.start();
             }
         });
 
         mHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 contentAnimator.start();
             }
         }, 500);
     }
 
     private void onAwesomeBarSearch() {
         // This animation doesn't make much sense in a sidebar UI
@@ -743,23 +758,25 @@ public class BrowserToolbar implements V
         }
 
         mTabsCount.setText(String.valueOf(count));
         mTabs.setContentDescription((count > 1) ?
                                     mActivity.getString(R.string.num_tabs, count) :
                                     mActivity.getString(R.string.one_tab));
         mCount = count;
         mHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 GeckoTextView view = (GeckoTextView) mTabsCount.getCurrentView();
                 view.setSelected(true);
             }
         }, mDuration);
 
         mHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 GeckoTextView view = (GeckoTextView) mTabsCount.getCurrentView();
                 view.setSelected(false);
             }
         }, 2 * mDuration);
     }
 
     public void updateTabCount(int count) {

--- a/mobile/android/base/CameraImageResultHandler.java
+++ b/mobile/android/base/CameraImageResultHandler.java
@@ -19,16 +19,17 @@ class CameraImageResultHandler implement
     private static final String LOGTAG = "GeckoCameraImageResultHandler";
 
     private final SynchronousQueue<String> mFilePickerResult;
 
     CameraImageResultHandler(SynchronousQueue<String> resultQueue) {
         mFilePickerResult = resultQueue;
     }
 
+    @Override
     public void onActivityResult(int resultCode, Intent data) {
         try {
             if (resultCode != Activity.RESULT_OK) {
                 mFilePickerResult.put("");
                 return;
             }
 
             File file = new File(Environment.getExternalStorageDirectory(), sImageName);

--- a/mobile/android/base/CameraVideoResultHandler.java
+++ b/mobile/android/base/CameraVideoResultHandler.java
@@ -18,16 +18,17 @@ class CameraVideoResultHandler implement
     private static final String LOGTAG = "GeckoCameraVideoResultHandler";
 
     private final SynchronousQueue<String> mFilePickerResult;
 
     CameraVideoResultHandler(SynchronousQueue<String> resultQueue) {
         mFilePickerResult = resultQueue;
     }
 
+    @Override
     public void onActivityResult(int resultCode, Intent data) {
         try {
             if (data == null || resultCode != Activity.RESULT_OK) {
                 mFilePickerResult.put("");
                 return;
             }
 
             Cursor cursor = GeckoApp.mAppContext.managedQuery(data.getData(),

--- a/mobile/android/base/CheckableLinearLayout.java
+++ b/mobile/android/base/CheckableLinearLayout.java
@@ -10,25 +10,28 @@ import android.widget.LinearLayout;
 public class CheckableLinearLayout extends LinearLayout implements Checkable {
 
     private CheckBox mCheckBox;
 
     public CheckableLinearLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
+    @Override
     public boolean isChecked() {
         return mCheckBox != null ? mCheckBox.isChecked() : false;
     }
 
+    @Override
     public void setChecked(boolean isChecked) {
         if (mCheckBox != null)
             mCheckBox.setChecked(isChecked);
     }
 
+    @Override
     public void toggle() {
         if (mCheckBox != null)
             mCheckBox.toggle();
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();

--- a/mobile/android/base/CrashReporter.java.in
+++ b/mobile/android/base/CrashReporter.java.in
@@ -79,16 +79,17 @@ public class CrashReporter extends Activ
             return false;
         }
         return true;
     }
 
     private void doFinish() {
         if (mHandler != null) {
             mHandler.post(new Runnable() {
+                @Override
                 public void run() {
                     finish();
                 }
             });
         }
     }
 
     @Override
@@ -142,16 +143,17 @@ public class CrashReporter extends Activ
         final CheckBox sendReportCheckbox = (CheckBox) findViewById(R.id.send_report);
         if (!sendReportCheckbox.isChecked()) {
             doFinish();
             return;
         }
 
         mProgressDialog.show();
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 sendReport(mPendingMinidumpFile, mExtrasStringMap, mPendingExtrasFile);
             }
         }, "CrashReporter Thread").start();
     }
 
     public void onCloseClick(View v) {  // bound via crash_reporter.xml
         backgroundSendReport();

--- a/mobile/android/base/Distribution.java
+++ b/mobile/android/base/Distribution.java
@@ -42,16 +42,17 @@ public final class Distribution {
     /**
      * Initializes distribution if it hasn't already been initalized.
      *
      * @param packagePath specifies where to look for the distribution directory.
      */
     public static void init(final Context context, final String packagePath) {
         // Read/write preferences and files on the background thread.
         GeckoBackgroundThread.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 // Bail if we've already initialized the distribution.
                 SharedPreferences settings = context.getSharedPreferences(GeckoApp.PREFS_NAME, Activity.MODE_PRIVATE);
                 String keyName = context.getPackageName() + ".distribution_state";
                 int state = settings.getInt(keyName, STATE_UNKNOWN);
                 if (state == STATE_NONE) {
                     return;
                 }

--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -101,16 +101,17 @@ public class DoorHanger extends LinearLa
 
         Button mButton = new Button(mActivity);
         mButton.setText(aText);
         mButton.setTag(Integer.toString(aCallback));
         mButton.setOnClickListener(this);
         mChoicesLayout.addView(mButton, mLayoutParams);
     }
 
+    @Override
     public void onClick(View v) {
         JSONObject response = new JSONObject();
         try {
             response.put("callback", v.getTag().toString());
 
             // If the checkbox is being used, pass its value
             if (mCheckBox != null)
                 response.put("checked", mCheckBox.isChecked());

--- a/mobile/android/base/DoorHangerPopup.java
+++ b/mobile/android/base/DoorHangerPopup.java
@@ -58,51 +58,55 @@ public class DoorHangerPopup extends Pop
         unregisterEventListener("Doorhanger:Remove");
         Tabs.unregisterOnTabsChangedListener(this);
     }
 
     void setAnchor(View aAnchor) {
         mAnchor = aAnchor;
     }
 
+    @Override
     public void handleMessage(String event, JSONObject geckoObject) {
         try {
             if (event.equals("Doorhanger:Add")) {
                 final int tabId = geckoObject.getInt("tabID");
                 final String value = geckoObject.getString("value");
                 final String message = geckoObject.getString("message");
                 final JSONArray buttons = geckoObject.getJSONArray("buttons");
                 final JSONObject options = geckoObject.getJSONObject("options");
 
                 mActivity.runOnUiThread(new Runnable() {
+                    @Override
                     public void run() {
                         addDoorHanger(tabId, value, message, buttons, options);
                     }
                 });
             } else if (event.equals("Doorhanger:Remove")) {
                 final int tabId = geckoObject.getInt("tabID");
                 final String value = geckoObject.getString("value");
 
                 mActivity.runOnUiThread(new Runnable() {
+                    @Override
                     public void run() {
                         DoorHanger doorHanger = getDoorHanger(tabId, value);
                         if (doorHanger == null)
                             return;
 
                         removeDoorHanger(doorHanger);
                         updatePopup();
                     }
                 });
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
     }
 
     // This callback is automatically executed on the UI thread.
+    @Override
     public void onTabChanged(final Tab tab, final Tabs.TabEvents msg, final Object data) {
         switch(msg) {
             case CLOSED:
                 // Remove any doorhangers for a tab when it's closed (make
                 // a temporary set to avoid a ConcurrentModificationException)
                 HashSet<DoorHanger> doorHangersToRemove = new HashSet<DoorHanger>();
                 for (DoorHanger dh : mDoorHangers) {
                     if (dh.getTabId() == tab.getId())

--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -80,16 +80,17 @@ public class Favicons {
 
     private void dispatchResult(final String pageUrl, final Bitmap image,
             final OnFaviconLoadedListener listener) {
         if (pageUrl != null && image != null)
             putFaviconInMemCache(pageUrl, image);
 
         // We want to always run the listener on UI thread
         GeckoAppShell.getMainHandler().post(new Runnable() {
+            @Override
             public void run() {
                 if (listener != null)
                     listener.onFaviconLoaded(pageUrl, image);
             }
         });
     }
 
     public String getFaviconUrlForPageUrl(String pageUrl) {

--- a/mobile/android/base/FilePickerResultHandlerSync.java
+++ b/mobile/android/base/FilePickerResultHandlerSync.java
@@ -11,16 +11,17 @@ import java.util.concurrent.SynchronousQ
 
 class FilePickerResultHandlerSync extends FilePickerResultHandler {
     private static final String LOGTAG = "GeckoFilePickerResultHandlerSync";
 
     FilePickerResultHandlerSync(SynchronousQueue<String> resultQueue) {
         super(resultQueue);
     }
 
+    @Override
     public void onActivityResult(int resultCode, Intent data) {
         try {
             mFilePickerResult.put(handleActivityResult(resultCode, data));
         } catch (InterruptedException e) {
             Log.i(LOGTAG, "error returning file picker result", e);
         }
     }
 }

--- a/mobile/android/base/FindInPageBar.java
+++ b/mobile/android/base/FindInPageBar.java
@@ -37,16 +37,17 @@ public class FindInPageBar extends Relat
 
         // Capture clicks on the rest of the view to prevent them from
         // leaking into other views positioned below.
         content.setOnClickListener(this);
 
         mFindText = (CustomEditText) content.findViewById(R.id.find_text);
         mFindText.addTextChangedListener(this);
         mFindText.setOnKeyPreImeListener(new CustomEditText.OnKeyPreImeListener() {
+            @Override
             public boolean onKeyPreIme(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
                     hide();
                     return true;
                 }
                 return false;
             }
         });
@@ -62,17 +63,18 @@ public class FindInPageBar extends Relat
         mFindText.requestFocus();
 
         // Show the virtual keyboard.
         if (mFindText.hasWindowFocus()) {
             getInputMethodManager(mFindText).showSoftInput(mFindText, 0);
         } else {
             // showSoftInput won't work until after the window is focused.
             mFindText.setOnWindowFocusChangeListener(new CustomEditText.OnWindowFocusChangeListener() {
-               public void onWindowFocusChanged(boolean hasFocus) {
+                @Override
+                public void onWindowFocusChanged(boolean hasFocus) {
                    if (!hasFocus)
                        return;
                    mFindText.setOnWindowFocusChangeListener(null);
                    getInputMethodManager(mFindText).showSoftInput(mFindText, 0);
                }
             });
         }
     }
@@ -85,30 +87,34 @@ public class FindInPageBar extends Relat
 
     private InputMethodManager getInputMethodManager(View view) {
         Context context = view.getContext();
         return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
      }
 
     // TextWatcher implementation
 
+    @Override
     public void afterTextChanged(Editable s) {
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Find", s.toString()));
     }
 
+    @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         // ignore
     }
 
+    @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
         // ignore
     }
 
     // View.OnClickListener implementation
 
+    @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.find_prev:
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Prev", mFindText.getText().toString()));
                 getInputMethodManager(mFindText).hideSoftInputFromWindow(mFindText.getWindowToken(), 0);
                 break;
             case R.id.find_next:
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Next", mFindText.getText().toString()));

--- a/mobile/android/base/FontSizePreference.java
+++ b/mobile/android/base/FontSizePreference.java
@@ -75,27 +75,29 @@ class FontSizePreference extends DialogP
         // Background cannot be set in XML (see bug 783597 - TODO: Change this to XML when bug is fixed).
         mScrollingContainer.setBackgroundColor(Color.WHITE);
         mPreviewFontView = (TextView) dialogView.findViewById(R.id.preview);
 
         mDecreaseFontButton = (Button) dialogView.findViewById(R.id.decrease_preview_font_button);
         mIncreaseFontButton = (Button) dialogView.findViewById(R.id.increase_preview_font_button);
         setButtonState(mPreviewFontIndex);
         mDecreaseFontButton.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 mPreviewFontIndex = Math.max(mPreviewFontIndex - 1, 0);
                 updatePreviewFontSize(mFontTwipValues[mPreviewFontIndex]);
                 mIncreaseFontButton.setEnabled(true);
                 // If we reached the minimum index, disable the button.
                 if (mPreviewFontIndex == 0) {
                     mDecreaseFontButton.setEnabled(false);
                 }
             }
         });
         mIncreaseFontButton.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 mPreviewFontIndex = Math.min(mPreviewFontIndex + 1, mFontTwipValues.length - 1);
                 updatePreviewFontSize(mFontTwipValues[mPreviewFontIndex]);
 
                 mDecreaseFontButton.setEnabled(true);
                 // If we reached the maximum index, disable the button.
                 if (mPreviewFontIndex == mFontTwipValues.length - 1) {
                     mIncreaseFontButton.setEnabled(false);

--- a/mobile/android/base/FormAssistPopup.java
+++ b/mobile/android/base/FormAssistPopup.java
@@ -77,16 +77,17 @@ public class FormAssistPopup extends Rel
     }
 
     void destroy() {
         unregisterEventListener("FormAssist:AutoComplete");
         unregisterEventListener("FormAssist:ValidationMessage");
         unregisterEventListener("FormAssist:Hide");
     }
 
+    @Override
     public void handleMessage(String event, JSONObject message) {
         try {
             if (event.equals("FormAssist:AutoComplete")) {
                 handleAutoCompleteMessage(message);
             } else if (event.equals("FormAssist:ValidationMessage")) {
                 handleValidationMessage(message);
             } else if (event.equals("FormAssist:Hide")) {
                 handleHideMessage(message);
@@ -96,47 +97,51 @@ public class FormAssistPopup extends Rel
         }
     }
 
     private void handleAutoCompleteMessage(JSONObject message) throws JSONException  {
         final JSONArray suggestions = message.getJSONArray("suggestions");
         final JSONArray rect = message.getJSONArray("rect");
         final double zoom = message.getDouble("zoom");
         GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 showAutoCompleteSuggestions(suggestions, rect, zoom);
             }
         });
     }
 
     private void handleValidationMessage(JSONObject message) throws JSONException {
         final String validationMessage = message.getString("validationMessage");
         final JSONArray rect = message.getJSONArray("rect");
         final double zoom = message.getDouble("zoom");
         GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 showValidationMessage(validationMessage, rect, zoom);
             }
         });
     }
     
     private void handleHideMessage(JSONObject message) {
         GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 hide();
             }
         });
     }
 
     private void showAutoCompleteSuggestions(JSONArray suggestions, JSONArray rect, double zoom) {
         if (mAutoCompleteList == null) {
             LayoutInflater inflater = LayoutInflater.from(mContext);
             mAutoCompleteList = (ListView) inflater.inflate(R.layout.autocomplete_list, null);
 
             mAutoCompleteList.setOnItemClickListener(new OnItemClickListener() {
+                @Override
                 public void onItemClick(AdapterView<?> parentView, View view, int position, long id) {
                     // Use the value stored with the autocomplete view, not the label text,
                     // since they can be different.
                     TextView textView = (TextView) view;
                     String value = (String) textView.getTag();
                     broadcastGeckoEvent("FormAssist:AutoComplete", value);
                     hide();
                 }

--- a/mobile/android/base/GeckoAccessibility.java
+++ b/mobile/android/base/GeckoAccessibility.java
@@ -38,16 +38,17 @@ public class GeckoAccessibility {
                     "com.google.android.marvin.talkback.TalkBackService", // Google Talkback screen reader
                     "com.mot.readout.ScreenReader", // Motorola screen reader
                     "info.spielproject.spiel.SpielService", // Spiel screen reader
                     "es.codefactory.android.app.ma.MAAccessibilityService" // Codefactory Mobile Accessibility screen reader
                 }));
 
     public static void updateAccessibilitySettings () {
         GeckoAppShell.getHandler().post(new Runnable() {
+                @Override
                 public void run() {
                     JSONObject ret = new JSONObject();
                     sEnabled = false;
                     AccessibilityManager accessibilityManager =
                         (AccessibilityManager) GeckoApp.mAppContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
                     if (accessibilityManager.isEnabled()) {
                         ActivityManager activityManager =
                             (ActivityManager) GeckoApp.mAppContext.getSystemService(Context.ACTIVITY_SERVICE);
@@ -124,16 +125,17 @@ public class GeckoAccessibility {
             Log.e(LOGTAG, "No accessibility event type provided");
             return;
         }
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
             // Before Jelly Bean we send events directly from here while spoofing the source by setting
             // the package and class name manually.
             GeckoAppShell.getHandler().post(new Runnable() {
+                    @Override
                     public void run() {
                         sendDirectAccessibilityEvent(eventType, message);
                 }
             });
         } else {
             // In Jelly Bean we populate an AccessibilityNodeInfo with the minimal amount of data to have
             // it work with TalkBack.
             final LayerView view = GeckoApp.mAppContext.getLayerView();
@@ -155,16 +157,17 @@ public class GeckoAccessibility {
                 Rect screenBounds = new Rect(relativeBounds);
                 screenBounds.offset(locationOnScreen[0], locationOnScreen[1]);
                 sVirtualCursorNode.setBoundsInScreen(screenBounds);
             }
 
             // Store the JSON message and use it to populate the event later in the code path.
             sEventMessage = message;
             GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         // If this is an accessibility focus, a lot of internal voodoo happens so we perform an
                         // accessibility focus action on the view, and it in turn sends the right events.
                         switch (eventType) {
                         case AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED:
                             view.performAccessibilityAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
                             break;
                         case AccessibilityEvent.TYPE_ANNOUNCEMENT:

--- a/mobile/android/base/GeckoActivity.java.in
+++ b/mobile/android/base/GeckoActivity.java.in
@@ -73,16 +73,17 @@ public class GeckoActivity extends Activ
         mGeckoActivityOpened = false;
         if (component != null &&
             component.getPackageName() != null &&
             component.getPackageName().equals("@ANDROID_PACKAGE_NAME@")) {
             mGeckoActivityOpened = true;
         }
     }
 
+    @Override
     public boolean isGeckoActivityOpened() {
         return mGeckoActivityOpened;
     }
 
     public boolean isApplicationInBackground() {
         return ((GeckoApplication) getApplication()).isApplicationInBackground();
     }
 

--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -192,16 +192,17 @@ abstract public class GeckoApp
     abstract public int getLayout();
     abstract public boolean hasTabsSideBar();
     abstract protected String getDefaultProfileName();
 
     void toggleChrome(final boolean aShow) { }
 
     void focusChrome() { }
 
+    @Override
     public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
         // When a tab is closed, it is always unselected first.
         // When a tab is unselected, another tab is always selected first.
         switch(msg) {
             case UNSELECTED:
                 hidePlugins(tab);
                 break;
 
@@ -733,16 +734,17 @@ abstract public class GeckoApp
             hasMenu = false;
 
         if (Build.VERSION.SDK_INT >= 14)
             hasMenu = ViewConfiguration.get(GeckoApp.mAppContext).hasPermanentMenuKey();
 
         return hasMenu;
     }
 
+    @Override
     public void handleMessage(String event, JSONObject message) {
         try {
             if (event.equals("Toast:Show")) {
                 final String msg = message.getString("message");
                 final String duration = message.getString("duration");
                 handleShowToast(msg, duration);
             } else if (event.equals("log")) {
                 // generic log listener
@@ -790,19 +792,21 @@ abstract public class GeckoApp
                     layerView.setZoomConstraints(tab.getZoomConstraints());
                 }
             } else if (event.equals("Session:StatePurged")) {
                 onStatePurged();
             } else if (event.equals("Bookmark:Insert")) {
                 final String url = message.getString("url");
                 final String title = message.getString("title");
                 mMainHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         Toast.makeText(GeckoApp.mAppContext, R.string.bookmark_added, Toast.LENGTH_SHORT).show();
                         GeckoAppShell.getHandler().post(new Runnable() {
+                            @Override
                             public void run() {
                                 BrowserDB.addBookmark(GeckoApp.mAppContext.getContentResolver(), title, url);
                             }
                         });
                     }
                 });
             } else if (event.equals("Accessibility:Event")) {
                 GeckoAccessibility.sendAccessibilityEvent(message);
@@ -854,16 +858,17 @@ abstract public class GeckoApp
                     mPrivateBrowsingSession = message.getString("session");
                 }
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
     }
 
+    @Override
     public String getResponse() {
         String res = mCurrentResponse;
         mCurrentResponse = "";
         return res;
     }
 
     void onStatePurged() { }
 
@@ -903,20 +908,22 @@ abstract public class GeckoApp
             // setSingleChoiceItems and changing the choiceMode below when we create the dialog
             builder.setSingleChoiceItems(new SimpleAdapter(
                 GeckoApp.this,
                 itemList,
                 R.layout.site_setting_item,
                 new String[] { "setting", "value" },
                 new int[] { R.id.setting, R.id.value }
                 ), -1, new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int id) { }
                 });
 
             builder.setPositiveButton(R.string.site_settings_clear, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int id) {
                     ListView listView = ((AlertDialog) dialog).getListView();
                     SparseBooleanArray checkedItemPositions = listView.getCheckedItemPositions();
 
                     // An array of the indices of the permissions we want to clear
                     JSONArray permissionsToClear = new JSONArray();
                     for (int i = 0; i < checkedItemPositions.size(); i++)
                         if (checkedItemPositions.get(i))
@@ -924,22 +931,24 @@ abstract public class GeckoApp
 
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent(
                         "Permissions:Clear", permissionsToClear.toString()));
                 }
             });
         }
 
         builder.setNegativeButton(R.string.site_settings_cancel, new DialogInterface.OnClickListener(){
+            @Override
             public void onClick(DialogInterface dialog, int id) {
                 dialog.cancel();
             }
         });
 
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 Dialog dialog = builder.create();
                 dialog.show();
 
                 ListView listView = ((AlertDialog) dialog).getListView();
                 if (listView != null) {
                     listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
                     int listSize = listView.getAdapter().getCount();
@@ -947,24 +956,26 @@ abstract public class GeckoApp
                         listView.setItemChecked(i, true);
                 }
             }
         });
     }
 
     public void showToast(final int resId, final int duration) {
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 Toast.makeText(mAppContext, resId, duration).show();
             }
         });
     }
 
     void handleShowToast(final String message, final String duration) {
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 Toast toast;
                 if (duration.equals("long"))
                     toast = Toast.makeText(mAppContext, message, Toast.LENGTH_LONG);
                 else
                     toast = Toast.makeText(mAppContext, message, Toast.LENGTH_SHORT);
                 toast.show();
             }
@@ -996,16 +1007,17 @@ abstract public class GeckoApp
         FrameLayout decor = (FrameLayout)getWindow().getDecorView();
         decor.addView(mFullScreenPluginContainer, layoutParams);
 
         mFullScreenPluginView = view;
     }
 
     void addPluginView(final View view, final Rect rect, final boolean isFullScreen) {
         mMainHandler.post(new Runnable() { 
+            @Override
             public void run() {
                 Tabs tabs = Tabs.getInstance();
                 Tab tab = tabs.getSelectedTab();
 
                 if (isFullScreen) {
                     addFullScreenPluginView(view);
                     return;
                 }
@@ -1035,32 +1047,34 @@ abstract public class GeckoApp
             return;
         }
 
         mFullScreenPluginContainer.removeView(mFullScreenPluginView);
 
         // We need do do this on the next iteration in order to avoid
         // a deadlock, see comment below in FullScreenHolder
         mMainHandler.post(new Runnable() {
+            @Override
             public void run() {
                 mLayerView.show();
             }
         });
 
         FrameLayout decor = (FrameLayout)getWindow().getDecorView();
         decor.removeView(mFullScreenPluginContainer);
 
         mFullScreenPluginView = null;
 
         GeckoScreenOrientationListener.getInstance().unlockScreenOrientation();
         setFullScreen(false);
     }
 
     void removePluginView(final View view, final boolean isFullScreen) {
         mMainHandler.post(new Runnable() { 
+            @Override
             public void run() {
                 Tabs tabs = Tabs.getInstance();
                 Tab tab = tabs.getSelectedTab();
 
                 if (isFullScreen) {
                     removeFullScreenPluginView(view);
                     return;
                 }
@@ -1274,16 +1288,17 @@ abstract public class GeckoApp
             }
         }
 
         requestRender();
     }
 
     public void setFullScreen(final boolean fullscreen) {
         mMainHandler.post(new Runnable() { 
+            @Override
             public void run() {
                 // Hide/show the system notification bar
                 Window window = getWindow();
                 window.setFlags(fullscreen ?
                                 WindowManager.LayoutParams.FLAG_FULLSCREEN : 0,
                                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
                 if (Build.VERSION.SDK_INT >= 11)
@@ -1399,16 +1414,17 @@ abstract public class GeckoApp
             if (!wasInBackground && !mIsRestoringActivity) {
                 Telemetry.HistogramAdd("FENNEC_WAS_KILLED", 1);
             }
 
             mPrivateBrowsingSession = savedInstanceState.getString(SAVED_STATE_PRIVATE_SESSION);
         }
 
         GeckoBackgroundThread.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 SharedPreferences prefs =
                     GeckoApp.mAppContext.getSharedPreferences(PREFS_NAME, 0);
 
                 boolean wasOOM = prefs.getBoolean(PREFS_OOM_EXCEPTION, false);
                 boolean wasStopped = prefs.getBoolean(PREFS_WAS_STOPPED, true);
                 if (wasOOM || !wasStopped) {
                     Telemetry.HistogramAdd("FENNEC_WAS_KILLED", 1);
@@ -1596,16 +1612,17 @@ abstract public class GeckoApp
             sGeckoThread = new GeckoThread(intent, passedUri);
         }
         if (!ACTION_DEBUG.equals(action) &&
             GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) {
             sGeckoThread.start();
         } else if (ACTION_DEBUG.equals(action) &&
             GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.WaitForDebugger)) {
             mMainHandler.postDelayed(new Runnable() {
+                @Override
                 public void run() {
                     GeckoThread.setLaunchState(GeckoThread.LaunchState.Launching);
                     sGeckoThread.start();
                 }
             }, 1000 * 5 /* 5 seconds */);
         }
 
         //register for events
@@ -1662,16 +1679,17 @@ abstract public class GeckoApp
         });
 
         final GeckoApp self = this;
 
         // End of the startup of our Java App
         mJavaUiStartupTimer.stop();
 
         GeckoAppShell.getHandler().postDelayed(new Runnable() {
+            @Override
             public void run() {
                 // Sync settings need Gecko to be loaded, so
                 // no hurry in starting this.
                 checkMigrateSync();
 
                 // Record our launch time for the announcements service
                 // to use in assessing inactivity.
                 final Context context = GeckoApp.mAppContext;
@@ -1905,16 +1923,17 @@ abstract public class GeckoApp
         }
 
         GeckoScreenOrientationListener.getInstance().start();
 
         // User may have enabled/disabled accessibility.
         GeckoAccessibility.updateAccessibilitySettings();
 
         GeckoBackgroundThread.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 SharedPreferences prefs =
                     GeckoApp.mAppContext.getSharedPreferences(GeckoApp.PREFS_NAME, 0);
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean(GeckoApp.PREFS_WAS_STOPPED, false);
                 editor.commit();
             }
          });
@@ -1950,16 +1969,17 @@ abstract public class GeckoApp
 
     @Override
     public void onPause()
     {
         // In some way it's sad that Android will trigger StrictMode warnings
         // here as the whole point is to save to disk while the activity is not
         // interacting with the user.
         GeckoBackgroundThread.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 SharedPreferences prefs =
                     GeckoApp.mAppContext.getSharedPreferences(GeckoApp.PREFS_NAME, 0);
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean(GeckoApp.PREFS_WAS_STOPPED, true);
                 editor.commit();
 
                 BrowserDB.expireHistory(getContentResolver(),
@@ -1971,16 +1991,17 @@ abstract public class GeckoApp
 
         super.onPause();
     }
 
     @Override
     public void onRestart()
     {
         GeckoBackgroundThread.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 SharedPreferences prefs =
                     GeckoApp.mAppContext.getSharedPreferences(GeckoApp.PREFS_NAME, 0);
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean(GeckoApp.PREFS_WAS_STOPPED, false);
                 editor.commit();
             }
         });
@@ -2164,16 +2185,17 @@ abstract public class GeckoApp
 
     private void checkMigrateProfile() {
         final File profileDir = getProfile().getDir();
 
         if (profileDir != null) {
             final GeckoApp app = GeckoApp.mAppContext;
 
             GeckoAppShell.getHandler().post(new Runnable() {
+                @Override
                 public void run() {
                     ProfileMigrator profileMigrator = new ProfileMigrator(app);
 
                     // Do a migration run on the first start after an upgrade.
                     if (!GeckoApp.sIsUsingCustomProfile &&
                         !profileMigrator.hasMigrationRun()) {
                         // Show the "Setting up Fennec" screen if this takes
                         // a while.
@@ -2181,29 +2203,33 @@ abstract public class GeckoApp
                         // Create a "final" holder for the setup screen so that we can
                         // create it in startCallback and still find a reference to it
                         // in stopCallback. (We must create it on the UI thread to fix
                         // bug 788216). Note that synchronization is not a problem here
                         // since it is only ever touched on the UI thread.
                         final SetupScreen[] setupScreenHolder = new SetupScreen[1];
 
                         final Runnable startCallback = new Runnable() {
+                            @Override
                             public void run() {
                                 GeckoApp.mAppContext.runOnUiThread(new Runnable() {
+                                    @Override
                                     public void run() {
                                         setupScreenHolder[0] = new SetupScreen(app);
                                         setupScreenHolder[0].show();
                                     }
                                 });
                             }
                         };
 
                         final Runnable stopCallback = new Runnable() {
+                            @Override
                             public void run() {
                                 GeckoApp.mAppContext.runOnUiThread(new Runnable() {
+                                    @Override
                                     public void run() {
                                         SetupScreen screen = setupScreenHolder[0];
                                         // screen will never be null if this code runs, but
                                         // stranger things have happened...
                                         if (screen != null) {
                                             screen.dismiss();
                                         }
                                     }
@@ -2349,37 +2375,43 @@ abstract public class GeckoApp
 
     public LayerView getLayerView() {
         return mLayerView;
     }
 
     public AbsoluteLayout getPluginContainer() { return mPluginContainer; }
 
     // Accelerometer.
+    @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
     }
 
+    @Override
     public void onSensorChanged(SensorEvent event) {
         GeckoAppShell.sendEventToGecko(GeckoEvent.createSensorEvent(event));
     }
 
     // Geolocation.
+    @Override
     public void onLocationChanged(Location location) {
         // No logging here: user-identifying information.
         GeckoAppShell.sendEventToGecko(GeckoEvent.createLocationEvent(location));
     }
 
+    @Override
     public void onProviderDisabled(String provider)
     {
     }
 
+    @Override
     public void onProviderEnabled(String provider)
     {
     }
 
+    @Override
     public void onStatusChanged(String provider, int status, Bundle extras)
     {
     }
 
     // Called when a Gecko Hal WakeLock is changed
     public void notifyWakeLockChanged(String topic, String state) {
         PowerManager.WakeLock wl = mWakeLocks.get(topic);
         if (state.equals("locked-foreground") && wl == null) {
@@ -2485,16 +2517,17 @@ abstract public class GeckoApp
              * its surface to be destroyed, which causes a pause composition
              * event to be sent to Gecko. We synchronously wait for that to be
              * processed. Simultaneously, however, Flash is waiting on a mutex so
              * the post() below is an attempt to avoid a deadlock.
              */
             super.addView(view, index);
 
             mMainHandler.post(new Runnable() { 
+                @Override
                 public void run() {
                     mLayerView.hide();
                 }
             });
         }
 
         /**
          * The methods below are simply copied from what Android WebKit does.

--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -173,16 +173,17 @@ public class GeckoAppShell
     public static native void callObserver(String observerKey, String topic, String data);
     public static native void removeObserver(String observerKey);
     public static native void onChangeNetworkLinkStatus(String status);
     public static native Message getNextMessageFromQueue(MessageQueue queue);
     public static native void onSurfaceTextureFrameAvailable(Object surfaceTexture, int id);
 
     public static void registerGlobalExceptionHandler() {
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
             public void uncaughtException(Thread thread, Throwable e) {
                 Log.e(LOGTAG, ">>> REPORTING UNCAUGHT EXCEPTION FROM THREAD "
                               + thread.getId() + " (\"" + thread.getName() + "\")", e);
 
                 // If the uncaught exception was rethrown, walk the exception `cause` chain to find
                 // the original exception so Socorro can correctly collate related crash reports.
                 Throwable cause;
                 while ((cause = e.getCause()) != null) {
@@ -245,20 +246,22 @@ public class GeckoAppShell
 
         private GeckoMediaScannerClient(Context context, String file, String mimeType) {
             mFile = file;
             mMimeType = mimeType;
             mScanner = new MediaScannerConnection(context, this);
             mScanner.connect();
         }
 
+        @Override
         public void onMediaScannerConnected() {
             mScanner.scanFile(mFile, mMimeType);
         }
 
+        @Override
         public void onScanCompleted(String path, Uri uri) {
             if(path.equals(mFile)) {
                 mScanner.disconnect();
                 mScanner = null;
             }
         }
     }
 
@@ -293,16 +296,17 @@ public class GeckoAppShell
             combinedArgs += " -url " + url;
         if (type != null)
             combinedArgs += " " + type;
 
         DisplayMetrics metrics = GeckoApp.mAppContext.getResources().getDisplayMetrics();
         combinedArgs += " -width " + metrics.widthPixels + " -height " + metrics.heightPixels;
 
         GeckoApp.mAppContext.runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     geckoLoaded();
                 }
             });
 
         // and go
         GeckoLoader.nativeRun(combinedArgs);
     }
@@ -412,16 +416,17 @@ public class GeckoAppShell
         synchronized (sSyncEvent) {
             sWaitingForSyncAck = false;
             sSyncEvent.notifyAll();
         }
     }
 
     public static void enableLocation(final boolean enable) {
         getMainHandler().post(new Runnable() { 
+                @Override
                 public void run() {
                     LocationManager lm = (LocationManager)
                         GeckoApp.mAppContext.getSystemService(Context.LOCATION_SERVICE);
 
                     if (enable) {
                         Criteria criteria = new Criteria();
                         criteria.setSpeedRequired(false);
                         criteria.setBearingRequired(false);
@@ -621,16 +626,17 @@ public class GeckoAppShell
     static void createShortcut(String aTitle, String aURI, String aUniqueURI, String aIconData, String aType) {
         createShortcut(aTitle, aURI, aUniqueURI, BitmapUtils.getBitmapFromDataURI(aIconData), aType);
     }
 
     public static void createShortcut(final String aTitle, final String aURI, final String aUniqueURI,
                                       final Bitmap aIcon, final String aType)
     {
         getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 // the intent to be launched by the shortcut
                 Intent shortcutIntent;
                 if (aType.equalsIgnoreCase(SHORTCUT_TYPE_WEBAPP)) {
                     shortcutIntent = getWebAppIntent(aURI, aUniqueURI, aTitle, aIcon);
                 } else {
                     shortcutIntent = new Intent();
                     shortcutIntent.setAction(GeckoApp.ACTION_BOOKMARK);
@@ -657,16 +663,17 @@ public class GeckoAppShell
     }
 
     public static void removeShortcut(final String aTitle, final String aURI, final String aType) {
         removeShortcut(aTitle, aURI, null, aType);
     }
 
     public static void removeShortcut(final String aTitle, final String aURI, final String aUniqueURI, final String aType) {
         getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 // the intent to be launched by the shortcut
                 Intent shortcutIntent;
                 if (aType.equalsIgnoreCase(SHORTCUT_TYPE_WEBAPP)) {
                     int index = WebAppAllocator.getInstance(GeckoApp.mAppContext).getIndexForApp(aUniqueURI);
                     shortcutIntent = getWebAppIntent(aURI, aUniqueURI, "", null);
                     if (shortcutIntent == null)
                         return;
@@ -691,16 +698,17 @@ public class GeckoAppShell
         });
     }
 
     public static void uninstallWebApp(final String uniqueURI) {
         // On uninstall, we need to do a couple of things:
         //   1. nuke the running app process.
         //   2. nuke the profile that was assigned to that webapp
         getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 int index = WebAppAllocator.getInstance(GeckoApp.mAppContext).releaseIndexForApp(uniqueURI);
 
                 // if -1, nothing to do; we didn't think it was installed anyway
                 if (index == -1)
                     return;
 
                 // kill the app if it's running
@@ -1127,16 +1135,17 @@ public class GeckoAppShell
     private static 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() { 
+            @Override
             @SuppressWarnings("deprecation")
             public void run() {
                 Context context = GeckoApp.mAppContext;
                 String text = null;
                 if (android.os.Build.VERSION.SDK_INT >= 11) {
                     android.content.ClipboardManager cm = (android.content.ClipboardManager)
                         context.getSystemService(Context.CLIPBOARD_SERVICE);
                     if (cm.hasPrimaryClip()) {
@@ -1160,16 +1169,17 @@ public class GeckoAppShell
             String ret = sClipboardQueue.take();
             return (EMPTY_STRING.equals(ret) ? null : ret);
         } catch (InterruptedException ie) {}
         return null;
     }
 
     static void setClipboardText(final String text) {
         getHandler().post(new Runnable() { 
+            @Override
             @SuppressWarnings("deprecation")
             public void run() {
                 Context context = GeckoApp.mAppContext;
                 if (android.os.Build.VERSION.SDK_INT >= 11) {
                     android.content.ClipboardManager cm = (android.content.ClipboardManager)
                         context.getSystemService(Context.CLIPBOARD_SERVICE);
                     cm.setPrimaryClip(ClipData.newPlainText("Text", text));
                 } else {
@@ -1362,24 +1372,26 @@ public class GeckoAppShell
     public static void showInputMethodPicker() {
         InputMethodManager imm = (InputMethodManager)
             GeckoApp.mAppContext.getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.showInputMethodPicker();
     }
 
     public static void setKeepScreenOn(final boolean on) {
         GeckoApp.mAppContext.runOnUiThread(new Runnable() {
+            @Override
             public void run() {
                 // TODO
             }
         });
     }
 
     public static void notifyDefaultPrevented(final boolean defaultPrevented) {
         getMainHandler().post(new Runnable() {
+            @Override
             public void run() {
                 LayerView view = GeckoApp.mAppContext.getLayerView();
                 PanZoomController controller = (view == null ? null : view.getPanZoomController());
                 if (controller != null) {
                     controller.notifyDefaultActionPrevented(defaultPrevented);
                 }
             }
         });
@@ -1466,30 +1478,32 @@ public class GeckoAppShell
             appearance.recycle();
         }
 
         return result;
     }
 
     public static void killAnyZombies() {
         GeckoProcessesVisitor visitor = new GeckoProcessesVisitor() {
+            @Override
             public boolean callback(int pid) {
                 if (pid != android.os.Process.myPid())
                     android.os.Process.killProcess(pid);
                 return true;
             }
         };
             
         EnumerateGeckoProcesses(visitor);
     }
 
     public static boolean checkForGeckoProcs() {
 
         class GeckoPidCallback implements GeckoProcessesVisitor {
             public boolean otherPidExist = false;
+            @Override
             public boolean callback(int pid) {
                 if (pid != android.os.Process.myPid()) {
                     otherPidExist = true;
                     return false;
                 }
                 return true;
             }            
         }
@@ -1792,16 +1806,17 @@ public class GeckoAppShell
             } catch(RuntimeException e) {
                 Log.w(LOGTAG, "Error setPreviewDisplay:", e);
             }
 
             sCamera.setParameters(params);
             sCameraBuffer = new byte[(bufferSize * 12) / 8];
             sCamera.addCallbackBuffer(sCameraBuffer);
             sCamera.setPreviewCallbackWithBuffer(new android.hardware.Camera.PreviewCallback() {
+                @Override
                 public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
                     cameraCallbackBridge(data);
                     if (sCamera != null)
                         sCamera.addCallbackBuffer(sCameraBuffer);
                 }
             });
             sCamera.startPreview();
             params = sCamera.getParameters();
@@ -1883,24 +1898,26 @@ public class GeckoAppShell
     }
 
     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
         getHandler().post(new Runnable() { 
+            @Override
             public void run() {
                 GlobalHistory.getInstance().add(uri);
             }
         });
     }
 
     static void setUriTitle(final String uri, final String title) {    // invoked from native JNI code
         getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 GlobalHistory.getInstance().update(uri, title);
             }
         });
     }
 
     static void hideProgressDialog() {
         // unused stub
@@ -2133,16 +2150,17 @@ public class GeckoAppShell
 
     static class AsyncResultHandler extends FilePickerResultHandler {
         private long mId;
         AsyncResultHandler(long id) {
             super(null);
             mId = id;
         }
 
+        @Override
         public void onActivityResult(int resultCode, Intent data) {
             GeckoAppShell.notifyFilePickerResult(handleActivityResult(resultCode, data), mId);
         }
         
     }
 
     static native void notifyFilePickerResult(String filePath, long id);
 
@@ -2160,16 +2178,17 @@ public class GeckoAppShell
     public static String getGfxInfoData() {
         String data = sGfxInfoThread.getData();
         sGfxInfoThread = null;
         return data;
     }
 
     public static void registerSurfaceTextureFrameListener(Object surfaceTexture, final int id) {
         ((SurfaceTexture)surfaceTexture).setOnFrameAvailableListener(new SurfaceTexture.OnFrameAvailableListener() {
+            @Override
             public void onFrameAvailable(SurfaceTexture surfaceTexture) {
                 GeckoAppShell.onSurfaceTextureFrameAvailable(surfaceTexture, id);
             }
         });
     }
 
     public static void unregisterSurfaceTextureFrameListener(Object surfaceTexture) {
         ((SurfaceTexture)surfaceTexture).setOnFrameAvailableListener(null);

--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -313,16 +313,17 @@ final class GeckoEditable
 
     private void geckoUpdateGecko(final boolean force) {
         /* We do not increment the seqno here, but only check it, because geckoUpdateGecko is a
            request for update. If we incremented the seqno here, geckoUpdateGecko would have
            prevented other updates from occurring */
         final int seqnoWhenPosted = mGeckoUpdateSeqno;
 
         geckoPostToIc(new Runnable() {
+            @Override
             public void run() {
                 mActionQueue.syncWithGecko();
                 if (seqnoWhenPosted == mGeckoUpdateSeqno) {
                     icUpdateGecko(force);
                 }
             }
         });
     }
@@ -615,16 +616,17 @@ final class GeckoEditable
             final int selStart = Math.min(action.mStart < 0 ? curStart : action.mStart, len);
             final int selEnd = Math.min(action.mEnd < 0 ? curEnd : action.mEnd, len);
 
             if (selStart < action.mStart || selEnd < action.mEnd) {
                 Log.w(LOGTAG, "IME sync error: selection out of bounds");
             }
             Selection.setSelection(mText, selStart, selEnd);
             geckoPostToIc(new Runnable() {
+                @Override
                 public void run() {
                     mActionQueue.syncWithGecko();
                     final int start = Selection.getSelectionStart(mText);
                     final int end = Selection.getSelectionEnd(mText);
                     if (selStart == start && selEnd == end) {
                         // There has not been another new selection in the mean time that
                         // made this notification out-of-date
                         mListener.onSelectionChange(start, end);
@@ -668,16 +670,17 @@ final class GeckoEditable
             } finally {
                 // Ensure action is always removed from queue
                 // even if stale action results in exception in geckoActionReply
                 mActionQueue.poll();
             }
             return;
         }
         geckoPostToIc(new Runnable() {
+            @Override
             public void run() {
                 if (type == NOTIFY_IME_FOCUSCHANGE) {
                     if (state == IME_FOCUS_STATE_BLUR) {
                         mFocused = false;
                     } else {
                         mFocused = true;
                         // Unmask events on the Gecko side
                         mActionQueue.offer(new Action(Action.TYPE_ACKNOWLEDGE_FOCUS));
@@ -698,16 +701,17 @@ final class GeckoEditable
         // Because we want to be able to bind GeckoEditable to the newest LayerView instance,
         // this can be called from the Java IC thread in addition to the Gecko thread.
         if (DEBUG) {
             Log.d(LOGTAG, "notifyIMEEnabled(" +
                           getConstantName(GeckoEditableListener.class, "IME_STATE_", state) +
                           ", \"" + typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\")");
         }
         geckoPostToIc(new Runnable() {
+            @Override
             public void run() {
                 // Make sure there are no other things going on
                 mActionQueue.syncWithGecko();
                 // Set InputConnectionHandler in notifyIMEEnabled because
                 // GeckoInputConnection.notifyIMEEnabled calls restartInput() which will invoke
                 // InputConnectionHandler.onCreateInputConnection
                 LayerView v = GeckoApp.mAppContext.getLayerView();
                 if (v != null) {
@@ -736,16 +740,17 @@ final class GeckoEditable
            because the IC thread should be blocked on the event action */
         if (!mActionQueue.isEmpty() &&
             mActionQueue.peek().mType == Action.TYPE_EVENT) {
             Selection.setSelection(mText, start, end);
             return;
         }
 
         geckoPostToIc(new Runnable() {
+            @Override
             public void run() {
                 mActionQueue.syncWithGecko();
                 /* check to see there has not been another action that potentially changed the
                    selection. If so, we can skip this update because we know there is another
                    update right after this one that will replace the effect of this update */
                 if (mGeckoUpdateSeqno == seqnoWhenPosted) {
                     /* In this case, Gecko's selection has changed and it's notifying us to change
                        Java's selection. In the normal case, whenever Java's selection changes,
@@ -835,16 +840,17 @@ final class GeckoEditable
                 }
             } else {
                 geckoReplaceText(start, oldEnd, mChangedText);
             }
         } else {
             geckoReplaceText(start, oldEnd, mChangedText);
         }
         geckoPostToIc(new Runnable() {
+            @Override
             public void run() {
                 mListener.onTextChange(text, start, oldEnd, newEnd);
             }
         });
     }
 
     // InvocationHandler interface
 

--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -390,16 +390,17 @@ class GeckoInputConnection
         mBatchTextChanged = false;
         mUpdateRequest = null;
 
         mCurrentInputMethod = "";
 
         // Do not reset mIMEState here; see comments in notifyIMEEnabled
     }
 
+    @Override
     public void onTextChange(String text, int start, int oldEnd, int newEnd) {
 
         if (mUpdateRequest == null) {
             return;
         }
 
         if (mBatchEditCount > 0) {
             // Delay notification until after the batch edit
@@ -427,16 +428,17 @@ class GeckoInputConnection
                 Selection.getSelectionEnd(editable);
         mUpdateExtract.startOffset = 0;
         mUpdateExtract.text = editable;
 
         imm.updateExtractedText(v, mUpdateRequest.token,
                                 mUpdateExtract);
     }
 
+    @Override
     public void onSelectionChange(int start, int end) {
 
         if (mBatchEditCount > 0) {
             // Delay notification until after the batch edit
             mBatchSelectionChanged = true;
             return;
         }
         notifySelectionChange(start, end);
@@ -518,16 +520,17 @@ class GeckoInputConnection
                                  : getBackgroundHandler();
         if (mEditableClient.setInputConnectionHandler(newHandler)) {
             return newHandler;
         }
         // Setting new IC handler failed; return old IC handler
         return mEditableClient.getInputConnectionHandler();
     }
 
+    @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         if (mIMEState == IME_STATE_DISABLED) {
             return null;
         }
 
         outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
         outAttrs.imeOptions = EditorInfo.IME_ACTION_NONE;
         outAttrs.actionLabel = null;
@@ -648,20 +651,22 @@ class GeckoInputConnection
                     mThreadUtils.endWaitForUiThread();
                 }
             });
             mThreadUtils.waitForUiThread(icHandler);
         }
         return false; // seems to always return false
     }
 
+    @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         return false;
     }
 
+    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return processKeyDown(keyCode, event);
     }
 
     private boolean processKeyDown(int keyCode, KeyEvent event) {
         if (keyCode > KeyEvent.getMaxKeyCode())
             return false;
 
@@ -701,16 +706,17 @@ class GeckoInputConnection
         Handler icHandler = mEditableClient.getInputConnectionHandler();
         Editable uiEditable = mThreadUtils.getEditableForUiThread(uiHandler, icHandler);
         if (!keyListener.onKeyDown(view, uiEditable, keyCode, event)) {
             mEditableClient.sendEvent(GeckoEvent.createKeyEvent(event));
         }
         return true;
     }
 
+    @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         return processKeyUp(keyCode, event);
     }
 
     private boolean processKeyUp(int keyCode, KeyEvent event) {
         if (keyCode > KeyEvent.getMaxKeyCode())
             return false;
 
@@ -742,45 +748,49 @@ class GeckoInputConnection
         Handler icHandler = mEditableClient.getInputConnectionHandler();
         Editable uiEditable = mThreadUtils.getEditableForUiThread(uiHandler, icHandler);
         if (!keyListener.onKeyUp(view, uiEditable, keyCode, event)) {
             mEditableClient.sendEvent(GeckoEvent.createKeyEvent(event));
         }
         return true;
     }
 
+    @Override
     public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
         while ((repeatCount--) != 0) {
             if (!processKeyDown(keyCode, event) ||
                 !processKeyUp(keyCode, event)) {
                 return false;
             }
         }
         return true;
     }
 
+    @Override
     public boolean onKeyLongPress(int keyCode, KeyEvent event) {
         View v = getView();
         switch (keyCode) {
             case KeyEvent.KEYCODE_MENU:
                 InputMethodManager imm = getInputMethodManager();
                 imm.toggleSoftInputFromWindow(v.getWindowToken(),
                                               InputMethodManager.SHOW_FORCED, 0);
                 return true;
             default:
                 break;
         }
         return false;
     }
 
+    @Override
     public boolean isIMEEnabled() {
         // make sure this picks up PASSWORD and PLUGIN states as well
         return mIMEState != IME_STATE_DISABLED;
     }
 
+    @Override
     public void notifyIME(final int type, final int state) {
         switch (type) {
 
             case NOTIFY_IME_CANCELCOMPOSITION:
                 // Set composition to empty and end composition
                 setComposingText("", 0);
                 // Fall through
 
@@ -798,16 +808,17 @@ class GeckoInputConnection
             default:
                 if (DEBUG) {
                     throw new IllegalArgumentException("Unexpected NOTIFY_IME=" + type);
                 }
                 break;
         }
     }
 
+    @Override
     public void notifyIMEEnabled(final int state, final String typeHint,
                                  final String modeHint, final String actionHint) {
         // For some input type we will use a widget to display the ui, for those we must not
         // display the ime. We can display a widget for date and time types and, if the sdk version
         // is greater than 11, for datetime/month/week as well.
         if (typeHint != null &&
             (typeHint.equals("date") ||
              typeHint.equals("time") ||
@@ -838,16 +849,17 @@ class GeckoInputConnection
             // When using Find In Page, we can still receive notifyIMEEnabled calls due to the
             // selection changing when highlighting. However in this case we don't want to reset/
             // show/hide the keyboard because the find box has the focus and is taking input from
             // the keyboard.
             return;
         }
         restartInput();
         GeckoApp.mAppContext.mMainHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 if (mIMEState == IME_STATE_DISABLED) {
                     hideSoftInput();
                 } else {
                     showSoftInput();
                 }
             }
         }, 200); // Delay 200ms to prevent repeated IME showing/hiding
@@ -875,16 +887,17 @@ final class DebugGeckoInputConnection
         DebugGeckoInputConnection dgic =
                 new DebugGeckoInputConnection(targetView, editable);
         dgic.mProxy = (InputConnection)Proxy.newProxyInstance(
                 GeckoInputConnection.class.getClassLoader(),
                 PROXY_INTERFACES, dgic);
         return (GeckoEditableListener)dgic.mProxy;
     }
 
+    @Override
     public Object invoke(Object proxy, Method method, Object[] args)
             throws Throwable {
 
         StringBuilder log = new StringBuilder(mCallLevel);
         log.append("> ").append(method.getName()).append("(");
         for (Object arg : args) {
             // translate argument values to constant names
             if ("notifyIME".equals(method.getName()) && arg == args[0]) {

--- a/mobile/android/base/GeckoPreferences.java
+++ b/mobile/android/base/GeckoPreferences.java
@@ -98,23 +98,25 @@ public class GeckoPreferences
     public void onResume() {
         super.onResume();
 
         if (getApplication() instanceof GeckoApplication) {
             ((GeckoApplication) getApplication()).onActivityResume(this);
         }
     }
 
+    @Override
     public void handleMessage(String event, JSONObject message) {
         try {
             if (event.equals("Sanitize:Finished")) {
                 boolean success = message.getBoolean("success");
                 final int stringRes = success ? R.string.private_data_success : R.string.private_data_fail;
                 final Context context = this;
                 GeckoAppShell.getMainHandler().post(new Runnable () {
+                    @Override
                     public void run() {
                         Toast.makeText(context, stringRes, Toast.LENGTH_SHORT).show();
                     }
                 });
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
@@ -270,49 +272,55 @@ public class GeckoPreferences
         AlertDialog dialog = null;
 
         PasswordTextWatcher(EditText aInput1, EditText aInput2, AlertDialog aDialog) {
             input1 = aInput1;
             input2 = aInput2;
             dialog = aDialog;
         }
 
+        @Override
         public void afterTextChanged(Editable s) {
             if (dialog == null)
                 return;
 
             String text1 = input1.getText().toString();
             String text2 = input2.getText().toString();
             boolean disabled = TextUtils.isEmpty(text1) || TextUtils.isEmpty(text2) || !text1.equals(text2);
             dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(!disabled);
         }
 
+        @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+        @Override
         public void onTextChanged(CharSequence s, int start, int before, int count) { }
     }
 
     private class EmptyTextWatcher implements TextWatcher {
         EditText input = null;
         AlertDialog dialog = null;
 
         EmptyTextWatcher(EditText aInput, AlertDialog aDialog) {
             input = aInput;
             dialog = aDialog;
         }
 
+        @Override
         public void afterTextChanged(Editable s) {
             if (dialog == null)
                 return;
 
             String text = input.getText().toString();
             boolean disabled = TextUtils.isEmpty(text);
             dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(!disabled);
         }
 
+        @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+        @Override
         public void onTextChanged(CharSequence s, int start, int before, int count) { }
     }
 
     @Override
     protected Dialog onCreateDialog(int id) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         LinearLayout linearLayout = new LinearLayout(this);
         linearLayout.setOrientation(LinearLayout.VERTICAL);
@@ -322,38 +330,41 @@ public class GeckoPreferences
                 final EditText input1 = getTextBox(R.string.masterpassword_password);
                 final EditText input2 = getTextBox(R.string.masterpassword_confirm);
                 linearLayout.addView(input1);
                 linearLayout.addView(input2);
 
                 builder.setTitle(R.string.masterpassword_create_title)
                        .setView((View)linearLayout)
                        .setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {  
+                            @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 JSONObject jsonPref = new JSONObject();
                                 try {
                                     jsonPref.put("name", PREFS_MP_ENABLED);
                                     jsonPref.put("type", "string");
                                     jsonPref.put("value", input1.getText().toString());
                     
                                     GeckoEvent event = GeckoEvent.createBroadcastEvent("Preferences:Set", jsonPref.toString());
                                     GeckoAppShell.sendEventToGecko(event);
                                 } catch(Exception ex) {
                                     Log.e(LOGTAG, "Error setting master password", ex);
                                 }
                                 return;
                             }
                         })
                         .setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {  
+                            @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 return;
                             }
                         });
                         dialog = builder.create();
                         dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+                            @Override
                             public void onShow(DialogInterface dialog) {
                                 input1.setText("");
                                 input2.setText("");
                                 input1.requestFocus();
                             }
                         });
 
                         PasswordTextWatcher watcher = new PasswordTextWatcher(input1, input2, dialog);
@@ -363,32 +374,36 @@ public class GeckoPreferences
                 break;
             case DIALOG_REMOVE_MASTER_PASSWORD:
                 final EditText input = getTextBox(R.string.masterpassword_password);
                 linearLayout.addView(input);
 
                 builder.setTitle(R.string.masterpassword_remove_title)
                        .setView((View)linearLayout)
                        .setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {  
+                            @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 PrefsHelper.setPref(PREFS_MP_ENABLED, input.getText().toString());
                             }
                         })
                         .setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {  
+                            @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 return;
                             }
                         });
                         dialog = builder.create();
                         dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                            @Override
                             public void onDismiss(DialogInterface dialog) {
                                 input.setText("");
                             }
                         });
                         dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+                            @Override
                             public void onShow(DialogInterface dialog) {
                                 input.setText("");
                             }
                         });
                         input.addTextChangedListener(new EmptyTextWatcher(input, dialog));
                 break;
             default:
                 return null;
@@ -404,68 +419,74 @@ public class GeckoPreferences
             private Preference getField(String prefName) {
                 return (mPreferenceScreen == null ? null : mPreferenceScreen.findPreference(prefName));
             }
 
             @Override public void prefValue(String prefName, final boolean value) {
                 final Preference pref = getField(prefName);
                 if (pref instanceof CheckBoxPreference) {
                     GeckoAppShell.getMainHandler().post(new Runnable() {
+                        @Override
                         public void run() {
                             if (((CheckBoxPreference)pref).isChecked() != value)
                                 ((CheckBoxPreference)pref).setChecked(value);
                         }
                     });
                 }
             }
 
             @Override public void prefValue(String prefName, final String value) {
                 final Preference pref = getField(prefName);
                 if (pref instanceof EditTextPreference) {
                     GeckoAppShell.getMainHandler().post(new Runnable() {
+                        @Override
                         public void run() {
                             ((EditTextPreference)pref).setText(value);
                         }
                     });
                 } else if (pref instanceof ListPreference) {
                     GeckoAppShell.getMainHandler().post(new Runnable() {
+                        @Override
                         public void run() {
                             ((ListPreference)pref).setValue(value);
                             // Set the summary string to the current entry
                             CharSequence selectedEntry = ((ListPreference)pref).getEntry();
                             ((ListPreference)pref).setSummary(selectedEntry);
                         }
                     });
                 } else if (pref instanceof FontSizePreference) {
                     final FontSizePreference fontSizePref = (FontSizePreference) pref;
                     fontSizePref.setSavedFontSize(value);
                     final String fontSizeName = fontSizePref.getSavedFontSizeName();
                     GeckoAppShell.getMainHandler().post(new Runnable() {
+                        @Override
                         public void run() {
                             fontSizePref.setSummary(fontSizeName); // Ex: "Small".
                         }
                     });
                 }
             }
 
             @Override public void finish() {
                 // enable all preferences once we have them from gecko
                 GeckoAppShell.getMainHandler().post(new Runnable() {
+                    @Override
                     public void run() {
                         mPreferenceScreen.setEnabled(true);
                     }
                 });
             }
         });
     }
 
     private void registerEventListener(String event) {
         GeckoAppShell.getEventDispatcher().registerEventListener(event, this);
     }
 
     private void unregisterEventListener(String event) {
         GeckoAppShell.getEventDispatcher().unregisterEventListener(event, this);
     }
 
+    @Override
     public boolean isGeckoActivityOpened() {
         return false;
     }
 }

--- a/mobile/android/base/GeckoSmsManager.java
+++ b/mobile/android/base/GeckoSmsManager.java
@@ -347,16 +347,17 @@ public class GeckoSmsManager
   private final static int kMessageClassClass3  = 4;
 
   private final static String[] kRequiredMessageRows = new String[] { "_id", "address", "body", "date", "type", "status" };
 
   public GeckoSmsManager() {
     SmsIOThread.getInstance().start();
   }
 
+  @Override
   public void start() {
     IntentFilter smsFilter = new IntentFilter();
     smsFilter.addAction(GeckoSmsManager.ACTION_SMS_RECEIVED);
     smsFilter.addAction(GeckoSmsManager.ACTION_SMS_SENT);
     smsFilter.addAction(GeckoSmsManager.ACTION_SMS_DELIVERED);
 
     GeckoApp.mAppContext.registerReceiver(this, smsFilter);
   }
@@ -480,16 +481,17 @@ public class GeckoSmsManager
           !envelope.arePartsRemaining(Envelope.SubParts.DELIVERED_PART)) {
         postman.destroyEnvelope(envelopeId);
       }
 
       return;
     }
   }
 
+  @Override
   public void send(String aNumber, String aMessage, int aRequestId) {
     int envelopeId = Postman.kUnknownEnvelopeId;
 
     try {
       SmsManager sm = SmsManager.getDefault();
 
       Intent sentIntent = new Intent(ACTION_SMS_SENT);
       Intent deliveredIntent = new Intent(ACTION_SMS_DELIVERED);
@@ -595,16 +597,17 @@ public class GeckoSmsManager
       Log.e("GeckoSmsManager", "The id we received is higher than the higher allowed value.");
       return -1;
     } catch (Exception e) {
       Log.e("GeckoSmsManager", "Something went wrong when trying to write a sent message", e);
       return -1;
     }
   }
 
+  @Override
   public void getMessage(int aMessageId, int aRequestId) {
     class GetMessageRunnable implements Runnable {
       private int mMessageId;
       private int mRequestId;
 
       GetMessageRunnable(int aMessageId, int aRequestId) {
         mMessageId = aMessageId;
         mRequestId = aRequestId;
@@ -679,16 +682,17 @@ public class GeckoSmsManager
     }
 
     if (!SmsIOThread.getInstance().execute(new GetMessageRunnable(aMessageId, aRequestId))) {
       Log.e("GeckoSmsManager", "Failed to add GetMessageRunnable to the SmsIOThread");
       notifyGetSmsFailed(kUnknownError, aRequestId);
     }
   }
 
+  @Override
   public void deleteMessage(int aMessageId, int aRequestId) {
     class DeleteMessageRunnable implements Runnable {
       private int mMessageId;
       private int mRequestId;
 
       DeleteMessageRunnable(int aMessageId, int aRequestId) {
         mMessageId = aMessageId;
         mRequestId = aRequestId;
@@ -718,16 +722,17 @@ public class GeckoSmsManager
     }
 
     if (!SmsIOThread.getInstance().execute(new DeleteMessageRunnable(aMessageId, aRequestId))) {
       Log.e("GeckoSmsManager", "Failed to add GetMessageRunnable to the SmsIOThread");
       notifySmsDeleteFailed(kUnknownError, aRequestId);
     }
   }
 
+  @Override
   public void createMessageList(long aStartDate, long aEndDate, String[] aNumbers, int aNumbersCount, int aDeliveryState, boolean aReverse, int aRequestId) {
     class CreateMessageListRunnable implements Runnable {
       private long     mStartDate;
       private long     mEndDate;
       private String[] mNumbers;
       private int      mNumbersCount;
       private int      mDeliveryState;
       private boolean  mReverse;
@@ -840,16 +845,17 @@ public class GeckoSmsManager
     }
 
     if (!SmsIOThread.getInstance().execute(new CreateMessageListRunnable(aStartDate, aEndDate, aNumbers, aNumbersCount, aDeliveryState, aReverse, aRequestId))) {
       Log.e("GeckoSmsManager", "Failed to add CreateMessageListRunnable to the SmsIOThread");
       notifyReadingMessageListFailed(kUnknownError, aRequestId);
     }
   }
 
+  @Override
   public void getNextMessageInList(int aListId, int aRequestId) {
     class GetNextMessageInListRunnable implements Runnable {
       private int mListId;
       private int mRequestId;
 
       GetNextMessageInListRunnable(int aListId, int aRequestId) {
         mListId = aListId;
         mRequestId = aRequestId;
@@ -899,24 +905,27 @@ public class GeckoSmsManager
     }
 
     if (!SmsIOThread.getInstance().execute(new GetNextMessageInListRunnable(aListId, aRequestId))) {
       Log.e("GeckoSmsManager", "Failed to add GetNextMessageInListRunnable to the SmsIOThread");
       notifyReadingMessageListFailed(kUnknownError, aRequestId);
     }
   }
 
+  @Override
   public void clearMessageList(int aListId) {
     MessagesListManager.getInstance().remove(aListId);
   }
 
+  @Override
   public void stop() {
     GeckoApp.mAppContext.unregisterReceiver(this);
   }
 
+  @Override
   public void shutdown() {
     SmsIOThread.getInstance().interrupt();
     MessagesListManager.getInstance().clear();
   }
 
   private int getGeckoDeliveryStatus(int aDeliveryStatus) {
     if (aDeliveryStatus == kInternalDeliveryStatusNone) {
       return kDeliveryStatusNotApplicable;

--- a/mobile/android/base/GeckoThread.java
+++ b/mobile/android/base/GeckoThread.java
@@ -109,16 +109,17 @@ public class GeckoThread extends Thread 
         String type = getTypeFromAction(mIntent.getAction());
         mIntent = null;
 
         // and then fire us up
         Log.i(LOGTAG, "RunGecko - args = " + args);
         GeckoAppShell.runGecko(path, args, mUri, type);
     }
 
+    @Override
     public void handleMessage(String event, JSONObject message) {
         if ("Gecko:Ready".equals(event)) {
             GeckoAppShell.getEventDispatcher().unregisterEventListener(event, this);
             setLaunchState(LaunchState.GeckoRunning);
             GeckoAppShell.sendPendingEventsToGecko();
         }
     }
 

--- a/mobile/android/base/GlobalHistory.java
+++ b/mobile/android/base/GlobalHistory.java
@@ -39,16 +39,17 @@ class GlobalHistory {
     private final Runnable mNotifierRunnable;           // off-thread runnable used to check URIs
     private boolean mProcessing; // = false             // whether or not the runnable is queued/working
 
     private GlobalHistory() {
         mHandler = GeckoAppShell.getHandler();
         mPendingUris = new LinkedList<String>();
         mVisitedCache = new SoftReference<Set<String>>(null);
         mNotifierRunnable = new Runnable() {
+            @Override
             public void run() {
                 Set<String> visitedSet = mVisitedCache.get();
                 if (visitedSet == null) {
                     // the cache was wiped away, repopulate it
                     Log.w(LOGTAG, "Rebuilding visited link set...");
                     visitedSet = new HashSet<String>();
                     Cursor c = BrowserDB.getAllVisitedHistory(GeckoApp.mAppContext.getContentResolver());
                     if (c.moveToFirst()) {
@@ -127,16 +128,17 @@ class GlobalHistory {
         if (!canAddURI(uri))
             return;
 
         BrowserDB.updateHistoryTitle(GeckoApp.mAppContext.getContentResolver(), uri, title);
     }
 
     public void checkUriVisited(final String uri) {
         mHandler.post(new Runnable() {
+            @Override
             public void run() {
                 // this runs on the same handler thread as the processing loop,
                 // so no synchronization needed
                 mPendingUris.add(uri);
                 if (mProcessing) {
                     // there's already a runnable queued up or working away, so
                     // no need to post another
                     return;

--- a/mobile/android/base/JavaAddonManager.java
+++ b/mobile/android/base/JavaAddonManager.java
@@ -76,16 +76,17 @@ class JavaAddonManager implements GeckoE
             // we've already done this registration. don't do it again
             return;
         }
         mApplicationContext = applicationContext;
         mDispatcher.registerEventListener("Dex:Load", this);
         mDispatcher.registerEventListener("Dex:Unload", this);
     }
 
+    @Override
     public void handleMessage(String event, JSONObject message) {
         try {
             if (event.equals("Dex:Load")) {
                 String zipFile = message.getString("zipfile");
                 String implClass = message.getString("impl");
                 Log.d(LOGTAG, "Attempting to load classes.dex file from " + zipFile + " and instantiate " + implClass);
                 try {
                     File tmpDir = mApplicationContext.getDir("dex", 0);
@@ -168,29 +169,31 @@ class JavaAddonManager implements GeckoE
                     }
                 } catch (JSONException e) {
                     Log.d(LOGTAG, "Error during JSON->bundle conversion", e);
                 }
             }
             return b;
         }
 
+        @Override
         public void handleMessage(String event, JSONObject json) {
             try {
                 if (mBundle != null) {
                     Log.w(LOGTAG, "Event [" + event + "] handler is re-entrant; response messages may be lost");
                 }
                 mBundle = jsonToBundle(json);
                 Message msg = new Message();
                 msg.setData(mBundle);
                 mDelegate.handleMessage(msg);
             } catch (Exception e) {
                 Log.e(LOGTAG, "Caught exception thrown from wrapped addon message handler", e);
             }
         }
 
+        @Override
         public String getResponse() {
             String response = mBundle.getString("response");
             mBundle = null;
             return response;
         }
     }
 }

--- a/mobile/android/base/LauncherShortcuts.java.in
+++ b/mobile/android/base/LauncherShortcuts.java.in
@@ -177,24 +177,26 @@ public class LauncherShortcuts extends A
                 builder.setTitle(R.string.launcher_shortcuts_title);
                 builder.setAdapter(new SimpleAdapter(
                     LauncherShortcuts.this,
                     mWebappsList,
                     R.layout.launch_app_listitem,
                     new String[] { "favicon", "title" },
                     new int[] { R.id.favicon, R.id.title }
                 ), new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int id) {
                         dialog.dismiss();
                         onListItemClick(id);
                         finish();
                     }
                 });
                 
                 builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
                     public void onCancel(DialogInterface dialog) {
                         dialog.dismiss();
                         finish();
                     }
                 });
                 
                 builder.create().show();
             } else {

--- a/mobile/android/base/LightweightTheme.java
+++ b/mobile/android/base/LightweightTheme.java
@@ -85,25 +85,27 @@ public class LightweightTheme implements
                     headerURL = headerURL.substring(0, mark);
                 try {
                     // Get the image and convert it to a bitmap.
                     URL url = new URL(headerURL);
                     InputStream stream = url.openStream();
                     final Bitmap bitmap = BitmapFactory.decodeStream(stream);
                     stream.close();
                     mHandler.post(new Runnable() {
+                        @Override
                         public void run() {
                             setLightweightTheme(bitmap);
                         }
                     });
                 } catch(MalformedURLException e) {
                 } catch(IOException e) {
                 }
             } else if (event.equals("LightweightTheme:Disable")) {
                 mHandler.post(new Runnable() {
+                    @Override
                     public void run() {
                         resetLightweightTheme();
                     }
                 });
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }

--- a/mobile/android/base/MultiChoicePreference.java
+++ b/mobile/android/base/MultiChoicePreference.java
@@ -144,16 +144,17 @@ class MultiChoicePreference extends Dial
         }
 
         if (mEntries.length != mEntryKeys.length || mEntryKeys.length != mInitialValues.length) {
             throw new IllegalStateException(
                     "MultiChoicePreference entries, entryKeys, and initialValues arrays must be the same length");
         }
 
         builder.setMultiChoiceItems(mEntries, mValues, new DialogInterface.OnMultiChoiceClickListener() {
+            @Override
             public void onClick(DialogInterface dialog, int which, boolean val) {
                 // mValues is automatically updated when checkboxes are clicked
 
                 // enable positive button only if at least one item is checked
                 boolean enabled = false;
                 for (int i = 0; i < mValues.length; i++) {
                     if (mValues[i]) {
                         enabled = true;
@@ -179,16 +180,17 @@ class MultiChoicePreference extends Dial
             // user cancelled; reset checkbox values to their previous state
             mValues = mPrevValues.clone();
             return;
         } else {
             mPrevValues = mValues.clone();
         }
 
         GeckoAppShell.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 for (int i = 0; i < mEntryKeys.length; i++) {
                     String key = mEntryKeys[i].toString();
                     persistBoolean(key, mValues[i]);
                 }
             }
         });
     }
@@ -227,16 +229,17 @@ class MultiChoicePreference extends Dial
         final int entryCount = mEntryKeys.length;
         if (entryCount != mEntries.length || entryCount != mInitialValues.length) {
             throw new IllegalStateException(
                     "MultiChoicePreference entryKeys and initialValues arrays must be the same length");
         }
 
         mValues = new boolean[entryCount];
         GeckoAppShell.getHandler().post(new Runnable() {
+            @Override
             public void run() {
                 for (int i = 0; i < entryCount; i++) {
                     String key = mEntryKeys[i].toString();
                     boolean initialValue = mInitialValues[i].equals("true");
                     mValues[i] = getPersistedBoolean(key, initialValue);
                 }
                 mPrevValues = mValues.clone();
             }

--- a/mobile/android/base/PrefsHelper.java
+++ b/mobile/android/base/PrefsHelper.java
@@ -145,24 +145,28 @@ public final class PrefsHelper {
     public interface PrefHandler {
         void prefValue(String pref, boolean value);
         void prefValue(String pref, int value);
         void prefValue(String pref, String value);
         void finish();
     }
 
     public static abstract class PrefHandlerBase implements PrefHandler {
+        @Override
         public void prefValue(String pref, boolean value) {
             Log.w(LOGTAG, "Unhandled boolean value for pref [" + pref + "]");
         }
 
+        @Override
         public void prefValue(String pref, int value) {
             Log.w(LOGTAG, "Unhandled int value for pref [" + pref + "]");
         }
 
+        @Override
         public void prefValue(String pref, String value) {
             Log.w(LOGTAG, "Unhandled String value for pref [" + pref + "]");
         }
 
+        @Override
         public void finish() {
         }
     }
 }

--- a/mobile/android/base/ProfileMigrator.java
+++ b/mobile/android/base/ProfileMigrator.java
@@ -605,16 +605,17 @@ public class ProfileMigrator {
             final String syncKey = mSyncSettingsMap.get("Mozilla Services Encryption Passphrase");
             final String syncPass = mSyncSettingsMap.get("Mozilla Services Password");
             final String serverURL = mSyncSettingsMap.get("services.sync.serverURL");
             final String clusterURL = mSyncSettingsMap.get("services.sync.clusterURL");
             final String clientName = mSyncSettingsMap.get("services.sync.client.name");
             final String clientGuid = mSyncSettingsMap.get("services.sync.client.GUID");
 
             GeckoAppShell.getHandler().post(new Runnable() {
+                @Override
                 public void run() {
                     if (userName == null || syncKey == null || syncPass == null) {
                         // This isn't going to work. Give up.
                         Log.e(LOGTAG, "Profile has incomplete Sync config. Not migrating.");
                         setMigratedSync();
                         return;
                     }
 
@@ -632,30 +633,32 @@ public class ProfileMigrator {
                     }
                     setMigratedSync();
                 }
             });
         }
 
         protected void registerAndRequest() {
             GeckoAppShell.getHandler().post(new Runnable() {
+                @Override
                 public void run() {
                     requestValues();
                 }
             });
         }
 
         @Override
         public void run() {
             // Run only if no Sync accounts exist.
             new SyncAccounts.AccountsExistTask() {
                 @Override
                 protected void onPostExecute(Boolean result) {
                     if (result.booleanValue()) {
                         GeckoAppShell.getHandler().post(new Runnable() {
+                            @Override
                             public void run() {
                                 Log.i(LOGTAG, "Sync account already configured, skipping.");
                                 setMigratedSync();
                             }
                         });
                     } else {
                         // No account configured, fire up.
                         registerAndRequest();
@@ -926,16 +929,17 @@ public class ProfileMigrator {
             // We're at the end if we got less results than requested.
             if (queryResultEntries < mMaxEntries) {
                 setMigratedHistory();
             }
 
             // GlobalHistory access communicates with Gecko
             // and must run on its thread.
             GeckoAppShell.getHandler().post(new Runnable() {
+                    @Override
                     public void run() {
                         for (String url : placesHistory) {
                             GlobalHistory.getInstance().addToGeckoOnly(url);
                         }
                     }
              });
         }
 

--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -179,16 +179,17 @@ public class PromptService implements On
                 input.setText(mValue);
 
                 if (!TextUtils.isEmpty(mHint)) {
                     input.setHint(mHint);
                 }
 
                 if (mAutofocus) {
                     input.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                        @Override
                         public void onFocusChange(View v, boolean hasFocus) {
                             if (hasFocus) {
                                 ((InputMethodManager) GeckoApp.mAppContext.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, 0);
                             }
                         }
                     });
                     input.requestFocus();
                 }
@@ -259,26 +260,29 @@ public class PromptService implements On
                     return formatDateString("yyyy-MM",calendar);
                 }
             }
             return "";
         }
     }
 
     // GeckoEventListener implementation
+    @Override
     public void handleMessage(String event, final JSONObject message) {
         // The dialog must be created on the UI thread.
         GeckoAppShell.getMainHandler().post(new Runnable() {
+            @Override
             public void run() {
                 processMessage(message);
             }
         });
     }
 
     // GeckoEventResponder implementation
+    @Override
     public String getResponse() {
         // we only handle one kind of message in handleMessage, and this is the
         // response we provide for that message
         String promptServiceResult = "";
         try {
             promptServiceResult = waitForReturn();
         } catch (InterruptedException e) { }
         return promptServiceResult;
@@ -379,16 +383,17 @@ public class PromptService implements On
             }
         }
 
         mDialog = builder.create();
         mDialog.setOnCancelListener(PromptService.this);
         mDialog.show();
     }
 
+    @Override
     public void onClick(DialogInterface aDialog, int aWhich) {
         GeckoApp.assertOnUiThread();
         JSONObject ret = new JSONObject();
         try {
             int button = -1;
             ListView list = mDialog.getListView();
             if (list != null || mSelected != null) {
                 button = aWhich;
@@ -420,21 +425,23 @@ public class PromptService implements On
 
         if (mDialog != null) {
             mDialog.dismiss();
         }
 
         finishDialog(ret.toString());
     }
 
+    @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         GeckoApp.assertOnUiThread();
         mSelected[position] = !mSelected[position];
     }
 
+    @Override
     public void onCancel(DialogInterface aDialog) {
         GeckoApp.assertOnUiThread();
         JSONObject ret = new JSONObject();
         try {
             ret.put("button", -1);
         } catch(Exception ex) { }
         finishDialog(ret.toString());
     }