[WebLayer] Make WebLayerShellActivity editable.

Switch between an EditText and a View object returned by
UrlBarController to build an editable URL bar as developers reply upon
this for testing.

Bug: 1025607
Change-Id: I93c8731457c4dd519b347ceaca1af79ea70e1f28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050690
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741078}

weblayer/shell/android/shell_apk/res/layout/shell_browser_controls.xml

@@ -9,18 +9,34 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="LabelFor,ContentDescription"
-    android:background="#FFc9c9c9">
+    android:background="#FFc9c9c9"
+    android:layout_width="match_parent">
 
-    <FrameLayout
+    <ViewSwitcher
         android:id="@+id/url_view_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
         android:layout_alignParentStart="true"
-        android:layout_gravity="center_vertical" 
-        android:layout_toStartOf="@+id/menu_button" />
+        android:layout_toStartOf="@+id/menu_button">
+
+        <EditText
+            android:id="@+id/editable_url_view"
+            android:inputType="textUri"
+            android:selectAllOnFocus="true"
+            android:imeOptions="actionGo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"/>
+
+        <View
+            android:id="@+id/noneditable_url_view_placeholder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </ViewSwitcher>
 
     <ImageButton
         android:id="@+id/menu_button"
@@ -28,10 +44,8 @@
         android:background="@android:color/transparent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="-2px"
-        android:layout_alignBottom="@id/url_view_container" />
+        android:layout_gravity="end"
+        android:layout_alignParentEnd="true"/>
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -41,10 +55,10 @@
         android:visibility="invisible"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/menu_button"
+        android:layout_alignBottom="@id/url_view_container"
         android:layout_marginTop="0dp"
         android:layout_marginBottom="-10px"
         android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp" />
+        android:layout_marginRight="0dp"/>
 
 </RelativeLayout>

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/WebLayerShellActivity.java

@@ -12,19 +12,19 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.webkit.ValueCallback;
-import android.widget.FrameLayout;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.ViewSwitcher;
 
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.DownloadCallback;
@@ -37,6 +37,8 @@ import org.chromium.weblayer.NewTabCallback;
 import org.chromium.weblayer.NewTabType;
 import org.chromium.weblayer.Profile;
 import org.chromium.weblayer.Tab;
+import org.chromium.weblayer.TabCallback;
+import org.chromium.weblayer.TabListCallback;
 import org.chromium.weblayer.UnsupportedVersionException;
 import org.chromium.weblayer.UrlBarOptions;
 import org.chromium.weblayer.WebLayer;
