--- a/build/mobile/robocop/Actions.java.in
+++ b/build/mobile/robocop/Actions.java.in
@@ -78,12 +78,19 @@ public interface Actions {
      * @param key The special key to send
      */
     void sendSpecialKey(SpecialKey key);
     void sendKeyCode(int keyCode);
 
     void drag(int startingX, int endingX, int startingY, int endingY);
 
     /**
+     * This is the implementation of clickLongOnScreen from Robotium 4.0 since this sometimes fails for Robotium 3.6
+     * TODO : Remove this when Robotium is updated
+     */
+
+    void clickLongOnScreen(float x, float y);
+
+    /**
      * Run a sql query on the specified database
      */
     public Cursor querySql(String dbPath, String sql);
 }

--- a/build/mobile/robocop/FennecNativeActions.java.in
+++ b/build/mobile/robocop/FennecNativeActions.java.in
@@ -17,17 +17,19 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 
 import com.jayway.android.robotium.solo.Solo;
 
 import static @ANDROID_PACKAGE_NAME@.FennecNativeDriver.LogLevel;
 
 public class FennecNativeActions implements Actions {
     private Solo mSolo;
     private Instrumentation mInstr;
@@ -453,16 +455,51 @@ public class FennecNativeActions impleme
     public void sendKeys(String input) {
         mInstr.sendStringSync(input);
     }
 
     public void drag(int startingX, int endingX, int startingY, int endingY) {
         mSolo.drag(startingX, endingX, startingY, endingY, 10);
     }
 
+     /**
+     * This is the implementation of clickLongOnScreen from Robotium 4.0 since this sometimes fails for Robotium 3.6
+     * TODO : Remove this when Robotium is updated
+     */
+
+    public void clickLongOnScreen(float x, float y) {
+    	boolean successfull = false;
+        int retry = 0;
+        long downTime = SystemClock.uptimeMillis();
+        long eventTime = SystemClock.uptimeMillis();
+        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
+
+        while(!successfull && retry < 10) {
+            try{
+                mInstr.sendPointerSync(event);
+                successfull = true;
+            }catch(SecurityException e){
+                FennecNativeDriver.log(LogLevel.ERROR, e);
+                retry++;
+            }
+        }
+
+        mAsserter.ok(successfull, "Trying to click on long on screen at (" + x + "," + y + ")", "Was able to click long on screen");
+
+        eventTime = SystemClock.uptimeMillis();
+        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x + 1.0f, y + 1.0f, 0);
+        mInstr.sendPointerSync(event);
+        mSolo.sleep(((int)(ViewConfiguration.getLongPressTimeout() * 2.5f)));
+
+        eventTime = SystemClock.uptimeMillis();
+        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
+        mInstr.sendPointerSync(event);
+        mSolo.sleep(500);
+    }
+
     public Cursor querySql(String dbPath, String sql) {
         try {
             return (Cursor)mQuerySql.invoke(mRobocopApi, dbPath, sql);
         } catch(InvocationTargetException ex) {
             Log.e(LOGTAG, "Error invoking method", ex);
         } catch(IllegalAccessException ex) {
             Log.e(LOGTAG, "Error using field", ex);
         }

--- a/mobile/android/base/ActivityHandlerHelper.java
+++ b/mobile/android/base/ActivityHandlerHelper.java
@@ -31,17 +31,16 @@ import java.util.concurrent.TimeUnit;
 
 public class ActivityHandlerHelper implements GeckoEventListener {
     private static final String LOGTAG = "GeckoActivityHandlerHelper";
 
     private final ConcurrentLinkedQueue<String> mFilePickerResult;
 
     private final ActivityResultHandlerMap mActivityResultHandlerMap;
     private final FilePickerResultHandlerSync mFilePickerResultHandlerSync;
-    private final AwesomebarResultHandler mAwesomebarResultHandler;
     private final CameraImageResultHandler mCameraImageResultHandler;
     private final CameraVideoResultHandler mCameraVideoResultHandler;
 
     public interface FileResultHandler {
         public void gotFile(String filename);
     }
 
     @SuppressWarnings("serial")
@@ -53,17 +52,16 @@ public class ActivityHandlerHelper imple
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createNoOpEvent());
                     return true;
                 }
                 return false;
             }
         };
         mActivityResultHandlerMap = new ActivityResultHandlerMap();
         mFilePickerResultHandlerSync = new FilePickerResultHandlerSync(mFilePickerResult);
-        mAwesomebarResultHandler = new AwesomebarResultHandler();
         mCameraImageResultHandler = new CameraImageResultHandler(mFilePickerResult);
         mCameraVideoResultHandler = new CameraVideoResultHandler(mFilePickerResult);
         GeckoAppShell.getEventDispatcher().registerEventListener("FilePicker:Show", this);
     }
 
     @Override
     public void handleMessage(String event, final JSONObject message) {
         if (event.equals("FilePicker:Show")) {
@@ -86,20 +84,16 @@ public class ActivityHandlerHelper imple
                     }
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent(
                         "FilePicker:Result", message.toString()));
                 }
             });
         }
     }
 
-    public int makeRequestCodeForAwesomebar() {
-        return mActivityResultHandlerMap.put(mAwesomebarResultHandler);
-    }
-
     public int makeRequestCode(ActivityResultHandler aHandler) {
         return mActivityResultHandlerMap.put(aHandler);
     }
 
     public void startIntentForActivity (Activity activity, Intent intent, ActivityResultHandler activityResultHandler) {
         activity.startActivityForResult(intent, mActivityResultHandlerMap.put(activityResultHandler));
     }
 

--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -225,21 +225,16 @@
         <activity android:name="org.mozilla.gecko.VideoPlayer"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation"
                   android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
                 <action android:name="org.mozilla.gecko.PLAY_VIDEO" />
             </intent-filter>
         </activity>
 
-        <activity android:name="org.mozilla.gecko.AwesomeBar"
-                  android:theme="@style/Gecko.AwesomeBar"
-                  android:configChanges="orientation|screenSize"
-                  android:windowSoftInputMode="stateUnspecified|adjustResize"/>
-
         <activity android:name="org.mozilla.gecko.GeckoPreferences"
                   android:theme="@style/Gecko.Preferences"
                   android:label="@string/settings_title"
                   android:configChanges="orientation|screenSize"
                   android:excludeFromRecents="true"/>
 
         <provider android:name="org.mozilla.gecko.db.BrowserProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"

--- a/mobile/android/base/AnimatedHeightLayout.java
+++ b/mobile/android/base/AnimatedHeightLayout.java
@@ -12,18 +12,22 @@ import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.RelativeLayout;
 
 public class AnimatedHeightLayout extends RelativeLayout {
     private static final String LOGTAG = "GeckoAnimatedHeightLayout";
     private static final int ANIMATION_DURATION = 100;
     private boolean mAnimating = false;
 
+    public AnimatedHeightLayout(Context context) {
+        super(context, null);
+    }
+
     public AnimatedHeightLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        super(context, attrs, 0);
     }
 
     public AnimatedHeightLayout(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

new file mode 100644
--- /dev/null
+++ b/mobile/android/base/AutocompleteHandler.java
@@ -0,0 +1,10 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+public interface AutocompleteHandler {
+    void onAutocomplete(String res);
+}

deleted file mode 100644
--- a/mobile/android/base/AwesomeBar.java
+++ /dev/null
@@ -1,730 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.db.BrowserContract.Combined;
-import org.mozilla.gecko.db.BrowserDB;
-import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.health.BrowserHealthRecorder;
-import org.mozilla.gecko.util.GamepadUtils;
-import org.mozilla.gecko.util.StringUtils;
-import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.util.UiAsyncTask;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.TabWidget;
-import android.widget.Toast;
-
-import org.json.JSONObject;
-
-import java.net.URLEncoder;
-
-interface AutocompleteHandler {
-    void onAutocomplete(String res);
-}
-
-public class AwesomeBar extends GeckoActivity
-                        implements AutocompleteHandler,
-                                   TextWatcher {
-    private static final String LOGTAG = "GeckoAwesomeBar";
-
-    public static final String URL_KEY = "url";
-    public static final String TAB_KEY = "tab";
-    public static final String CURRENT_URL_KEY = "currenturl";
-    public static final String TARGET_KEY = "target";
-    public static final String SEARCH_KEY = "search";
-    public static final String TITLE_KEY = "title";
-    public static final String USER_ENTERED_KEY = "user_entered";
-    public static final String READING_LIST_KEY = "reading_list";
-    public static enum Target { NEW_TAB, CURRENT_TAB, PICK_SITE };
-
-    private String mTarget;
-    private AwesomeBarTabs mAwesomeTabs;
-    private CustomEditText mText;
-    private ImageButton mGoButton;
-    private ContextMenuSubject mContextMenuSubject;
-    private boolean mDelayRestartInput;
-    // The previous autocomplete result returned to us
-    private String mAutoCompleteResult = "";
-    // The user typed part of the autocomplete result
-    private String mAutoCompletePrefix = null;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        LayoutInflater.from(this).setFactory(this);
-
-        super.onCreate(savedInstanceState);
-
-        Log.d(LOGTAG, "creating awesomebar");
-
-        setContentView(R.layout.awesomebar);
-
-        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(SearchEngine engine, String text) {
-                Intent resultIntent = new Intent();
-                resultIntent.putExtra(URL_KEY, text);
-                resultIntent.putExtra(TARGET_KEY, mTarget);
-                resultIntent.putExtra(SEARCH_KEY, engine.name);
-                recordSearch(engine.identifier, "barsuggest");
-                finishWithResult(resultIntent);
-            }
-
-            @Override
-            public void onEditSuggestion(final String text) {
-                ThreadUtils.postToUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        mText.setText(text);
-                        mText.setSelection(mText.getText().length());
-                        mText.requestFocus();
-                    }
-                });
-            }
-
-            @Override
-            public void onSwitchToTab(final int tabId) {
-                Intent resultIntent = new Intent();
-                resultIntent.putExtra(TAB_KEY, Integer.toString(tabId));
-                finishWithResult(resultIntent);
-            }
-        });
-
-        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) {
-            mText.setText(currentUrl);
-            mText.selectAll();
-        }
-
-        mTarget = intent.getStringExtra(TARGET_KEY);
-        if (mTarget.equals(Target.CURRENT_TAB.name())) {
-            Tab tab = Tabs.getInstance().getSelectedTab();
-            if (tab != null && tab.isPrivate()) {
-                BrowserToolbarBackground mAddressBarBg = (BrowserToolbarBackground) findViewById(R.id.address_bar_bg);
-                mAddressBarBg.setPrivateMode(true);
-
-                ShapedButton mTabs = (ShapedButton) findViewById(R.id.dummy_tab);
-                if (mTabs != null)
-                    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.
-                    Editable content = mText.getText();
-                    if (!hasCompositionString(content)) {
-                        openUserEnteredAndFinish(content.toString());
-                        return true;
-                    }
-                }
-
-                // If input method is in fullscreen mode, we want to dismiss
-                // it instead of closing awesomebar straight away.
-                InputMethodManager imm =
-                        (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                if (keyCode == KeyEvent.KEYCODE_BACK && !imm.isFullscreenMode()) {
-                    return handleBackKey();
-                }
-
-                return false;
-            }
-        });
-
-        mText.addTextChangedListener(this);
-
-        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 if (GamepadUtils.isBackKey(event)) {
-                    return handleBackKey();
-                } 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);
-                } catch (NullPointerException e) {
-                    Log.e(LOGTAG, "InputMethodManagerService, why are you throwing"
-                                  + " a NullPointerException? See bug 782096", e);
-                }
-            }
-        });
-
-        boolean showReadingList = intent.getBooleanExtra(READING_LIST_KEY, false);
-        if (showReadingList) {
-            BookmarksTab bookmarksTab = mAwesomeTabs.getBookmarksTab();
-            bookmarksTab.setShowReadingList(true);
-            mAwesomeTabs.setCurrentItemByTag(bookmarksTab.getTag());
-        }
-    }
-
-    private boolean handleBackKey() {
-        // Let mAwesomeTabs try to handle the back press, since we may be in a
-        // bookmarks sub-folder.
-        if (mAwesomeTabs.onBackPressed())
-            return true;
-
-        // If mAwesomeTabs.onBackPressed() returned false, we didn't move up
-        // a folder level, so just exit the activity.
-        cancelAndFinish();
-        return true;
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfiguration) {
-        super.onConfigurationChanged(newConfiguration);
-    }
-
-    @Override
-    public boolean onSearchRequested() {
-        cancelAndFinish();
-        return true;
-    }
-
-    private void updateGoButton(String text) {
-        if (text.length() == 0) {
-            mGoButton.setVisibility(View.GONE);
-            return;
-        }
-
-        mGoButton.setVisibility(View.VISIBLE);
-
-        int imageResource = R.drawable.ic_awesomebar_go;
-        String contentDescription = getString(R.string.go);
-        int imeAction = EditorInfo.IME_ACTION_GO;
-
-        int actionBits = mText.getImeOptions() & EditorInfo.IME_MASK_ACTION;
-        if (StringUtils.isSearchQuery(text, actionBits == EditorInfo.IME_ACTION_SEARCH)) {
-            imageResource = R.drawable.ic_awesomebar_search;
-            contentDescription = getString(R.string.search);
-            imeAction = EditorInfo.IME_ACTION_SEARCH;
-        }
-
-        InputMethodManager imm = InputMethods.getInputMethodManager(mText.getContext());
-        if (imm == null) {
-            return;
-        }
-        boolean restartInput = false;
-        if (actionBits != imeAction) {
-            int optionBits = mText.getImeOptions() & ~EditorInfo.IME_MASK_ACTION;
-            mText.setImeOptions(optionBits | imeAction);
-
-            mDelayRestartInput = (imeAction == EditorInfo.IME_ACTION_GO) &&
-                                 (InputMethods.shouldDelayAwesomebarUpdate(mText.getContext()));
-            if (!mDelayRestartInput) {
-                restartInput = true;
-            }
-        } else if (mDelayRestartInput) {
-            // Only call delayed restartInput when actionBits == imeAction
-            // so if there are two restarts in a row, the first restarts will
-            // be discarded and the second restart will be properly delayed
-            mDelayRestartInput = false;
-            restartInput = true;
-        }
-        if (restartInput) {
-            updateKeyboardInputType();
-            imm.restartInput(mText);
-            mGoButton.setImageResource(imageResource);
-            mGoButton.setContentDescription(contentDescription);
-        }
-    }
-
-    private void updateKeyboardInputType() {
-        // If the user enters a space, then we know they are entering search terms, not a URL.
-        // We can then switch to text mode so,
-        // 1) the IME auto-inserts spaces between words
-        // 2) the IME doesn't reset input keyboard to Latin keyboard.
-        String text = mText.getText().toString();
-        int currentInputType = mText.getInputType();
-        int newInputType = StringUtils.isSearchQuery(text, false)
-                           ? (currentInputType & ~InputType.TYPE_TEXT_VARIATION_URI) // Text mode
-                           : (currentInputType | InputType.TYPE_TEXT_VARIATION_URI); // URL mode
-        if (newInputType != currentInputType) {
-            mText.setRawInputType(newInputType);
-        }
-    }
-
-    private void cancelAndFinish() {
-        setResult(Activity.RESULT_CANCELED);
-        finish();
-        overridePendingTransition(R.anim.awesomebar_hold_still, R.anim.awesomebar_fade_out);
-    }
-
-    private void finishWithResult(Intent intent) {
-        setResult(Activity.RESULT_OK, intent);
-        finish();
-        overridePendingTransition(R.anim.awesomebar_hold_still, R.anim.awesomebar_fade_out);
-    }
-
-    private void openUrlAndFinish(String url) {
-        openUrlAndFinish(url, null, false);
-    }
-
-    private void openUrlAndFinish(String url, String title, boolean userEntered) {
-        Intent resultIntent = new Intent();
-        resultIntent.putExtra(URL_KEY, url);
-        if (title != null && !TextUtils.isEmpty(title))
-            resultIntent.putExtra(TITLE_KEY, title);
-        if (userEntered)
-            resultIntent.putExtra(USER_ENTERED_KEY, userEntered);
-        resultIntent.putExtra(TARGET_KEY, mTarget);
-        finishWithResult(resultIntent);
-    }
-
-    /**
-     * Record in Health Report that a search has occurred.
-     *
-     * @param identifier
-     *        a search identifier, such as "partnername". Can be null.
-     * @param where
-     *        where the search was initialized; one of the values in
-     *        {@link BrowserHealthRecorder#SEARCH_LOCATIONS}.
-     */
-    private static void recordSearch(String identifier, String where) {
-        Log.i(LOGTAG, "Recording search: " + identifier + ", " + where);
-        try {
-            JSONObject message = new JSONObject();
-            message.put("type", BrowserHealthRecorder.EVENT_SEARCH);
-            message.put("location", where);
-            message.put("identifier", identifier);
-            GeckoAppShell.getEventDispatcher().dispatchEvent(message);
-        } catch (Exception e) {
-            Log.w(LOGTAG, "Error recording search.", e);
-        }
-    }
-
-    private void openUserEnteredAndFinish(final String url) {
-        final int index = url.indexOf(' ');
-
-        // Check for a keyword if the URL looks like a search query
-        if (!StringUtils.isSearchQuery(url, true)) {
-            openUrlAndFinish(url, "", true);
-            return;
-        }
-        ThreadUtils.postToBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                final String keyword;
-                final String keywordSearch;
-
-                if (index == -1) {
-                    keyword = url;
-                    keywordSearch = "";
-                } else {
-                    keyword = url.substring(0, index);
-                    keywordSearch = url.substring(index + 1);
-                }
-
-                final String keywordUrl = BrowserDB.getUrlForKeyword(getContentResolver(), keyword);
-                final String searchUrl = (keywordUrl != null)
-                                       ? keywordUrl.replace("%s", URLEncoder.encode(keywordSearch))
-                                       : url;
-                if (keywordUrl != null) {
-                    recordSearch(null, "barkeyword");
-                }
-                openUrlAndFinish(searchUrl, "", true);
-            }
-        });
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Galaxy Note sends key events for the stylus that are outside of the
-        // valid keyCode range (see bug 758427)
-        if (keyCode > KeyEvent.getMaxKeyCode())
-            return true;
-
-        // This method is called only if the key event was not handled
-        // by any of the views, which usually means the edit box lost focus
-        if (keyCode == KeyEvent.KEYCODE_BACK ||
-            keyCode == KeyEvent.KEYCODE_MENU ||
-            keyCode == KeyEvent.KEYCODE_DPAD_UP ||
-            keyCode == KeyEvent.KEYCODE_DPAD_DOWN ||
-            keyCode == KeyEvent.KEYCODE_DPAD_LEFT ||
-            keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ||
-            keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
-            keyCode == KeyEvent.KEYCODE_DEL ||
-            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
-            keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
-            GamepadUtils.isActionKey(event)) {
-            return super.onKeyDown(keyCode, event);
-        } else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-             mText.setText("");
-             mText.requestFocus();
-             return true;
-        } else {
-            int prevSelStart = mText.getSelectionStart();
-            int prevSelEnd = mText.getSelectionEnd();
-
-            // Manually dispatch the key event to the AwesomeBar. If selection changed as
-            // a result of the key event, then give focus back to mText
-            mText.dispatchKeyEvent(event);
-
-            int curSelStart = mText.getSelectionStart();
-            int curSelEnd = mText.getSelectionEnd();
-            if (prevSelStart != curSelStart || prevSelEnd != curSelEnd) {
-                mText.requestFocusFromTouch();
-                // Restore the selection, which gets lost due to the focus switch
-                mText.setSelection(curSelStart, curSelEnd);
-            }
-            return true;
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mText != null && mText.getText() != null) {
-            updateGoButton(mText.getText().toString());
-            if (mDelayRestartInput) {
-                // call updateGoButton again to force a restartInput call
-                updateGoButton(mText.getText().toString());
-            }
-        }
-
-        // Invlidate the cached value that keeps track of whether or
-        // not desktop bookmarks exist
-        BrowserDB.invalidateCachedState();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mAwesomeTabs.destroy();
-    }
-
-    @Override
-    public void onBackPressed() {
-        // Let mAwesomeTabs try to handle the back press, since we may be in a
-        // bookmarks sub-folder.
-        if (mAwesomeTabs.onBackPressed())
-            return;
-
-        // Otherwise, just exit the awesome screen
-        cancelAndFinish();
-    }
-
-    static public class ContextMenuSubject {
-        public int id;
-        public String url;
-        public byte[] favicon;
-        public String title;
-        public String keyword;
-        public int display;
-
-        public ContextMenuSubject(int id, String url, byte[] favicon, String title, String keyword) {
-            this(id, url, favicon, title, keyword, Combined.DISPLAY_NORMAL);
-        }
-
-        public ContextMenuSubject(int id, String url, byte[] favicon, String title, String keyword, int display) {
-            this.id = id;
-            this.url = url;
-            this.favicon = favicon;
-            this.title = title;
-            this.keyword = keyword;
-            this.display = display;
-        }
-    };
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, view, menuInfo);
-        AwesomeBarTab tab = mAwesomeTabs.getAwesomeBarTabForView(view);
-        mContextMenuSubject = tab.getSubject(menu, view, menuInfo);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        if (mContextMenuSubject == null)
-            return false;
-
-        final int id = mContextMenuSubject.id;
-        final String url = mContextMenuSubject.url;
-        final byte[] b = mContextMenuSubject.favicon;
-        final String title = mContextMenuSubject.title;
-        final String keyword = mContextMenuSubject.keyword;
-        final int display = mContextMenuSubject.display;
-
-        final int itemId = item.getItemId();
-        if (itemId == R.id.open_private_tab || itemId == R.id.open_new_tab) {
-            if (url == null) {
-                Log.e(LOGTAG, "Can't open in new tab because URL is null");
-            }
-
-            String newTabUrl = url;
-            if (display == Combined.DISPLAY_READER)
-                newTabUrl = ReaderModeUtils.getAboutReaderForUrl(url, true);
-
-            int flags = Tabs.LOADURL_NEW_TAB;
-            if (item.getItemId() == R.id.open_private_tab)
-                flags |= Tabs.LOADURL_PRIVATE;
-
-            Tabs.getInstance().loadUrl(newTabUrl, flags);
-            Toast.makeText(this, R.string.new_tab_opened, Toast.LENGTH_SHORT).show();
-
-            return true;
-        }
-
-        if (itemId == R.id.open_in_reader) {
-            if (url == null) {
-                Log.e(LOGTAG, "Can't open in reader mode because URL is null");
-            } else {
-                openUrlAndFinish(ReaderModeUtils.getAboutReaderForUrl(url, true));
-            }
-            return true;
-        }
-
-        if (itemId == R.id.edit_bookmark) {
-            new EditBookmarkDialog(this).show(id, title, url, keyword);
-            return true;
-        }
-
-        if (itemId == R.id.remove_bookmark) {
-            (new UiAsyncTask<Void, Void, Integer>(ThreadUtils.getBackgroundHandler()) {
-                private boolean mInReadingList;
-
-                @Override
-                public void onPreExecute() {
-                    mInReadingList = mAwesomeTabs.isInReadingList();
-                }
-
-                @Override
-                public Integer doInBackground(Void... params) {
-                    BrowserDB.removeBookmark(getContentResolver(), id);
-                    Integer count = mInReadingList ?
-                        BrowserDB.getReadingListCount(getContentResolver()) : 0;
-
-                    return count;
-                }
-
-                @Override
-                public void onPostExecute(Integer aCount) {
-                    int messageId = R.string.bookmark_removed;
-                    if (mInReadingList) {
-                        messageId = R.string.reading_list_removed;
-
-                        GeckoEvent e = GeckoEvent.createBroadcastEvent("Reader:Remove", url);
-                        GeckoAppShell.sendEventToGecko(e);
-
-                        // Delete from Awesomebar context menu can alter reading list bookmark count
-                        e = GeckoEvent.createBroadcastEvent("Reader:ListCountUpdated", Integer.toString(aCount));
-                        GeckoAppShell.sendEventToGecko(e);
-                    }
-
-                    Toast.makeText(AwesomeBar.this, messageId, Toast.LENGTH_SHORT).show();
-                }
-            }).execute();
-
-            return true;
-        }
-
-        if (itemId == R.id.remove_history) {
-            (new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
-                @Override
-                public Void doInBackground(Void... params) {
-                    BrowserDB.removeHistoryEntry(getContentResolver(), id);
-                    return null;
-                }
-
-                @Override
-                public void onPostExecute(Void result) {
-                    Toast.makeText(AwesomeBar.this, R.string.history_removed, Toast.LENGTH_SHORT).show();
-                }
-            }).execute();
-
-            return true;
-        }
-
-        if (itemId == R.id.add_to_launcher) {
-            if (url == null) {
-                Log.e(LOGTAG, "Can't add to home screen because URL is null");
-            } else {
-                Bitmap bitmap = null;
-                if (b != null) {
-                    bitmap = BitmapUtils.decodeByteArray(b);
-                }
-
-                String shortcutTitle = TextUtils.isEmpty(title) ? url.replaceAll("^([a-z]+://)?(www\\.)?", "") : title;
-                GeckoAppShell.createShortcut(shortcutTitle, url, bitmap, "");
-            }
-
-            return true;
-        }
-
-        if (itemId == R.id.share) {
-            if (url == null) {
-                Log.e(LOGTAG, "Can't share because URL is null");
-            } else {
-                GeckoAppShell.openUriExternal(url, "text/plain", "", "",
-                                              Intent.ACTION_SEND, title);
-            }
-
-            return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    public static String getReaderForUrl(String url) {
-        // FIXME: still need to define the final way to open items from
-        // reading list. For now, we're using an about:reader page.
-        return "about:reader?url=" + Uri.encode(url) + "&readingList=1";
-    }
-
-    private static boolean hasCompositionString(Editable content) {
-        Object[] spans = content.getSpans(0, content.length(), Object.class);
-        if (spans != null) {
-            for (Object span : spans) {
-                if ((content.getSpanFlags(span) & Spanned.SPAN_COMPOSING) != 0) {
-                    // Found composition string.
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    // return early if we're backspacing through the string, or have no autocomplete results
-    public void onAutocomplete(final String result) {
-        final String text = mText.getText().toString();
-
-        if (result == null) {
-            mAutoCompleteResult = "";
-            return;
-        }
-
-        if (!result.startsWith(text) || text.equals(result)) {
-            return;
-        }
-
-        mAutoCompleteResult = result;
-        mText.getText().append(result.substring(text.length()));
-        mText.setSelection(text.length(), result.length());
-    }
-
-    @Override
-    public void afterTextChanged(final Editable s) {
-        final String text = s.toString();
-        boolean useHandler = false;
-        boolean reuseAutocomplete = false;
-        if (!hasCompositionString(s) && !StringUtils.isSearchQuery(text, false)) {
-            useHandler = true;
-
-            // If you're hitting backspace (the string is getting smaller
-            // or is unchanged), don't autocomplete.
-            if (mAutoCompletePrefix != null && (mAutoCompletePrefix.length() >= text.length())) {
-                useHandler = false;
-            } else if (mAutoCompleteResult != null && mAutoCompleteResult.startsWith(text)) {
-                // If this text already matches our autocomplete text, autocomplete likely
-                // won't change. Just reuse the old autocomplete value.
-                useHandler = false;
-                reuseAutocomplete = true;
-            }
-        }
-
-        // If this is the autocomplete text being set, don't run the filter.
-        if (TextUtils.isEmpty(mAutoCompleteResult) || !mAutoCompleteResult.equals(text)) {
-            mAwesomeTabs.filter(text, useHandler ? this : null);
-            mAutoCompletePrefix = text;
-
-            if (reuseAutocomplete) {
-                onAutocomplete(mAutoCompleteResult);
-            }
-        }
-
-        // If the AwesomeBar has a composition string, don't call updateGoButton().
-        // That method resets IME and composition state will be broken.
-        if (!hasCompositionString(s) ||
-            InputMethods.isGestureKeyboard(mText.getContext())) {
-            updateGoButton(text);
-        }
-    }
-
-    @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
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.StateListDrawable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TabHost;
-import android.widget.TabWidget;
-
-public class AwesomeBarTabs extends TabHost
-                            implements LightweightTheme.OnChangeListener { 
-    private static final String LOGTAG = "GeckoAwesomeBarTabs";
-
-    private Context mContext;
-    private GeckoActivity mActivity;
-
-    private boolean mInflated;
-    private LayoutInflater mInflater;
-    private OnUrlOpenListener mUrlOpenListener;
-    private View.OnTouchListener mListTouchListener;
-    private boolean mSearching = false;
-    private String mTarget;
-    private ViewPager mViewPager;
-    private AwesomePagerAdapter mPagerAdapter;
-
-    private AwesomeBarTab mTabs[];
-
-    public interface OnUrlOpenListener {
-        public void onUrlOpen(String url, String title);
-        public void onSearch(SearchEngine engine, String text);
-        public void onEditSuggestion(String suggestion);
-        public void onSwitchToTab(final int tabId);
-    }
-
-    private class AwesomePagerAdapter extends PagerAdapter {
-        public AwesomePagerAdapter() {
-            super();
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup group, int index) {
-            AwesomeBarTab tab = mTabs[index];
-            group.addView(tab.getView());
-            return tab;
-        }
-
-        @Override
-        public void destroyItem(ViewGroup group, int index, Object obj) {
-            AwesomeBarTab tab = (AwesomeBarTab)obj;
-            group.removeView(tab.getView());
-        }
-
-        @Override
-        public int getCount() {
-            if (mSearching)
-                return 1;
-            return mTabs.length;
-        }
-
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return getAwesomeBarTabForView(view) == object;
-        }
-    }
-
-    private AwesomeBarTab getCurrentAwesomeBarTab() {
-        int index = mViewPager.getCurrentItem();
-        return mTabs[index];
-    }
-
-    public AwesomeBarTab getAwesomeBarTabForView(View view) {
-        String tag = (String)view.getTag();
-        return getAwesomeBarTabForTag(tag);
-    }
-
-    public AwesomeBarTab getAwesomeBarTabForTag(String tag) {
-        for (AwesomeBarTab tab : mTabs) {
-            if (tag.equals(tab.getTag())) {
-                return tab;
-            }
-        }
-        return null;
-    }
-
-    public boolean onBackPressed() {
-        AwesomeBarTab tab = getCurrentAwesomeBarTab();
-        if (tab == null)
-             return false;
-        return tab.onBackPressed();
-    }
-
-    public AwesomeBarTabs(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        Log.d(LOGTAG, "Creating AwesomeBarTabs");
-
-        mContext = context;
-        mActivity = (GeckoActivity) context;
-
-        mInflated = false;
-        mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        // HACK: Without this, the onFinishInflate is called twice
-        // This issue is due to a bug when Android inflates a layout with a
-        // parent. Fixed in Honeycomb
-        if (mInflated)
-            return;
-
-        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) {
-                    // take focus away from awesome bar to hide the keyboard
-                    requestFocus();
-                }
-                return false;
-            }
-        };
-
-        mTabs = new AwesomeBarTab[] {
-            new AllPagesTab(mContext),
-            new BookmarksTab(mContext),
-            new HistoryTab(mContext)
-        };
-
-        final TabWidget tabWidget = (TabWidget) findViewById(android.R.id.tabs);
-        // hide the strip since we aren't using the TabHost...
-        tabWidget.setStripEnabled(false);
-
-        mViewPager = (ViewPager) findViewById(R.id.tabviewpager);
-        mPagerAdapter = new AwesomePagerAdapter();
-        mViewPager.setAdapter(mPagerAdapter);
-
-        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrollStateChanged(int state) { }
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { }
-            @Override
-            public void onPageSelected(int position) {
-                tabWidget.setCurrentTab(position);
-                styleSelectedTab();
-                // take focus away from awesome bar to hide the keyboard
-                requestFocus();
-             }
-         });
-
-        for (int i = 0; i < mTabs.length; i++) {
-            mTabs[i].setListTouchListener(mListTouchListener);
-            addAwesomeTab(mTabs[i].getTag(),
-                          mTabs[i].getTitleStringId(),
-                          i);
-        }
-
-        // Initialize "All Pages" list with no filter
-        filter("", null);
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mActivity.getLightweightTheme().addListener(this);
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mActivity.getLightweightTheme().removeListener(this);
-    }
-
-    @Override
-    public void onLightweightThemeChanged() {
-        styleSelectedTab();
-    }
-
-    @Override
-    public void onLightweightThemeReset() {
-        styleSelectedTab();
-    }
-
-    public void setCurrentItemByTag(String tag) {
-        mViewPager.setCurrentItem(getTabIdByTag(tag));
-    }
-
-    public int getTabIdByTag(String tag) {
-        for (int i = 0; i < mTabs.length; i++) {
-            if (tag.equals(mTabs[i].getTag())) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private void styleSelectedTab() {
-        int selIndex = mViewPager.getCurrentItem();
-        TabWidget tabWidget = getTabWidget();
-        boolean isPrivate = false;
-
-        if (mTarget != null && mTarget.equals(AwesomeBar.Target.CURRENT_TAB.name())) {
-            Tab tab = Tabs.getInstance().getSelectedTab();
-            if (tab != null)
-                isPrivate = tab.isPrivate();
-        }
-
-        for (int i = 0; i < tabWidget.getTabCount(); i++) {
-            GeckoTextView view = (GeckoTextView) tabWidget.getChildTabViewAt(i);
-            if (isPrivate) {
-                view.resetTheme();
-                view.setPrivateMode((i == selIndex) ? false : true);
-            } else {
-                if (i == selIndex)
-                    view.resetTheme();
-                else if (mActivity.getLightweightTheme().isEnabled())
-                    view.setTheme(mActivity.getLightweightTheme().isLightTheme());
-                else
-                    view.resetTheme();
-            }
-
-            if (i < (selIndex - 1))
-                view.getBackground().setLevel(3);
-            else if (i == (selIndex - 1))
-                view.getBackground().setLevel(1);
-            else if (i == (selIndex + 1))
-                view.getBackground().setLevel(2);
-            else if (i > (selIndex + 1))
-                view.getBackground().setLevel(4);
-        }
-
-        if (selIndex == 0)
-            findViewById(R.id.tab_widget_left).getBackground().setLevel(1);
-        else
-            findViewById(R.id.tab_widget_left).getBackground().setLevel(0);
-
-        if (selIndex == (tabWidget.getTabCount() - 1))
-            findViewById(R.id.tab_widget_right).getBackground().setLevel(2);
-        else
-            findViewById(R.id.tab_widget_right).getBackground().setLevel(0);
-    }
-
-
-    private View addAwesomeTab(String id, int titleId, final int contentId) {
-        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;
-    }
-
-    public void setOnUrlOpenListener(OnUrlOpenListener listener) {
-        mUrlOpenListener = listener;
-        for (AwesomeBarTab tab : mTabs) {
-            tab.setUrlListener(listener);
-        }
-    }
-
-    public void destroy() {
-        for (AwesomeBarTab tab : mTabs) {
-            tab.destroy();
-        }
-    }
-
-    public AllPagesTab getAllPagesTab() {
-        return (AllPagesTab)getAwesomeBarTabForTag("allPages");
-    }
-
-    public BookmarksTab getBookmarksTab() {
-        return (BookmarksTab)getAwesomeBarTabForTag("bookmarks");
-    }
-
-    public HistoryTab getHistoryTab() {
-        return (HistoryTab)getAwesomeBarTabForTag("history");
-    }
-
-    public void filter(String searchTerm, AutocompleteHandler handler) {
-
-        // If searching, disable left / right tab swipes
-        mSearching = searchTerm.length() != 0;
-
-        // reset the pager adapter to force repopulating the cache
-        mViewPager.setAdapter(mPagerAdapter);
-
-        // Ensure the 'All Pages' tab is selected
-        AllPagesTab allPages = getAllPagesTab();
-        getTabWidget().setCurrentTab(getTabIdByTag(allPages.getTag()));
-        styleSelectedTab();
-
-        // Perform the actual search
-        allPages.filter(searchTerm, handler);
-
-        // If searching, hide the tabs bar
-        findViewById(R.id.tab_widget_container).setVisibility(mSearching ? View.GONE : View.VISIBLE);
-    }
-
-    public boolean isInReadingList() {
-        return getBookmarksTab().isInReadingList();
-    }
-
-    public void setTarget(String target) {
-        mTarget = target;
-        styleSelectedTab();
-        if (mTarget.equals(AwesomeBar.Target.CURRENT_TAB.name())) {
-            Tab tab = Tabs.getInstance().getSelectedTab();
-            if (tab != null && tab.isPrivate())
-                ((BackgroundLayout) findViewById(R.id.tab_widget_container)).setPrivateMode(true);
-        }
-    }
-
-    public static class BackgroundLayout extends GeckoLinearLayout {
-        private GeckoActivity mActivity;
-
-        public BackgroundLayout(Context context, AttributeSet attrs) {
-            super(context, attrs);
-            mActivity = (GeckoActivity) context;
-        }
-
-        @Override
-        public void onLightweightThemeChanged() {
-            LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getColorDrawable(this);
-            if (drawable == null)
-                return;
-
-            drawable.setAlpha(255, 0);
-
-            StateListDrawable stateList = new StateListDrawable();
-            stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(mActivity.getResources().getColor(R.color.background_private)));
-            stateList.addState(new int[] {}, drawable);
-
-            int[] padding =  new int[] { getPaddingLeft(),
-                                         getPaddingTop(),
-                                         getPaddingRight(),
-                                         getPaddingBottom()
-                                       };
-            setBackgroundDrawable(stateList);
-            setPadding(padding[0], padding[1], padding[2], padding[3]);
-        }
-
-        @Override
-        public void onLightweightThemeReset() {
-            int[] padding =  new int[] { getPaddingLeft(),
-                                         getPaddingTop(),
-                                         getPaddingRight(),
-                                         getPaddingBottom()
-                                       };
-            setBackgroundResource(R.drawable.address_bar_bg);
-            setPadding(padding[0], padding[1], padding[2], padding[3]);
-        }
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/AwesomebarResultHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.util.ActivityResultHandler;
-
-import android.content.Intent;
-import android.util.Log;
-
-class AwesomebarResultHandler implements ActivityResultHandler {
-    private static final String LOGTAG = "GeckoAwesomebarResultHandler";
-
-    @Override
-    public void onActivityResult(int resultCode, Intent data) {
-        if (data != null) {
-            String tab = data.getStringExtra(AwesomeBar.TAB_KEY);
-            if (tab != null) {
-                Tabs.getInstance().selectTab(Integer.parseInt(tab));
-                return;
-            }
-
-            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) {
-                    flags |= Tabs.LOADURL_NEW_TAB;
-                }
-                if (data.getBooleanExtra(AwesomeBar.USER_ENTERED_KEY, false)) {
-                    flags |= Tabs.LOADURL_USER_ENTERED;
-                }
-                Tabs.getInstance().loadUrl(url, searchEngine, -1, flags);
-            }
-        }
-    }
-}