@@ -50,15 +52,21 @@ import java.util.List;
 public class WebLayerShellActivity extends FragmentActivity {
     private static final String TAG = "WebLayerShell";
     private static final String KEY_MAIN_VIEW_ID = "mainViewId";
+    private static final float DEFAULT_TEXT_SIZE = 15.0F;
+    private static final int EDITABLE_URL_TEXT_VIEW = 0;
+    private static final int NONEDITABLE_URL_TEXT_VIEW = 1;
 
     private Profile mProfile;
     private Browser mBrowser;
     private ImageButton mMenuButton;
-    private FrameLayout mUrlViewContainer;
+    private ViewSwitcher mUrlViewContainer;
+    private EditText mEditUrlView;
+    // private View mNonEditUrlView;
     private ProgressBar mLoadProgressBar;
     private View mMainView;
     private int mMainViewId;
     private View mTopContentsContainer;
+    private TabListCallback mTabListCallback;
     private List<Tab> mPreviousTabList = new ArrayList<>();
     private Runnable mExitFullscreenRunnable;
 
@@ -87,15 +95,19 @@ public class WebLayerShellActivity extends FragmentActivity {
                 LayoutInflater.from(this).inflate(R.layout.shell_browser_controls, null);
         mUrlViewContainer = mTopContentsContainer.findViewById(R.id.url_view_container);
 
+        mEditUrlView = mUrlViewContainer.findViewById(R.id.editable_url_view);
+        mEditUrlView.setOnEditorActionListener((TextView v, int actionId, KeyEvent event) -> {
+            loadUrl(mEditUrlView.getText().toString());
+            mEditUrlView.clearFocus();
+            return true;
+        });
+        mUrlViewContainer.setDisplayedChild(EDITABLE_URL_TEXT_VIEW);
+
         mMenuButton = mTopContentsContainer.findViewById(R.id.menu_button);
-        mMenuButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        mMenuButton.setOnClickListener(v -> {
             PopupMenu popup = new PopupMenu(WebLayerShellActivity.this, v);
             popup.getMenuInflater().inflate(R.menu.app_menu, popup.getMenu());
-                popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
+            popup.setOnMenuItemClickListener(item -> {
                 if (item.getItemId() == R.id.find_begin_menu_id) {
                     // TODO(estade): add a UI for FIP. For now, just search for "cat", or go
                     // to the next result if a search has already been initiated.
@@ -106,16 +118,13 @@ public class WebLayerShellActivity extends FragmentActivity {
                 }
 
                 if (item.getItemId() == R.id.find_end_menu_id) {
-                            mBrowser.getActiveTab().getFindInPageController().setFindInPageCallback(
-                                    null);
+                    mBrowser.getActiveTab().getFindInPageController().setFindInPageCallback(null);
                     return true;
                 }
 
                 return false;
-                    }
             });
             popup.show();
-            }
         });
 
         mLoadProgressBar = mTopContentsContainer.findViewById(R.id.progress_bar);
@@ -135,7 +144,11 @@ public class WebLayerShellActivity extends FragmentActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mUrlViewContainer.removeAllViews();
+        mUrlViewContainer.reset();
+        if (mTabListCallback != null) {
+            mBrowser.unregisterTabListCallback(mTabListCallback);
+            mTabListCallback = null;
+        }
     }
 
     private void onWebLayerReady(WebLayer webLayer, Bundle savedInstanceState) {
@@ -155,12 +168,21 @@ public class WebLayerShellActivity extends FragmentActivity {
         mProfile = mBrowser.getProfile();
 
         mBrowser.setTopView(mTopContentsContainer);
-        UrlBarOptions urlBarOptions = UrlBarOptions.builder().setTextSizeSP(12.0F).build();
-        View urlView = mBrowser.getUrlBarController().createUrlBarView(urlBarOptions);
+        mTabListCallback = new TabListCallback() {
+            @Override
+            public void onActiveTabChanged(Tab activeTab) {
+                mUrlViewContainer.setDisplayedChild(NONEDITABLE_URL_TEXT_VIEW);
+            }
+        };
+        mBrowser.registerTabListCallback(mTabListCallback);
+        View nonEditUrlView = mBrowser.getUrlBarController().createUrlBarView(
+                UrlBarOptions.builder().setTextSizeSP(DEFAULT_TEXT_SIZE).build());
+        nonEditUrlView.setOnClickListener(
+                v -> { mUrlViewContainer.setDisplayedChild(EDITABLE_URL_TEXT_VIEW); });
+        mUrlViewContainer.removeViewAt(NONEDITABLE_URL_TEXT_VIEW);
+        mUrlViewContainer.addView(nonEditUrlView, NONEDITABLE_URL_TEXT_VIEW);
+        mUrlViewContainer.setDisplayedChild(NONEDITABLE_URL_TEXT_VIEW);
 
-        mUrlViewContainer.addView(urlView,
-                new RelativeLayout.LayoutParams(
-                        LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         if (getCurrentDisplayUrl() != null) {
             return;
         }
@@ -236,6 +258,12 @@ public class WebLayerShellActivity extends FragmentActivity {
                 }
             }
         });
+        tab.registerTabCallback(new TabCallback() {
+            @Override
+            public void onVisibleUriChanged(Uri uri) {
+                mUrlViewContainer.setDisplayedChild(NONEDITABLE_URL_TEXT_VIEW);
+            }
+        });
         tab.getNavigationController().registerNavigationCallback(new NavigationCallback() {
             @Override
             public void onLoadStateChanged(boolean isLoading, boolean toDifferentDocument) {