--- a/mobile/android/base/BackButton.java
+++ b/mobile/android/base/BackButton.java
@@ -68,17 +68,17 @@ public class BackButton extends ShapedBu
     @Override
     public void draw(Canvas canvas) {
         mCanvasDelegate.draw(canvas, mPath, getWidth(), getHeight());
 
         // Draw the border on top.
         canvas.drawPath(mBorderPath, isPrivateMode() ? mBorderPrivatePaint : mBorderPaint);
     }
 
-    // The drawable is constructed as per @drawable/address_bar_nav_button.
+    // The drawable is constructed as per @drawable/url_bar_nav_button.
     @Override
     public void onLightweightThemeChanged() {
         Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
         if (drawable == null)
             return;
 
         Resources resources = getContext().getResources();
         StateListDrawable stateList = new StateListDrawable();
@@ -90,11 +90,11 @@ public class BackButton extends ShapedBu
         stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_private)));
         stateList.addState(new int[] {}, drawable);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.address_bar_nav_button);
+        setBackgroundResource(R.drawable.url_bar_nav_button);
     }
 }

--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -9,24 +9,26 @@ import org.mozilla.gecko.animation.Prope
 import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.gfx.PanZoomController;
 import org.mozilla.gecko.health.BrowserHealthReporter;
+import org.mozilla.gecko.home.BrowserSearch;
+import org.mozilla.gecko.home.HomePager;
+import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
-import org.mozilla.gecko.widget.AboutHome;
 import org.mozilla.gecko.widget.GeckoActionProvider;
 import org.mozilla.gecko.widget.ButtonToast;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.Activity;
@@ -44,16 +46,18 @@ import android.graphics.drawable.BitmapD
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.nfc.NfcEvent;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -65,25 +69,28 @@ import android.view.animation.Interpolat
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Vector;
 
 abstract public class BrowserApp extends GeckoApp
                                  implements TabsPanel.TabsLayoutChangeListener,
                                             PropertyAnimator.PropertyAnimationListener,
                                             View.OnKeyListener,
                                             GeckoLayerClient.OnMetricsChangedListener,
-                                            AboutHome.UriLoadListener,
-                                            AboutHome.LoadCompleteListener {
+                                            BrowserSearch.OnSearchListener,
+                                            BrowserSearch.OnEditSuggestionListener,
+                                            HomePager.OnNewTabsListener,
+                                            OnUrlOpenListener {
     private static final String LOGTAG = "GeckoBrowserApp";
 
     private static final String PREF_CHROME_DYNAMICTOOLBAR = "browser.chrome.dynamictoolbar";
 
     private static final String ABOUT_HOME = "about:home";
 
     private static final int TABS_ANIMATION_DURATION = 450;
 
@@ -91,18 +98,23 @@ abstract public class BrowserApp extends
     private static final int READER_ADD_FAILED = 1;
     private static final int READER_ADD_DUPLICATE = 2;
 
     private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
 
     private static final String STATE_ABOUT_HOME_TOP_PADDING = "abouthome_top_padding";
     private static final String STATE_DYNAMIC_TOOLBAR_ENABLED = "dynamic_toolbar";
 
+    private static final String BROWSER_SEARCH_TAG = "browser_search";
+    private BrowserSearch mBrowserSearch;
+    private View mBrowserSearchContainer;
+
     public static BrowserToolbar mBrowserToolbar;
-    private AboutHome mAboutHome;
+    private HomePager mHomePager;
+    private View mHomePagerContainer;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
 
     // Set the default session restore value
     private int mSessionRestore = -1;
 
     private static final int GECKO_TOOLS_MENU = -1;
     private static final int ADDON_MENU_OFFSET = 1000;
     private class MenuItemInfo {
@@ -147,20 +159,16 @@ abstract public class BrowserApp extends
     private int mToolbarHeight = 0;
 
     // Stored value of whether the last metrics change allowed for toolbar
     // scrolling.
     private boolean mDynamicToolbarCanScroll = false;
 
     private Integer mPrefObserverId;
 
-    // Tag for the AboutHome fragment. The fragment is automatically attached
-    // after restoring from a saved state, so we use this tag to identify it.
-    private static final String ABOUTHOME_TAG = "abouthome";
-
     private SharedPreferencesHelper mSharedPreferencesHelper;
 
     private OrderedBroadcastHelper mOrderedBroadcastHelper;
 
     private BrowserHealthReporter mBrowserHealthReporter;
 
     private SiteIdentityPopup mSiteIdentityPopup;
 
@@ -177,24 +185,24 @@ abstract public class BrowserApp extends
             case LOCATION_CHANGE:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     maybeCancelFaviconLoad(tab);
                 }
                 // fall through
             case SELECTED:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     if (isAboutHome(tab)) {
-                        showAboutHome();
+                        showHomePager(tab.getAboutHomePage());
 
                         if (isDynamicToolbarEnabled()) {
                             // Show the toolbar.
                             mLayerView.getLayerMarginsAnimator().showMargins(false);
                         }
                     } else {
-                        hideAboutHome();
+                        hideHomePager();
                     }
 
                     if (mSiteIdentityPopup != null)
                         mSiteIdentityPopup.dismiss();
 
                     final TabsPanel.Panel panel = tab.isPrivate()
                                                 ? TabsPanel.Panel.PRIVATE_TABS
                                                 : TabsPanel.Panel.NORMAL_TABS;
@@ -238,37 +246,31 @@ abstract public class BrowserApp extends
                     loadFavicon(tab);
                 }
                 break;
         }
         super.onTabChanged(tab, msg, data);
     }
 
     @Override
-    void handleClearHistory() {
-        super.handleClearHistory();
-        updateAboutHomeTopSites();
-    }
-
-    @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
         // Global onKey handler. This is called if the focused UI doesn't
         // handle the key event, and before Gecko swallows the events.
         if (event.getAction() != KeyEvent.ACTION_DOWN) {
             return false;
         }
 
         // Gamepad support only exists in API-level >= 9
         if (Build.VERSION.SDK_INT >= 9 &&
             (event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
             switch (keyCode) {
                 case KeyEvent.KEYCODE_BUTTON_Y:
                     // Toggle/focus the address bar on gamepad-y button.
                     if (mBrowserToolbar.isVisible()) {
-                        if (isDynamicToolbarEnabled() && !mAboutHome.getUserVisibleHint()) {
+                        if (isDynamicToolbarEnabled() && !mHomePager.isVisible()) {
                             if (mLayerView != null) {
                                 mLayerView.getLayerMarginsAnimator().hideMargins(false);
                                 mLayerView.requestFocus();
                             }
                         } else {
                             // Just focus the address bar when about:home is visible
                             // or when the dynamic toolbar isn't enabled.
                             mBrowserToolbar.requestFocusFromTouch();
@@ -325,17 +327,21 @@ abstract public class BrowserApp extends
             }
         }
 
         return false;
     }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (onKey(null, keyCode, event)) {
+        if (!mBrowserToolbar.isEditing() && onKey(null, keyCode, event)) {
+            return true;
+        }
+
+        if (mBrowserToolbar.onKey(keyCode, event)) {
             return true;
         }
 
         return super.onKeyDown(keyCode, event);
     }
 
     void handleReaderListCountRequest() {
         ThreadUtils.postToBackgroundThread(new Runnable() {
@@ -379,29 +385,16 @@ abstract public class BrowserApp extends
 
                 final int count = BrowserDB.getReadingListCount(getContentResolver());
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Reader:ListCountUpdated", Integer.toString(count)));
             }
         });
     }
 
     @Override
-    void onStatePurged() {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (mAboutHome != null)
-                    mAboutHome.setLastTabsVisibility(false);
-            }
-        });
-
-        super.onStatePurged();
-    }
-
-    @Override
     protected int getSessionRestoreState(Bundle savedInstanceState) {
         if (mSessionRestore > -1) {
             return mSessionRestore;
         }
 
         return super.getSessionRestoreState(savedInstanceState);
     }
 
@@ -422,38 +415,59 @@ abstract public class BrowserApp extends
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
             public boolean onInterceptMotionEvent(View view, MotionEvent event) {
                 // If we get a gamepad panning MotionEvent while the focus is not on the layerview,
                 // put the focus on the layerview and carry on
                 if (mLayerView != null && !mLayerView.hasFocus() && GamepadUtils.isPanningControl(event)) {
-                    if (mAboutHome.getUserVisibleHint()) {
-                        mAboutHome.requestFocus();
+                    if (mHomePager.isVisible()) {
+                        mLayerView.requestFocus();
                     } else {
-                        mLayerView.requestFocus();
+                        mHomePager.requestFocus();
                     }
                 }
                 return false;
             }
         });
 
-        // Find the Fragment if it was already added from a restored instance state.
-        mAboutHome = (AboutHome) getSupportFragmentManager().findFragmentByTag(ABOUTHOME_TAG);
+        mHomePager = (HomePager) findViewById(R.id.home_pager);
+        mHomePagerContainer = findViewById(R.id.home_pager_container);
+
+        mBrowserSearchContainer = findViewById(R.id.search_container);
+        mBrowserSearch = (BrowserSearch) getSupportFragmentManager().findFragmentByTag(BROWSER_SEARCH_TAG);
+        if (mBrowserSearch == null) {
+            mBrowserSearch = BrowserSearch.newInstance();
+            mBrowserSearch.setUserVisibleHint(false);
+        }
+
+        mBrowserToolbar.setOnActivateListener(new BrowserToolbar.OnActivateListener() {
+            public void onActivate() {
+                enterEditingMode();
+            }
+        });
 
-        if (mAboutHome == null) {
-            // AboutHome will be dynamically attached and detached as
-            // about:home is shown. Adding/removing the fragment is not synchronous,
-            // so we can't use Fragment#isVisible() to determine whether the
-            // about:home is shown. Instead, we use Fragment#getUserVisibleHint()
-            // with the hint we set ourselves.
-            mAboutHome = AboutHome.newInstance();
-            mAboutHome.setUserVisibleHint(false);
-        }
+        mBrowserToolbar.setOnCommitListener(new BrowserToolbar.OnCommitListener() {
+            public void onCommit() {
+                commitEditingMode();
+            }
+        });
+
+        mBrowserToolbar.setOnDismissListener(new BrowserToolbar.OnDismissListener() {
+            public void onDismiss() {
+                dismissEditingMode();
+            }
+        });
+
+        mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() {
+            public void onFilter(String searchText, AutocompleteHandler handler) {
+                filterEditingMode(searchText, handler);
+            }
+        });
 
         // Intercept key events for gamepad shortcuts
         mBrowserToolbar.setOnKeyListener(this);
 
         if (mTabsPanel != null) {
             mTabsPanel.setTabsLayoutChangeListener(this);
             updateSideBarState();
         }
@@ -463,16 +477,17 @@ abstract public class BrowserApp extends
         registerEventListener("CharEncoding:Data");
         registerEventListener("CharEncoding:State");
         registerEventListener("Feedback:LastUrl");
         registerEventListener("Feedback:OpenPlayStore");
         registerEventListener("Feedback:MaybeLater");
         registerEventListener("Telemetry:Gather");
         registerEventListener("Settings:Show");
         registerEventListener("Updater:Launch");
+        registerEventListener("Reader:GoToReadingList");
 
         Distribution.init(this, getPackageResourcePath());
         JavaAddonManager.getInstance().init(getApplicationContext());
         mSharedPreferencesHelper = new SharedPreferencesHelper(getApplicationContext());
         mOrderedBroadcastHelper = new OrderedBroadcastHelper(getApplicationContext());
         mBrowserHealthReporter = new BrowserHealthReporter();
 
         if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 14) {
@@ -488,17 +503,17 @@ abstract public class BrowserApp extends
                         return new NdefMessage(new NdefRecord[] { NdefRecord.createUri(tab.getURL()) });
                     }
                 }, this);
             }
         }
 
         if (savedInstanceState != null) {
             mDynamicToolbarEnabled = savedInstanceState.getBoolean(STATE_DYNAMIC_TOOLBAR_ENABLED);
-            mAboutHome.setTopPadding(savedInstanceState.getInt(STATE_ABOUT_HOME_TOP_PADDING));
+            mHomePagerContainer.setPadding(0, savedInstanceState.getInt(STATE_ABOUT_HOME_TOP_PADDING), 0, 0);
         }
 
         // Listen to the dynamic toolbar pref
         mPrefObserverId = PrefsHelper.getPref(PREF_CHROME_DYNAMICTOOLBAR, new PrefsHelper.PrefHandlerBase() {
             @Override
             public void prefValue(String pref, boolean value) {
                 if (value == mDynamicToolbarEnabled) {
                     return;
@@ -522,30 +537,47 @@ abstract public class BrowserApp extends
                 // We want to be notified of changes to be able to switch mode
                 // without restarting.
                 return true;
             }
         });
     }
 
     @Override
+    public void onBackPressed() {
+        if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
+            super.onBackPressed();
+            return;
+        }
+
+        if (dismissEditingMode()) {
+            return;
+        }
+
+        if (mSiteIdentityPopup != null && mSiteIdentityPopup.isShowing()) {
+            mSiteIdentityPopup.dismiss();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         unregisterEventListener("Prompt:ShowTop");
     }
 
     @Override
     public void onPause() {
         super.onPause();
         // Register for Prompt:ShowTop so we can foreground this activity even if it's hidden.
         registerEventListener("Prompt:ShowTop");
     }
 
-
-
     private void showBookmarkDialog() {
         final Tab tab = Tabs.getInstance().getSelectedTab();
         final Prompt ps = new Prompt(this, new Prompt.PromptCallback() {
             @Override
             public void onPromptFinished(String result) {
                 int itemId = -1;
                 try {
                   itemId = new JSONObject(result).getInt("button");
@@ -578,24 +610,24 @@ abstract public class BrowserApp extends
     }
 
     private void setDynamicToolbarEnabled(boolean enabled) {
         if (enabled) {
             if (mLayerView != null) {
                 mLayerView.getLayerClient().setOnMetricsChangedListener(this);
             }
             setToolbarMargin(0);
-            mAboutHome.setTopPadding(mBrowserToolbar.getHeight());
+            mHomePagerContainer.setPadding(0, mBrowserToolbar.getHeight(), 0, 0);
         } else {
             // Immediately show the toolbar when disabling the dynamic
             // toolbar.
             if (mLayerView != null) {
                 mLayerView.getLayerClient().setOnMetricsChangedListener(null);
             }
-            mAboutHome.setTopPadding(0);
+            mHomePagerContainer.setPadding(0, 0, 0, 0);
             if (mBrowserToolbar != null) {
                 mBrowserToolbar.scrollTo(0, 0);
             }
         }
 
         refreshToolbarHeight();
     }
 
@@ -604,17 +636,18 @@ abstract public class BrowserApp extends
     }
 
     private boolean isAboutHome(Tab tab) {
         return TextUtils.equals(ABOUT_HOME, tab.getURL());
     }
 
     @Override
     public boolean onSearchRequested() {
-        return showAwesomebar(AwesomeBar.Target.CURRENT_TAB);
+        enterEditingMode();
+        return true;
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         final int itemId = item.getItemId();
         if (itemId == R.id.pasteandgo) {
             String text = Clipboard.getText();
             if (!TextUtils.isEmpty(text)) {
@@ -626,17 +659,17 @@ abstract public class BrowserApp extends
         if (itemId == R.id.site_settings) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Permissions:Get", null));
             return true;
         }
 
         if (itemId == R.id.paste) {
             String text = Clipboard.getText();
             if (!TextUtils.isEmpty(text)) {
-                showAwesomebar(AwesomeBar.Target.CURRENT_TAB, text);
+                enterEditingMode(text);
             }
             return true;
         }
 
         if (itemId == R.id.share) {
             shareCurrentUrl();
             return true;
         }
@@ -685,51 +718,16 @@ abstract public class BrowserApp extends
                 });
             }
             return true;
         }
 
         return false;
     }
 
-    public boolean showAwesomebar(AwesomeBar.Target aTarget) {
-        return showAwesomebar(aTarget, null);
-    }
-
-    public boolean showAwesomebar(AwesomeBar.Target aTarget, String aUrl) {
-        Intent intent = new Intent(getBaseContext(), AwesomeBar.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
-        intent.putExtra(AwesomeBar.TARGET_KEY, aTarget.name());
-
-        // If we were passed in a URL, show it.
-        if (aUrl != null && !TextUtils.isEmpty(aUrl)) {
-            intent.putExtra(AwesomeBar.CURRENT_URL_KEY, aUrl);
-        } else if (aTarget == AwesomeBar.Target.CURRENT_TAB) {
-            // Otherwise, if we're editing the current tab, show its URL.
-            Tab tab = Tabs.getInstance().getSelectedTab();
-            if (tab != null) {
-                // Check to see if there's a user-entered search term, which we save
-                // whenever the user performs a search.
-                aUrl = tab.getUserSearch();
-                if (TextUtils.isEmpty(aUrl)) {
-                    aUrl = tab.getURL();
-                }
-                if (aUrl != null) {
-                    intent.putExtra(AwesomeBar.CURRENT_URL_KEY, aUrl);
-                }
-            }
-        }
-
-        int requestCode = GeckoAppShell.sActivityHelper.makeRequestCodeForAwesomebar();
-        startActivityForResult(intent, requestCode);
-        overridePendingTransition (R.anim.awesomebar_fade_in, R.anim.awesomebar_hold_still);
-        return true;
-    }
-
-
     @Override
     public void setAccessibilityEnabled(boolean enabled) {
         if (mAccessibilityEnabled == enabled) {
             return;
         }
 
         // Disable the dynamic toolbar when accessibility features are enabled,
         // and re-read the preference when they're disabled.
@@ -771,16 +769,17 @@ abstract public class BrowserApp extends
         unregisterEventListener("CharEncoding:Data");
         unregisterEventListener("CharEncoding:State");
         unregisterEventListener("Feedback:LastUrl");
         unregisterEventListener("Feedback:OpenPlayStore");
         unregisterEventListener("Feedback:MaybeLater");
         unregisterEventListener("Telemetry:Gather");
         unregisterEventListener("Settings:Show");
         unregisterEventListener("Updater:Launch");
+        unregisterEventListener("Reader:GoToReadingList");
 
         if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 14) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
             if (nfc != null) {
                 // null this out even though the docs say it's not needed,
                 // because the source code looks like it will only do this
                 // automatically on API 14+
                 nfc.setNdefPushMessageCallback(null, this);
@@ -838,17 +837,17 @@ abstract public class BrowserApp extends
 
     private void setToolbarMargin(int margin) {
         ((RelativeLayout.LayoutParams) mGeckoLayout.getLayoutParams()).topMargin = margin;
         mGeckoLayout.requestLayout();
     }
 
     @Override
     public void onMetricsChanged(ImmutableViewportMetrics aMetrics) {
-        if (mAboutHome.getUserVisibleHint() || mBrowserToolbar == null) {
+        if (mHomePager.isVisible() || mBrowserToolbar == null) {
             return;
         }
 
         // If the page has shrunk so that the toolbar no longer scrolls, make
         // sure the toolbar is visible.
         if (aMetrics.getPageHeight() <= aMetrics.getHeight()) {
             if (mDynamicToolbarCanScroll) {
                 mDynamicToolbarCanScroll = false;
@@ -873,17 +872,17 @@ abstract public class BrowserApp extends
         });
 
         if (mFormAssistPopup != null)
             mFormAssistPopup.onMetricsChanged(aMetrics);
     }
 
     @Override
     public void onPanZoomStopped() {
-        if (!isDynamicToolbarEnabled() || mAboutHome.getUserVisibleHint()) {
+        if (!isDynamicToolbarEnabled() || mHomePager.isVisible()) {
             return;
         }
 
         // Make sure the toolbar is fully hidden or fully shown when the user
         // lifts their finger. If the page is shorter than the viewport, the
         // toolbar is always shown.
         ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
         if (metrics.getPageHeight() < metrics.getHeight()
@@ -895,22 +894,29 @@ abstract public class BrowserApp extends
     }
 
     public void refreshToolbarHeight() {
         int height = 0;
         if (mBrowserToolbar != null) {
             height = mBrowserToolbar.getHeight();
         }
 
-        if (!isDynamicToolbarEnabled()) {
+        if (!isDynamicToolbarEnabled() || mHomePager.isVisible()) {
             // Use aVisibleHeight here so that when the dynamic toolbar is
             // enabled, the padding will animate with the toolbar becoming
             // visible.
-            setToolbarMargin(height);
-            height = 0;
+            if (isDynamicToolbarEnabled()) {
+                // When the dynamic toolbar is enabled, set the padding on the
+                // about:home widget directly - this is to avoid resizing the
+                // LayerView, which can cause visible artifacts.
+                mHomePagerContainer.setPadding(0, height, 0, 0);
+            } else {
+                setToolbarMargin(height);
+                height = 0;
+            }
         } else {
             setToolbarMargin(0);
         }
 
         if (mLayerView != null && height != mToolbarHeight) {
             mToolbarHeight = height;
             mLayerView.getLayerMarginsAnimator().setMaxMargins(0, height, 0, 0);
             mLayerView.getLayerMarginsAnimator().showMargins(true);
@@ -952,47 +958,21 @@ abstract public class BrowserApp extends
         invalidateOptionsMenu();
         updateSideBarState();
         mTabsPanel.refresh();
         if (mSiteIdentityPopup != null) {
             mSiteIdentityPopup.dismiss();
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        if (mSiteIdentityPopup != null && mSiteIdentityPopup.isShowing()) {
-            mSiteIdentityPopup.dismiss();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        String url = null;
-
-        // Don't update the url in the toolbar if the activity was cancelled.
-        if (resultCode == Activity.RESULT_OK && data != null) {
-            // Don't update the url if the activity was launched to pick a site.
-            String targetKey = data.getStringExtra(AwesomeBar.TARGET_KEY);
-            if (!AwesomeBar.Target.PICK_SITE.toString().equals(targetKey)) {
-                // Update the toolbar with the url that was just entered.
-                url = data.getStringExtra(AwesomeBar.URL_KEY);
-            }
-        }
-
-        // We always need to call fromAwesomeBarSearch to perform the toolbar animation.
-        mBrowserToolbar.fromAwesomeBarSearch(url);
-
-        // Trigger any tab-related events after we start restoring
-        // the toolbar state above to make ensure animations happen
-        // on the correct order.
-        super.onActivityResult(requestCode, resultCode, data);
+    public View getActionBarLayout() {
+        RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar, null);
+        actionBar.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,
+                                                                  (int) getResources().getDimension(R.dimen.browser_toolbar_height)));
+        return actionBar;
     }
 
     @Override
     public boolean hasTabsSideBar() {
         return (mTabsPanel != null && mTabsPanel.isSideBar());
     }
 
     private void updateSideBarState() {
@@ -1150,33 +1130,35 @@ abstract public class BrowserApp extends
                 if (!message.isNull(GeckoPreferences.INTENT_EXTRA_RESOURCES)) {
                     resource = message.getString(GeckoPreferences.INTENT_EXTRA_RESOURCES);
                 }
                 Intent settingsIntent = new Intent(this, GeckoPreferences.class);
                 GeckoPreferences.setResourceToOpen(settingsIntent, resource);
                 startActivity(settingsIntent);
             } else if (event.equals("Updater:Launch")) {
                 handleUpdaterLaunch();
+            } else if (event.equals("Reader:GoToReadingList")) {
+                openReadingList();
             } else if (event.equals("Prompt:ShowTop")) {
                 // Bring this activity to front so the prompt is visible..
                 Intent bringToFrontIntent = new Intent();
                 bringToFrontIntent.setClassName(AppConstants.ANDROID_PACKAGE_NAME, AppConstants.BROWSER_INTENT_CLASS);
                 bringToFrontIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
                 startActivity(bringToFrontIntent);
             } else {
                 super.handleMessage(event, message);
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
     }
 
     @Override
     public void addTab() {
-        showAwesomebar(AwesomeBar.Target.NEW_TAB);
+        Tabs.getInstance().loadUrl("about:home", Tabs.LOADURL_NEW_TAB);
     }
 
     @Override
     public void addPrivateTab() {
         Tabs.getInstance().loadUrl("about:privatebrowsing", Tabs.LOADURL_NEW_TAB | Tabs.LOADURL_PRIVATE);
     }
 
     @Override
@@ -1229,17 +1211,17 @@ abstract public class BrowserApp extends
             mMainLayoutAnimator.stop(false);
         }
 
         if (areTabsShown()) {
             mTabsPanel.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
         }
 
         mMainLayoutAnimator = new PropertyAnimator(animationLength, sTabsInterpolator);
-        mMainLayoutAnimator.setPropertyAnimationListener(this);
+        mMainLayoutAnimator.addPropertyAnimationListener(this);
 
         if (hasTabsSideBar()) {
             mMainLayoutAnimator.attach(mMainLayout,
                                        PropertyAnimator.Property.SCROLL_X,
                                        -width);
         } else {
             mMainLayoutAnimator.attach(mMainLayout,
                                        PropertyAnimator.Property.SCROLL_Y,
@@ -1279,17 +1261,76 @@ abstract public class BrowserApp extends
         mMainLayoutAnimator = null;
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         mToast.onSaveInstanceState(outState);
         outState.putBoolean(STATE_DYNAMIC_TOOLBAR_ENABLED, mDynamicToolbarEnabled);
-        outState.putInt(STATE_ABOUT_HOME_TOP_PADDING, mAboutHome.getTopPadding());
+        outState.putInt(STATE_ABOUT_HOME_TOP_PADDING, mHomePagerContainer.getPaddingTop());
+    }
+
+    /**
+     * Attempts to switch to an open tab with the given URL.
+     *
+     * @return true if we successfully switched to a tab, false otherwise.
+     */
+    private boolean maybeSwitchToTab(String url, EnumSet<OnUrlOpenListener.Flags> flags) {
+        if (!flags.contains(OnUrlOpenListener.Flags.ALLOW_SWITCH_TO_TAB)) {
+            return false;
+        }
+
+        final Tabs tabs = Tabs.getInstance();
+        final int tabId = tabs.getTabIdForUrl(url);
+        if (tabId < 0) {
+            return false;
+        }
+
+        // If this tab is already selected, just hide the home pager.
+        if (tabs.isSelectedTab(tabs.getTab(tabId))) {
+            hideHomePager();
+        } else {
+            tabs.selectTab(tabId);
+        }
+
+        hideBrowserSearch();
+        mBrowserToolbar.cancelEdit();
+
+        return true;
+    }
+
+    private void openUrl(String url) {
+        openUrl(url, null, false);
+    }
+
+    private void openUrl(String url, boolean newTab) {
+        openUrl(url, null, newTab);
+    }
+
+    private void openUrl(String url, String searchEngine) {
+        openUrl(url, searchEngine, false);
+    }
+
+    private void openUrl(String url, String searchEngine, boolean newTab) {
+        mBrowserToolbar.setProgressVisibility(true);
+
+        int flags = Tabs.LOADURL_NONE;
+        if (newTab) {
+            flags |= Tabs.LOADURL_NEW_TAB;
+        }
+
+        Tabs.getInstance().loadUrl(url, searchEngine, -1, flags);
+
+        hideBrowserSearch();
+        mBrowserToolbar.cancelEdit();
+    }
+
+    private void openReadingList() {
+        Tabs.getInstance().loadUrl(ABOUT_HOME, Tabs.LOADURL_READING_LIST);
     }
 
     /* Favicon methods */
     private void loadFavicon(final Tab tab) {
         maybeCancelFaviconLoad(tab);
 
         int flags = Favicons.FLAG_SCALE | ( (tab.isPrivate() || tab.getErrorType() != Tab.ErrorType.NONE) ? 0 : Favicons.FLAG_PERSIST);
         long id = Favicons.getInstance().loadFavicon(tab.getURL(), tab.getFaviconURL(), flags,
@@ -1325,67 +1366,157 @@ abstract public class BrowserApp extends
 
         // Cancel pending favicon load task
         Favicons.getInstance().cancelFaviconLoad(faviconLoadId);
 
         // Reset favicon load state
         tab.setFaviconLoadId(Favicons.NOT_LOADING);
     }
 
+    private void enterEditingMode() {
+        String url = null;
 
-    /* About:home UI */
-    void updateAboutHomeTopSites() {
-        mAboutHome.update(EnumSet.of(AboutHome.UpdateFlags.TOP_SITES));
+        final Tab tab = Tabs.getInstance().getSelectedTab();
+        if (tab != null) {
+            final String userSearch = tab.getUserSearch();
+
+            // Check to see if there's a user-entered search term,
+            // which we save whenever the user performs a search.
+            url = (TextUtils.isEmpty(userSearch) ? tab.getURL() : userSearch);
+        }
+
+        enterEditingMode(url);
+    }
+
+    /**
+     * Enters editing mode for the current tab. This method will
+     * always open the VISITED page on about:home.
+     */
+    private void enterEditingMode(String url) {
+        if (url == null) {
+            throw new IllegalArgumentException("Cannot handle null URLs in enterEditingMode");
+        }
+
+        final PropertyAnimator animator = new PropertyAnimator(250);
+        animator.setUseHardwareLayer(false);
+
+        mBrowserToolbar.startEditing(url, animator);
+        showHomePagerWithAnimator(HomePager.Page.HISTORY, animator);
+
+        animator.start();
     }
 
-    private void showAboutHome() {
-        if (mAboutHome.getUserVisibleHint()) {
+    void commitEditingMode() {
+        if (!mBrowserToolbar.isEditing()) {
+            return;
+        }
+
+        final String url = mBrowserToolbar.commitEdit();
+        animateHideHomePager();
+        hideBrowserSearch();
+
+        if (!TextUtils.isEmpty(url)) {
+            Tabs.getInstance().loadUrl(url, Tabs.LOADURL_USER_ENTERED);
+        }
+    }
+
+    boolean dismissEditingMode() {
+        if (!mBrowserToolbar.isEditing()) {
+            return false;
+        }
+
+        mBrowserToolbar.cancelEdit();
+        animateHideHomePager();
+        hideBrowserSearch();
+
+        return true;
+    }
+
+    void filterEditingMode(String searchTerm, AutocompleteHandler handler) {
+        if (TextUtils.isEmpty(searchTerm)) {
+            hideBrowserSearch();
+        } else {
+            showBrowserSearch();
+            mBrowserSearch.filter(searchTerm, handler);
+        }
+    }
+
+    private void showHomePager(HomePager.Page page) {
+        showHomePagerWithAnimator(page, null);
+    }
+
+    private void showHomePagerWithAnimator(HomePager.Page page, PropertyAnimator animator) {
+        if (mHomePager.isVisible()) {
             return;
         }
 
         // Refresh toolbar height to possibly restore the toolbar padding
         refreshToolbarHeight();
 
         // Show the toolbar before hiding about:home so the
         // onMetricsChanged callback still works.
         if (isDynamicToolbarEnabled() && mLayerView != null) {
             mLayerView.getLayerMarginsAnimator().showMargins(true);
         }
 
-        // We use commitAllowingStateLoss() instead of commit() here to avoid an
-        // IllegalStateException. showAboutHome() and hideAboutHome() are
-        // executed inside of tab's onChange() callback. Since that callback can
-        // be triggered asynchronously from Gecko, it's possible that this
-        // method can be called while Fennec is in the background. If that
-        // happens, using commit() would throw an IllegalStateException since
-        // it can't be used between the Activity's onSaveInstanceState() and
-        // onResume().
-        getSupportFragmentManager().beginTransaction()
-                .add(R.id.gecko_layout, mAboutHome, ABOUTHOME_TAG).commitAllowingStateLoss();
-        mAboutHome.setUserVisibleHint(true);
+        mHomePager.show(getSupportFragmentManager(), page, animator);
+    }
 
-        mBrowserToolbar.setNextFocusDownId(R.id.abouthome_content);
+    private void animateHideHomePager() {
+        hideHomePagerWithAnimation(true);
     }
 
-    private void hideAboutHome() {
-        if (!mAboutHome.getUserVisibleHint()) {
+    private void hideHomePager() {
+        hideHomePagerWithAnimation(false);
+    }
+
+    private void hideHomePagerWithAnimation(boolean animate) {
+        if (!mHomePager.isVisible()) {
             return;
         }
 
-        getSupportFragmentManager().beginTransaction()
-                .remove(mAboutHome).commitAllowingStateLoss();
-        mAboutHome.setUserVisibleHint(false);
+        final Tab tab = Tabs.getInstance().getSelectedTab();
+        if (tab != null && isAboutHome(tab)) {
+            return;
+        }
+
+        // FIXME: do animation if animate is true
+        mHomePager.hide();
 
         mBrowserToolbar.setShadowVisibility(true);
         mBrowserToolbar.setNextFocusDownId(R.id.layer_view);
 
         // Refresh toolbar height to possibly restore the toolbar padding
         refreshToolbarHeight();
     }
 
+    private void showBrowserSearch() {
+        if (mBrowserSearch.getUserVisibleHint()) {
+            return;
+        }
+
+        mBrowserSearchContainer.setVisibility(View.VISIBLE);
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss();
+        mBrowserSearch.setUserVisibleHint(true);
+    }
+
+    private void hideBrowserSearch() {
+        if (!mBrowserSearch.getUserVisibleHint()) {
+            return;
+        }
+
+        mBrowserSearchContainer.setVisibility(View.INVISIBLE);
+
+        getSupportFragmentManager().beginTransaction()
+                .remove(mBrowserSearch).commitAllowingStateLoss();
+        mBrowserSearch.setUserVisibleHint(false);
+    }
+
     private class HideTabsTouchListener implements TouchEventInterceptor {
         private boolean mIsHidingTabs = false;
 
         @Override
         public boolean onInterceptTouchEvent(View view, MotionEvent event) {
             // We need to account for scroll state for the touched view otherwise
             // tapping on an "empty" part of the view will still be considered a
             // valid touch event.
@@ -1989,25 +2120,42 @@ abstract public class BrowserApp extends
             public void onPostExecute(String url) {
                 // Don't bother sending a message if there is no URL.
                 if (url.length() > 0)
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Feedback:LastUrl", url));
             }
         }).execute();
     }
 
+    // HomePager.OnNewTabsListener
     @Override
-    public void onAboutHomeUriLoad(String url) {
-        mBrowserToolbar.setProgressVisibility(true);
-        Tabs.getInstance().loadUrl(url);
+    public void onNewTabs(String[] urls) {
+        for (String url : urls) {
+            openUrl(url, true);
+        }
     }
 
+    // HomePager.OnUrlOpenListener
     @Override
-    public void onAboutHomeLoadComplete() {
-        mAboutHomeStartupTimer.stop();
+    public void onUrlOpen(String url, EnumSet<OnUrlOpenListener.Flags> flags) {
+        if (!maybeSwitchToTab(url, flags)) {
+            openUrl(url);
+        }
+    }
+
+    // BrowserSearch.OnSearchListener
+    @Override
+    public void onSearch(String engineId, String text) {
+        openUrl(text, engineId);
+    }
+
+    // BrowserSearch.OnEditSuggestionListener
+    @Override
+    public void onEditSuggestion(String suggestion) {
+        mBrowserToolbar.onEditSuggestion(suggestion);
     }
 
     @Override
     public int getLayout() { return R.layout.gecko_app; }
 
     @Override
     protected String getDefaultProfileName() {
         String profile = GeckoProfile.findDefaultProfile(this);

--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -4,16 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.menu.MenuPopup;
 import org.mozilla.gecko.PageActionLayout;
 import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
@@ -29,95 +30,135 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Build;
 import android.os.SystemClock;
 import android.text.style.ForegroundColorSpan;
+import android.text.Editable;
+import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.Window;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Interpolator;
 import android.view.animation.TranslateAnimation;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 import android.widget.ViewSwitcher;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class BrowserToolbar extends GeckoRelativeLayout
-                            implements Tabs.OnTabsChangedListener,
+                            implements TextWatcher,
+                                       AutocompleteHandler,
+                                       Tabs.OnTabsChangedListener,
                                        GeckoMenu.ActionItemBarPresenter,
                                        Animation.AnimationListener,
                                        GeckoEventListener {
     private static final String LOGTAG = "GeckoToolbar";
     public static final String PREF_TITLEBAR_MODE = "browser.chrome.titlebarMode";
+
+    public interface OnActivateListener {
+        public void onActivate();
+    }
+
+    public interface OnCommitListener {
+        public void onCommit();
+    }
+
+    public interface OnDismissListener {
+        public void onDismiss();
+    }
+
+    public interface OnFilterListener {
+        public void onFilter(String searchText, AutocompleteHandler handler);
+    }
+
     private LayoutParams mAwesomeBarParams;
     private View mUrlDisplayContainer;
-    private View mAwesomeBarEntry;
-    private ImageView mAwesomeBarRightEdge;
-    private BrowserToolbarBackground mAddressBarBg;
+    private View mUrlEditContainer;
+    private CustomEditText mUrlEditText;
+    private View mUrlBarEntry;
+    private ImageView mUrlBarRightEdge;
+    private BrowserToolbarBackground mUrlBarBackground;
     private GeckoTextView mTitle;
     private int mTitlePadding;
     private boolean mSiteSecurityVisible;
     private boolean mSwitchingTabs;
     private ShapedButton mTabs;
     private ImageButton mBack;
     private ImageButton mForward;
     public ImageButton mFavicon;
     public ImageButton mStop;
     public ImageButton mSiteSecurity;
+    public ImageButton mGo;
     public PageActionLayout mPageActionLayout;
     private Animation mProgressSpinner;
     private TabCounter mTabsCounter;
     private ImageView mShadow;
     private GeckoImageButton mMenu;
     private GeckoImageView mMenuIcon;
     private LinearLayout mActionItemBar;
     private MenuPopup mMenuPopup;
     private List<? extends View> mFocusOrder;
+    private OnActivateListener mActivateListener;
+    private OnCommitListener mCommitListener;
+    private OnDismissListener mDismissListener;
+    private OnFilterListener mFilterListener;
 
     final private BrowserApp mActivity;
     private boolean mHasSoftMenuButton;
 
     private boolean mShowSiteSecurity;
     private boolean mShowReader;
     private boolean mSpinnerVisible;
 
+    private boolean mDelayRestartInput;
+    // The previous autocomplete result returned to us
+    private String mAutoCompleteResult = "";
+    // The user typed part of the autocomplete result
+    private String mAutoCompletePrefix = null;
+
+    private boolean mIsEditing;
     private boolean mAnimatingEntry;
 
     private AlphaAnimation mLockFadeIn;
     private TranslateAnimation mTitleSlideLeft;
     private TranslateAnimation mTitleSlideRight;
 
-    private int mAddressBarViewOffset;
+    private int mUrlBarViewOffset;
     private int mDefaultForwardMargin;
     private PropertyAnimator mForwardAnim = null;
 
     private int mFaviconSize;
 
     private PropertyAnimator mVisibilityAnimator;
     private static final Interpolator sButtonsInterpolator = new AccelerateInterpolator();
 
@@ -145,16 +186,17 @@ public class BrowserToolbar extends Geck
         mActivity = (BrowserApp) context;
 
         // Inflate the content.
         LayoutInflater.from(context).inflate(R.layout.browser_toolbar, this);
 
         Tabs.registerOnTabsChangedListener(this);
         mSwitchingTabs = true;
 
+        mIsEditing = false;
         mAnimatingEntry = false;
         mShowUrl = false;
 
         // listen to the title bar pref.
         mPrefObserverId = PrefsHelper.getPref(PREF_TITLEBAR_MODE, new PrefsHelper.PrefHandlerBase() {
             @Override
             public void prefValue(String pref, String str) {
                 int value = Integer.parseInt(str);
@@ -190,29 +232,32 @@ public class BrowserToolbar extends Geck
         registerEventListener("Reader:Click");
         registerEventListener("Reader:LongClick");
 
         mShowSiteSecurity = false;
         mShowReader = false;
 
         mAnimatingEntry = false;
 
-        mAddressBarBg = (BrowserToolbarBackground) findViewById(R.id.address_bar_bg);
-        mAddressBarViewOffset = res.getDimensionPixelSize(R.dimen.addressbar_offset_left);
+        mUrlBarBackground = (BrowserToolbarBackground) findViewById(R.id.url_bar_bg);
+        mUrlBarViewOffset = res.getDimensionPixelSize(R.dimen.url_bar_offset_left);
         mDefaultForwardMargin = res.getDimensionPixelSize(R.dimen.forward_default_offset);
-        mUrlDisplayContainer = findViewById(R.id.awesome_bar_display_container);
-        mAwesomeBarEntry = findViewById(R.id.awesome_bar_entry);
+        mUrlDisplayContainer = findViewById(R.id.url_display_container);
+        mUrlBarEntry = findViewById(R.id.url_bar_entry);
+
+        mUrlEditContainer = findViewById(R.id.url_edit_container);
+        mUrlEditText = (CustomEditText) findViewById(R.id.url_edit_text);
 
         // This will clip the right edge's image at half of its width
-        mAwesomeBarRightEdge = (ImageView) findViewById(R.id.awesome_bar_right_edge);
-        if (mAwesomeBarRightEdge != null) {
-            mAwesomeBarRightEdge.getDrawable().setLevel(5000);
+        mUrlBarRightEdge = (ImageView) findViewById(R.id.url_bar_right_edge);
+        if (mUrlBarRightEdge != null) {
+            mUrlBarRightEdge.getDrawable().setLevel(5000);
         }
 
-        mTitle = (GeckoTextView) findViewById(R.id.awesome_bar_title);
+        mTitle = (GeckoTextView) findViewById(R.id.url_bar_title);
         mTitlePadding = mTitle.getPaddingRight();
 
         mTabs = (ShapedButton) findViewById(R.id.tabs);
         mTabsCounter = (TabCounter) findViewById(R.id.tabs_counter);
         mBack = (ImageButton) findViewById(R.id.back);
         mForward = (ImageButton) findViewById(R.id.forward);
         mForward.setEnabled(false); // initialize the forward button to not be enabled
 
@@ -253,24 +298,30 @@ public class BrowserToolbar extends Geck
 
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
 
         setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mActivity.autoHideTabs();
-                onAwesomeBarSearch();
+                if (mActivateListener != null) {
+                    mActivateListener.onActivate();
+                }
             }
         });
 
         setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
             @Override
             public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+                // We don't the context menu while editing
+                if (isEditing()) {
+                    return;
+                }
+
                 MenuInflater inflater = mActivity.getMenuInflater();
                 inflater.inflate(R.menu.titlebar_contextmenu, menu);
 
                 String clipboard = Clipboard.getText();
                 if (TextUtils.isEmpty(clipboard)) {
                     menu.findItem(R.id.pasteandgo).setVisible(false);
                     menu.findItem(R.id.paste).setVisible(false);
                 }
@@ -291,16 +342,106 @@ public class BrowserToolbar extends Geck
                     menu.findItem(R.id.copyurl).setVisible(false);
                     menu.findItem(R.id.share).setVisible(false);
                     menu.findItem(R.id.add_to_launcher).setVisible(false);
                     menu.findItem(R.id.subscribe).setVisible(false);
                 }
             }
         });
 
+        mUrlEditText.addTextChangedListener(this);
+
+        mUrlEditText.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 edit text has a composition string, don't submit the text yet.
+                    // ENTER is needed to commit the composition string.
+                    Editable content = mUrlEditText.getText();
+                    if (!hasCompositionString(content)) {
+                        if (mCommitListener != null) {
+                            mCommitListener.onCommit();
+                        }
+                        return true;
+                    }
+                }
+
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    clearFocus();
+                    return true;
+                }
+
+                return false;
+            }
+        });
+
+        mUrlEditText.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER || GamepadUtils.isActionKey(event)) {
+                    if (event.getAction() != KeyEvent.ACTION_DOWN)
+                        return true;
+
+                    if (mCommitListener != null) {
+                        mCommitListener.onCommit();
+                    }
+                    return true;
+                } else if (GamepadUtils.isBackKey(event)) {
+                    if (mDismissListener != null) {
+                        mDismissListener.onDismiss();
+                    }
+                    return true;
+                }
+
+                return false;
+            }
+        });
+
+        mUrlEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (v == null) {
+                    return;
+                }
+
+                setSelected(hasFocus);
+                if (hasFocus) {
+                    return;
+                }
+
+                InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                try {
+                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+                } catch (NullPointerException e) {
+                    Log.e(LOGTAG, "InputMethodManagerService, why are you throwing"
+                                  + " a NullPointerException? See bug 782096", e);
+                }
+            }
+        });
+
+        mUrlEditText.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (Build.VERSION.SDK_INT >= 11) {
+                    CustomEditText text = (CustomEditText) v;
+
+                    if (text.getSelectionStart() == text.getSelectionEnd())
+                        return false;
+
+                    return false;
+                }
+
+                return false;
+            }
+        });
+
         mTabs.setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
                 toggleTabs();
             }
         });
         mTabs.setImageLevel(0);
 
@@ -355,16 +496,27 @@ public class BrowserToolbar extends Geck
             public void onClick(View v) {
                 Tab tab = Tabs.getInstance().getSelectedTab();
                 if (tab != null)
                     tab.doStop();
                 setProgressVisibility(false);
             }
         });
 
+        mGo = (ImageButton) findViewById(R.id.go);
+        mGo.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mCommitListener != null) {
+                    mCommitListener.onCommit();
+                }
+            }
+        });
+
+        mShadow = (ImageView) findViewById(R.id.shadow);
         mShadow.setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
             }
         });
 
         float slideWidth = getResources().getDimension(R.dimen.browser_toolbar_lock_width);
 
@@ -411,16 +563,64 @@ public class BrowserToolbar extends Geck
                     Rect bounds = new Rect(0, 0, tail, height);
                     TailTouchDelegate delegate = new TailTouchDelegate(bounds, mShadow);
                     mTabs.setTouchDelegate(delegate);
                 }
             });
         }
     }
 
+    public boolean onKey(int keyCode, KeyEvent event) {
+        if (event.getAction() != KeyEvent.ACTION_DOWN) {
+            return false;
+        }
+
+        // Galaxy Note sends key events for the stylus that are outside of the
+        // valid keyCode range (see bug 758427)
+        if (keyCode > KeyEvent.getMaxKeyCode()) {
+            return true;
+        }
+
+        // This method is called only if the key event was not handled
+        // by any of the views, which usually means the edit box lost focus
+        if (keyCode == KeyEvent.KEYCODE_BACK ||
+            keyCode == KeyEvent.KEYCODE_MENU ||
+            keyCode == KeyEvent.KEYCODE_DPAD_UP ||
+            keyCode == KeyEvent.KEYCODE_DPAD_DOWN ||
+            keyCode == KeyEvent.KEYCODE_DPAD_LEFT ||
+            keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ||
+            keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
+            keyCode == KeyEvent.KEYCODE_DEL ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            return false;
+        } else if (isEditing()) {
+            final int prevSelStart = mUrlEditText.getSelectionStart();
+            final int prevSelEnd = mUrlEditText.getSelectionEnd();
+
+            // Manually dispatch the key event to the edit text. If selection changed as
+            // a result of the key event, then give focus back to mUrlEditText
+            mUrlEditText.dispatchKeyEvent(event);
+
+            final int curSelStart = mUrlEditText.getSelectionStart();
+            final int curSelEnd = mUrlEditText.getSelectionEnd();
+
+            if (prevSelStart != curSelStart || prevSelEnd != curSelEnd) {
+                mUrlEditText.requestFocusFromTouch();
+
+                // Restore the selection, which gets lost due to the focus switch
+                mUrlEditText.setSelection(curSelStart, curSelEnd);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         // If the motion event has occured below the toolbar (due to the scroll
         // offset), let it pass through to the page.
         if (event != null && event.getY() > getHeight() - getScrollY()) {
             return false;
         }
 
@@ -510,16 +710,88 @@ public class BrowserToolbar extends Geck
             case READER_ENABLED:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     setPageActionVisibility(mStop.getVisibility() == View.VISIBLE);
                 }
                 break;
         }
     }
 
+    // Return early if we're backspacing through the string, or
+    // have no autocomplete results
+    @Override
+    public void onAutocomplete(final String result) {
+        final String text = mUrlEditText.getText().toString();
+
+        if (result == null) {
+            mAutoCompleteResult = "";
+            return;
+        }
+
+        if (!result.startsWith(text) || text.equals(result)) {
+            return;
+        }
+
+        mAutoCompleteResult = result;
+        mUrlEditText.getText().append(result.substring(text.length()));
+        mUrlEditText.setSelection(text.length(), result.length());
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+        final String text = s.toString();
+        boolean useHandler = false;
+        boolean reuseAutocomplete = false;
+        if (!hasCompositionString(s) && !StringUtils.isSearchQuery(text, false)) {
+            useHandler = true;
+
+            // If you're hitting backspace (the string is getting smaller
+            // or is unchanged), don't autocomplete.
+            if (mAutoCompletePrefix != null && (mAutoCompletePrefix.length() >= text.length())) {
+                useHandler = false;
+            } else if (mAutoCompleteResult != null && mAutoCompleteResult.startsWith(text)) {
+                // If this text already matches our autocomplete text, autocomplete likely
+                // won't change. Just reuse the old autocomplete value.
+                useHandler = false;
+                reuseAutocomplete = true;
+            }
+        }
+
+        // If this is the autocomplete text being set, don't run the filter.
+        if (TextUtils.isEmpty(mAutoCompleteResult) || !mAutoCompleteResult.equals(text)) {
+            if (isEditing() && mFilterListener != null) {
+                mFilterListener.onFilter(text, useHandler ? this : null);
+            }
+            mAutoCompletePrefix = text;
+
+            if (reuseAutocomplete) {
+                onAutocomplete(mAutoCompleteResult);
+            }
+        }
+
+        // If the edit text has a composition string, don't call updateGoButton().
+        // That method resets IME and composition state will be broken.
+        if (!hasCompositionString(s) ||
+            InputMethods.isGestureKeyboard(mUrlEditText.getContext())) {
+            updateGoButton(text);
+        }
+    }
+
+    @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
+    }
+
     public boolean isVisible() {
         return getScrollY() == 0;
     }
 
     public void setNextFocusDownId(int nextId) {
         super.setNextFocusDownId(nextId);
         mTabs.setNextFocusDownId(nextId);
         mBack.setNextFocusDownId(nextId);
@@ -554,200 +826,35 @@ public class BrowserToolbar extends Geck
 
     @Override
     public void onAnimationEnd(Animation animation) {
         if (animation.equals(mTitleSlideRight)) {
             mSiteSecurity.startAnimation(mLockFadeIn);
         }
     }
 
-    private int getAwesomeBarEntryTranslation() {
-        return getWidth() - mAwesomeBarEntry.getRight();
+    private int getUrlBarEntryTranslation() {
+        return getWidth() - mUrlBarEntry.getRight();
     }
 
-    private int getAwesomeBarCurveTranslation() {
+    private int getUrlBarCurveTranslation() {
         return getWidth() - mTabs.getLeft();
     }
 
-    public void fromAwesomeBarSearch(String url) {
-        // Update the title with the url that was just entered. Don't update the title if
-        // the AwesomeBar activity was cancelled, or if the user entered an empty string.
-        if (url != null && url.length() > 0) {
-            setTitle(url);
-        }
-
-        if (HardwareUtils.isTablet() || Build.VERSION.SDK_INT < 11) {
-            return;
-        }
-
-        // If the awesomebar entry is not selected at this point, this means that
-        // we had to reinflate the toolbar layout for some reason (device rotation
-        // while in awesome screen, activity was killed in background, etc). In this
-        // case, we have to ensure the toolbar is in the correct initial state to
-        // shrink back.
-        if (!isSelected()) {
-            // Keep the entry highlighted during the animation
-            setSelected(true);
-
-            final int entryTranslation = getAwesomeBarEntryTranslation();
-            final int curveTranslation = getAwesomeBarCurveTranslation();
-
-            if (mAwesomeBarRightEdge != null) {
-                ViewHelper.setTranslationX(mAwesomeBarRightEdge, entryTranslation);
-            }
-
-            ViewHelper.setTranslationX(mTabs, curveTranslation);
-            ViewHelper.setTranslationX(mTabsCounter, curveTranslation);
-            ViewHelper.setTranslationX(mActionItemBar, curveTranslation);
-
-            if (mHasSoftMenuButton) {
-                ViewHelper.setTranslationX(mMenu, curveTranslation);
-                ViewHelper.setTranslationX(mMenuIcon, curveTranslation);
-            }
-
-            ViewHelper.setAlpha(mPageActionLayout, 0);
-            ViewHelper.setAlpha(mStop, 0);
-        }
-
-        final PropertyAnimator contentAnimator = new PropertyAnimator(250);
-        contentAnimator.setUseHardwareLayer(false);
-
-        // Shrink the awesome entry back to its original size
-
-        if (mAwesomeBarRightEdge != null) {
-            contentAnimator.attach(mAwesomeBarRightEdge,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-        }
-
-        contentAnimator.attach(mTabs,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-        contentAnimator.attach(mTabsCounter,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-        contentAnimator.attach(mActionItemBar,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-
-        if (mHasSoftMenuButton) {
-            contentAnimator.attach(mMenu,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-            contentAnimator.attach(mMenuIcon,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-        }
-
-        contentAnimator.setPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
-            @Override
-            public void onPropertyAnimationStart() {
+    private static boolean hasCompositionString(Editable content) {
+        Object[] spans = content.getSpans(0, content.length(), Object.class);
+        if (spans != null) {
+            for (Object span : spans) {
+                if ((content.getSpanFlags(span) & Spanned.SPAN_COMPOSING) != 0) {
+                    // Found composition string.
+                    return true;
+                }
             }
-
-            @Override
-            public void onPropertyAnimationEnd() {
-                // Turn off selected state on the entry
-                setSelected(false);
-
-                PropertyAnimator buttonsAnimator = new PropertyAnimator(300);
-
-                // Fade toolbar buttons (reader, stop) after the entry
-                // is schrunk back to its original size.
-                buttonsAnimator.attach(mPageActionLayout,
-                                       PropertyAnimator.Property.ALPHA,
-                                       1);
-                buttonsAnimator.attach(mStop,
-                                       PropertyAnimator.Property.ALPHA,
-                                       1);
-
-                buttonsAnimator.start();
-
-                mAnimatingEntry = false;
-
-                // Trigger animation to update the tabs counter once the
-                // tabs button is back on screen.
-                updateTabCount(Tabs.getInstance().getDisplayCount());
-            }
-        });
-
-        mAnimatingEntry = true;
-
-        postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                contentAnimator.start();
-            }
-        }, 500);
-    }
-
-    private void onAwesomeBarSearch() {
-        // This animation doesn't make much sense in a sidebar UI
-        if (HardwareUtils.isTablet() || Build.VERSION.SDK_INT < 11) {
-            mActivity.onSearchRequested();
-            return;
         }
-
-        if (mAnimatingEntry)
-            return;
-
-        final PropertyAnimator contentAnimator = new PropertyAnimator(250);
-        contentAnimator.setUseHardwareLayer(false);
-
-        final int entryTranslation = getAwesomeBarEntryTranslation();
-        final int curveTranslation = getAwesomeBarCurveTranslation();
-
-        // Keep the entry highlighted during the animation
-        setSelected(true);
-
-        // Hide stop/reader buttons immediately
-        ViewHelper.setAlpha(mPageActionLayout, 0);
-        ViewHelper.setAlpha(mStop, 0);
-
-        // Slide the right side elements of the toolbar
-
-        if (mAwesomeBarRightEdge != null) {
-            contentAnimator.attach(mAwesomeBarRightEdge,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   entryTranslation);
-        }
-
-        contentAnimator.attach(mTabs,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               curveTranslation);
-        contentAnimator.attach(mTabsCounter,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               curveTranslation);
-        contentAnimator.attach(mActionItemBar,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               curveTranslation);
-
-        if (mHasSoftMenuButton) {
-            contentAnimator.attach(mMenu,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   curveTranslation);
-            contentAnimator.attach(mMenuIcon,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   curveTranslation);
-        }
-
-        contentAnimator.setPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
-            @Override
-            public void onPropertyAnimationStart() {
-            }
-
-            @Override
-            public void onPropertyAnimationEnd() {
-                // Once the entry is fully expanded, start awesome screen
-                mActivity.onSearchRequested();
-                mAnimatingEntry = false;
-            }
-        });
-
-        mAnimatingEntry = true;
-        contentAnimator.start();
+        return false;
     }
 
     private void addTab() {
         mActivity.addTab();
     }
 
     private void toggleTabs() {
         if (mActivity.areTabsShown()) {
@@ -764,22 +871,42 @@ public class BrowserToolbar extends Geck
                 if (!tab.isPrivate())
                     mActivity.showNormalTabs();
                 else
                     mActivity.showPrivateTabs();
             }
         }
     }
 
-    public void updateTabCount(int count) {
-        // If toolbar is selected, this means the entry is expanded and the
+    public void updateTabCountAndAnimate(int count) {
+        // Don't animate if the toolbar is hidden.
+        if (!isVisible()) {
+            updateTabCount(count);
+            return;
+        }
+
+        // If toolbar is in edit mode, this means the entry is expanded and the
         // tabs button is translated offscreen. Don't trigger tabs counter
         // updates until the tabs button is back on screen.
-        // See fromAwesomeBarSearch()
-        if (isSelected()) {
+        // See stopEditing()
+        if (!isEditing()) {
+            mTabsCounter.setCount(count);
+
+            mTabs.setContentDescription((count > 1) ?
+                                        mActivity.getString(R.string.num_tabs, count) :
+                                        mActivity.getString(R.string.one_tab));
+        }
+    }
+
+    public void updateTabCount(int count) {
+        // If toolbar is in edit mode, this means the entry is expanded and the
+        // tabs button is translated offscreen. Don't trigger tabs counter
+        // updates until the tabs button is back on screen.
+        // See stopEditing()
+        if (isEditing()) {
             return;
         }
 
         // Set TabCounter based on visibility
         if (isVisible() && ViewHelper.getAlpha(mTabsCounter) != 0) {
             mTabsCounter.setCountWithAnimation(count);
         } else {
             mTabsCounter.setCount(count);
@@ -914,39 +1041,57 @@ public class BrowserToolbar extends Geck
     public void setShadowVisibility(boolean visible) {
         Tab tab = Tabs.getInstance().getSelectedTab();
         if (tab == null) {
             return;
         }
 
         String url = tab.getURL();
 
-        // Only set shadow to visible when not on about screens except about:blank.
-        visible &= !(url == null || (url.startsWith("about:") &&
-                     !url.equals("about:blank")));
+        // Only set shadow to visible when not on about screens (except about:blank)
+        // and when not in editing mode.
+        visible &= !(url == null || (url.startsWith("about:") && 
+                     !url.equals("about:blank"))) && !isEditing();
 
         if ((mShadow.getVisibility() == View.VISIBLE) != visible) {
             mShadow.setVisibility(visible ? View.VISIBLE : View.GONE);
         }
     }
 
+    public void onEditSuggestion(String suggestion) {
+        if (!isEditing()) {
+            return;
+        }
+
+        mUrlEditText.setText(suggestion);
+        mUrlEditText.setSelection(mUrlEditText.getText().length());
+        mUrlEditText.requestFocus();
+
+        showSoftInput();
+    }
+
     private void setTitle(CharSequence title) {
         mTitle.setText(title);
         setContentDescription(title != null ? title : mTitle.getHint());
     }
 
     // Sets the toolbar title according to the selected tab, obeying the mShowUrl prference.
     private void updateTitle() {
         Tab tab = Tabs.getInstance().getSelectedTab();
         // Keep the title unchanged if there's no selected tab, or if the tab is entering reader mode.
         if (tab == null || tab.isEnteringReaderMode()) {
             return;
         }
 
         String url = tab.getURL();
+
+        if (!isEditing()) {
+            mUrlEditText.setText(url);
+        }
+
         // Setting a null title will ensure we just see the "Enter Search or Address" placeholder text.
         if ("about:home".equals(url) || "about:privatebrowsing".equals(url)) {
             setTitle(null);
             return;
         }
 
         // Show the about:blocked page title in red, regardless of prefs
         if (tab.getErrorType() == Tab.ErrorType.BLOCKED) {
@@ -1022,16 +1167,401 @@ public class BrowserToolbar extends Geck
 
         ViewHelper.setAlpha(mTabsCounter, 0.0f);
 
         if (mHasSoftMenuButton && !HardwareUtils.isTablet()) {
             ViewHelper.setAlpha(mMenuIcon, 0.0f);
         }
     }
 
+    public void finishTabsAnimation(boolean tabsAreShown) {
+        if (tabsAreShown) {
+            return;
+        }
+
+        PropertyAnimator animator = new PropertyAnimator(150);
+
+        animator.attach(mTabsCounter,
+                        PropertyAnimator.Property.ALPHA,
+                        1.0f);
+
+        if (mHasSoftMenuButton && !HardwareUtils.isTablet()) {
+            animator.attach(mMenuIcon,
+                            PropertyAnimator.Property.ALPHA,
+                            1.0f);
+        }
+
+        animator.start();
+    }
+
+    public void setOnActivateListener(OnActivateListener listener) {
+        mActivateListener = listener;
+    }
+
+    public void setOnCommitListener(OnCommitListener listener) {
+        mCommitListener = listener;
+    }
+
+    public void setOnDismissListener(OnDismissListener listener) {
+        mDismissListener = listener;
+    }
+
+    public void setOnFilterListener(OnFilterListener listener) {
+        mFilterListener = listener;
+    }
+
+    private void showSoftInput() {
+        InputMethodManager imm =
+               (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(mUrlEditText, InputMethodManager.SHOW_IMPLICIT);
+    }
+
+    private void showUrlEditContainer() {
+        setUrlEditContainerVisibility(true, null);
+    }
+
+    private void showUrlEditContainer(PropertyAnimator animator) {
+        setUrlEditContainerVisibility(true, animator);
+    }
+
+    private void hideUrlEditContainer() {
+        setUrlEditContainerVisibility(false, null);
+    }
+
+    private void hideUrlEditContainer(PropertyAnimator animator) {
+        setUrlEditContainerVisibility(false, animator);
+    }
+
+    private void setUrlEditContainerVisibility(final boolean showEditContainer, PropertyAnimator animator) {
+        final View viewToShow = (showEditContainer ? mUrlEditContainer : mUrlDisplayContainer);
+        final View viewToHide = (showEditContainer ? mUrlDisplayContainer : mUrlEditContainer);
+
+        if (animator == null) {
+            viewToHide.setVisibility(View.GONE);
+            viewToShow.setVisibility(View.VISIBLE);
+
+            if (showEditContainer) {
+                mUrlEditText.requestFocus();
+                showSoftInput();
+            }
+
+            return;
+        }
+
+        ViewHelper.setAlpha(viewToShow, 0.0f);
+        animator.attach(viewToShow,
+                        PropertyAnimator.Property.ALPHA,
+                        1.0f);
+
+        animator.attach(viewToHide,
+                        PropertyAnimator.Property.ALPHA,
+                        0.0f);
+
+        animator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() {
+                viewToShow.setVisibility(View.VISIBLE);
+
+                if (showEditContainer) {
+                    ViewHelper.setAlpha(mGo, 0.0f);
+                    mUrlEditText.requestFocus();
+                }
+            }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                viewToHide.setVisibility(View.GONE);
+                ViewHelper.setAlpha(viewToHide, 1.0f);
+
+                if (showEditContainer) {
+                    ViewHelper.setAlpha(mGo, 1.0f);
+                    showSoftInput();
+                }
+            }
+        });
+    }
+
+    /**
+     * Returns whether or not the URL bar is in editing mode (url bar is expanded, hiding the new
+     * tab button). Note that selection state is independent of editing mode.
+     */
+    public boolean isEditing() {
+        return mIsEditing;
+    }
+
+    public void startEditing(String url, PropertyAnimator animator) {
+        if (isEditing()) {
+            return;
+        }
+
+        mUrlEditText.setText(url != null ? url : "");
+        mIsEditing = true;
+
+        final int entryTranslation = getUrlBarEntryTranslation();
+        final int curveTranslation = getUrlBarCurveTranslation();
+
+        // This animation doesn't make much sense in a sidebar UI
+        if (HardwareUtils.isTablet() || Build.VERSION.SDK_INT < 11) {
+            showUrlEditContainer();
+
+            if (!HardwareUtils.isTablet()) {
+                if (mUrlBarRightEdge != null) {
+                    ViewHelper.setTranslationX(mUrlBarRightEdge, entryTranslation);
+                }
+
+                ViewHelper.setTranslationX(mTabs, curveTranslation);
+                ViewHelper.setTranslationX(mTabsCounter, curveTranslation);
+                ViewHelper.setTranslationX(mActionItemBar, curveTranslation);
+
+                if (mHasSoftMenuButton) {
+                    ViewHelper.setTranslationX(mMenu, curveTranslation);
+                    ViewHelper.setTranslationX(mMenuIcon, curveTranslation);
+                }
+            }
+
+            return;
+        }
+
+        if (mAnimatingEntry)
+            return;
+
+        // Highlight the toolbar from the start of the animation.
+        setSelected(true);
+
+        // Hide page actions/stop buttons immediately
+        ViewHelper.setAlpha(mPageActionLayout, 0);
+        ViewHelper.setAlpha(mStop, 0);
+
+        // Slide the right side elements of the toolbar
+
+        if (mUrlBarRightEdge != null) {
+            animator.attach(mUrlBarRightEdge,
+                            PropertyAnimator.Property.TRANSLATION_X,
+                            entryTranslation);
+        }
+
+        animator.attach(mTabs,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+        animator.attach(mTabsCounter,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+        animator.attach(mActionItemBar,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+
+        if (mHasSoftMenuButton) {
+            animator.attach(mMenu,
+                            PropertyAnimator.Property.TRANSLATION_X,
+                            curveTranslation);
+
+            animator.attach(mMenuIcon,
+                            PropertyAnimator.Property.TRANSLATION_X,
+                            curveTranslation);
+        }
+
+        showUrlEditContainer(animator);
+
+        animator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() {
+            }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                mAnimatingEntry = false;
+            }
+        });
+
+        mAnimatingEntry = true;
+    }
+
+    /**
+     * Exits edit mode without updating the toolbar title.
+     *
+     * @return the url that was entered
+     */
+    public String cancelEdit() {
+        return stopEditing();
+    }
+
+    /**
+     * Exits edit mode, updating the toolbar title with the url that was just entered.
+     *
+     * @return the url that was entered
+     */
+    public String commitEdit() {
+        final String url = stopEditing();
+        if (!TextUtils.isEmpty(url)) {
+            setTitle(url);
+        }
+        return url;
+    }
+
+    private String stopEditing() {
+        final String url = mUrlEditText.getText().toString();
+        if (!isEditing()) {
+            return url;
+        }
+        mIsEditing = false;
+
+        if (HardwareUtils.isTablet() || Build.VERSION.SDK_INT < 11) {
+            hideUrlEditContainer();
+            updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
+
+            if (!HardwareUtils.isTablet()) {
+                if (mUrlBarRightEdge != null) {
+                    ViewHelper.setTranslationX(mUrlBarRightEdge, 0);
+                }
+
+                ViewHelper.setTranslationX(mTabs, 0);
+                ViewHelper.setTranslationX(mTabsCounter, 0);
+                ViewHelper.setTranslationX(mActionItemBar, 0);
+
+                if (mHasSoftMenuButton) {
+                    ViewHelper.setTranslationX(mMenu, 0);
+                    ViewHelper.setTranslationX(mMenuIcon, 0);
+                }
+            }
+
+            return url;
+        }
+
+        final PropertyAnimator contentAnimator = new PropertyAnimator(250);
+        contentAnimator.setUseHardwareLayer(false);
+
+        // Shrink the urlbar entry back to its original size
+
+        if (mUrlBarRightEdge != null) {
+            contentAnimator.attach(mUrlBarRightEdge,
+                                   PropertyAnimator.Property.TRANSLATION_X,
+                                   0);
+        }
+
+        contentAnimator.attach(mTabs,
+                               PropertyAnimator.Property.TRANSLATION_X,
+                               0);
+        contentAnimator.attach(mTabsCounter,
+                               PropertyAnimator.Property.TRANSLATION_X,
+                               0);
+        contentAnimator.attach(mActionItemBar,
+                               PropertyAnimator.Property.TRANSLATION_X,
+                               0);
+
+        if (mHasSoftMenuButton) {
+            contentAnimator.attach(mMenu,
+                                   PropertyAnimator.Property.TRANSLATION_X,
+                                   0);
+
+            contentAnimator.attach(mMenuIcon,
+                                   PropertyAnimator.Property.TRANSLATION_X,
+                                   0);
+        }
+
+        hideUrlEditContainer(contentAnimator);
+
+        contentAnimator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() {
+            }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                setShadowVisibility(true);
+
+                PropertyAnimator buttonsAnimator = new PropertyAnimator(300);
+
+                // Fade toolbar buttons (page actions, stop) after the entry
+                // is schrunk back to its original size.
+                buttonsAnimator.attach(mPageActionLayout,
+                                       PropertyAnimator.Property.ALPHA,
+                                       1);
+                buttonsAnimator.attach(mStop,
+                                       PropertyAnimator.Property.ALPHA,
+                                       1);
+
+                buttonsAnimator.start();
+
+                mAnimatingEntry = false;
+
+                // Trigger animation to update the tabs counter once the
+                // tabs button is back on screen.
+                updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
+            }
+        });
+
+        mAnimatingEntry = true;
+        contentAnimator.start();
+
+        return url;
+    }
+
+    private void updateGoButton(String text) {
+        if (text.length() == 0) {
+            mGo.setVisibility(View.GONE);
+            return;
+        }
+
+        mGo.setVisibility(View.VISIBLE);
+
+        int imageResource = R.drawable.ic_url_bar_go;
+        String contentDescription = mActivity.getString(R.string.go);
+        int imeAction = EditorInfo.IME_ACTION_GO;
+
+        int actionBits = mUrlEditText.getImeOptions() & EditorInfo.IME_MASK_ACTION;
+        if (StringUtils.isSearchQuery(text, actionBits == EditorInfo.IME_ACTION_SEARCH)) {
+            imageResource = R.drawable.ic_url_bar_search;
+            contentDescription = mActivity.getString(R.string.search);
+            imeAction = EditorInfo.IME_ACTION_SEARCH;
+        }
+
+        InputMethodManager imm = InputMethods.getInputMethodManager(mUrlEditText.getContext());
+        if (imm == null) {
+            return;
+        }
+        boolean restartInput = false;
+        if (actionBits != imeAction) {
+            int optionBits = mUrlEditText.getImeOptions() & ~EditorInfo.IME_MASK_ACTION;
+            mUrlEditText.setImeOptions(optionBits | imeAction);
+
+            mDelayRestartInput = (imeAction == EditorInfo.IME_ACTION_GO) &&
+                                 (InputMethods.shouldDelayUrlBarUpdate(mUrlEditText.getContext()));
+            if (!mDelayRestartInput) {
+                restartInput = true;
+            }
+        } else if (mDelayRestartInput) {
+            // Only call delayed restartInput when actionBits == imeAction
+            // so if there are two restarts in a row, the first restarts will
+            // be discarded and the second restart will be properly delayed
+            mDelayRestartInput = false;
+            restartInput = true;
+        }
+        if (restartInput) {
+            updateKeyboardInputType();
+            imm.restartInput(mUrlEditText);
+            mGo.setImageResource(imageResource);
+            mGo.setContentDescription(contentDescription);
+        }
+    }
+
+    private void updateKeyboardInputType() {
+        // If the user enters a space, then we know they are entering search terms, not a URL.
+        // We can then switch to text mode so,
+        // 1) the IME auto-inserts spaces between words
+        // 2) the IME doesn't reset input keyboard to Latin keyboard.
+        String text = mUrlEditText.getText().toString();
+        int currentInputType = mUrlEditText.getInputType();
+        int newInputType = StringUtils.isSearchQuery(text, false)
+                           ? (currentInputType & ~InputType.TYPE_TEXT_VARIATION_URI) // Text mode
+                           : (currentInputType | InputType.TYPE_TEXT_VARIATION_URI); // URL mode
+        if (newInputType != currentInputType) {
+            mUrlEditText.setRawInputType(newInputType);
+        }
+    }
+
     public void updateBackButton(boolean enabled) {
          Drawable drawable = mBack.getDrawable();
          if (drawable != null)
              drawable.setAlpha(enabled ? 255 : 77);
 
          mBack.setEnabled(enabled);
     }
 
@@ -1045,50 +1575,58 @@ public class BrowserToolbar extends Geck
 
         if (mForward.getVisibility() != View.VISIBLE)
             return;
 
         // We want the forward button to show immediately when switching tabs
         mForwardAnim = new PropertyAnimator(mSwitchingTabs ? 10 : FORWARD_ANIMATION_DURATION);
         final int width = mForward.getWidth() / 2;
 
-        mForwardAnim.setPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+        mForwardAnim.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
             @Override
             public void onPropertyAnimationStart() {
                 if (!enabled) {
                     // Set the margin before the transition when hiding the forward button. We
                     // have to do this so that the favicon isn't clipped during the transition
                     ViewGroup.MarginLayoutParams layoutParams =
                         (ViewGroup.MarginLayoutParams)mUrlDisplayContainer.getLayoutParams();
                     layoutParams.leftMargin = 0;
-                    mUrlDisplayContainer.requestLayout();
+
+                    // Do the same on the URL edit container
+                    layoutParams = (ViewGroup.MarginLayoutParams)mUrlEditContainer.getLayoutParams();
+                    layoutParams.leftMargin = 0;
+
+                    requestLayout();
                     // Note, we already translated the favicon, site security, and text field
                     // in prepareForwardAnimation, so they should appear to have not moved at
                     // all at this point.
                 }
             }
 
             @Override
             public void onPropertyAnimationEnd() {
                 if (enabled) {
                     ViewGroup.MarginLayoutParams layoutParams =
                         (ViewGroup.MarginLayoutParams)mUrlDisplayContainer.getLayoutParams();
-                    layoutParams.leftMargin = mAddressBarViewOffset;
+                    layoutParams.leftMargin = mUrlBarViewOffset;
+
+                    layoutParams = (ViewGroup.MarginLayoutParams)mUrlEditContainer.getLayoutParams();
+                    layoutParams.leftMargin = mUrlBarViewOffset;
 
                     ViewHelper.setTranslationX(mTitle, 0);
                     ViewHelper.setTranslationX(mFavicon, 0);
                     ViewHelper.setTranslationX(mSiteSecurity, 0);
                 }
 
                 ViewGroup.MarginLayoutParams layoutParams =
                     (ViewGroup.MarginLayoutParams)mForward.getLayoutParams();
                 layoutParams.leftMargin = mDefaultForwardMargin + (mForward.isEnabled() ? width : 0);
                 ViewHelper.setTranslationX(mForward, 0);
 
-                mUrlDisplayContainer.requestLayout();
+                requestLayout();
                 mForwardAnim = null;
             }
         });
 
         prepareForwardAnimation(mForwardAnim, enabled, width);
         mForwardAnim.start();
     }
 
@@ -1108,35 +1646,35 @@ public class BrowserToolbar extends Geck
                       0);
             anim.attach(mSiteSecurity,
                       PropertyAnimator.Property.TRANSLATION_X,
                       0);
 
             // We're hiding the forward button. We're going to reset the margin before
             // the animation starts, so we shift these items to the right so that they don't
             // appear to move initially.
-            ViewHelper.setTranslationX(mTitle, mAddressBarViewOffset);
-            ViewHelper.setTranslationX(mFavicon, mAddressBarViewOffset);
-            ViewHelper.setTranslationX(mSiteSecurity, mAddressBarViewOffset);
+            ViewHelper.setTranslationX(mTitle, mUrlBarViewOffset);
+            ViewHelper.setTranslationX(mFavicon, mUrlBarViewOffset);
+            ViewHelper.setTranslationX(mSiteSecurity, mUrlBarViewOffset);
         } else {
             anim.attach(mForward,
                       PropertyAnimator.Property.TRANSLATION_X,
                       width);
             anim.attach(mForward,
                       PropertyAnimator.Property.ALPHA,
                       1);
             anim.attach(mTitle,
                       PropertyAnimator.Property.TRANSLATION_X,
-                      mAddressBarViewOffset);
+                      mUrlBarViewOffset);
             anim.attach(mFavicon,
                       PropertyAnimator.Property.TRANSLATION_X,
-                      mAddressBarViewOffset);
+                      mUrlBarViewOffset);
             anim.attach(mSiteSecurity,
                       PropertyAnimator.Property.TRANSLATION_X,
-                      mAddressBarViewOffset);
+                      mUrlBarViewOffset);
         }
     }
 
     @Override
     public void addActionItem(View actionItem) {
         mActionItemBar.addView(actionItem);
     }
 
@@ -1161,22 +1699,23 @@ public class BrowserToolbar extends Geck
             setProgressVisibility(tab.getState() == Tab.STATE_LOADING);
             setSecurityMode(tab.getSecurityMode());
             setPageActionVisibility(mStop.getVisibility() == View.VISIBLE);
             setShadowVisibility(true);
             updateBackButton(tab.canDoBack());
             updateForwardButton(tab.canDoForward());
 
             final boolean isPrivate = tab.isPrivate();
-            mAddressBarBg.setPrivateMode(isPrivate);
+            mUrlBarBackground.setPrivateMode(isPrivate);
             setPrivateMode(isPrivate);
             mTabs.setPrivateMode(isPrivate);
             mTitle.setPrivateMode(isPrivate);
             mMenu.setPrivateMode(isPrivate);
             mMenuIcon.setPrivateMode(isPrivate);
+            mUrlEditText.setPrivateMode(isPrivate);
 
             if (mBack instanceof BackButton)
                 ((BackButton) mBack).setPrivateMode(isPrivate);
 
             if (mForward instanceof ForwardButton)
                 ((ForwardButton) mForward).setPrivateMode(isPrivate);
         }
     }