[ProfileCard] Fix build errors and remove unused inheritance

Add the component to build file and fix the importing and
depending errors that occurred.

Remove the inheritance of the TextBubble since we are no
longer using a pop-up dialog as a profile card container.

Bug: 1051208, 1051537
Change-Id: I23b71bc4f2f5d2fd9e8034cd0d35a1e4da2c6d75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2047460
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: sebsg <sebsg@chromium.org>
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740826}

chrome/android/BUILD.gn

@@ -259,6 +259,7 @@ android_library("chrome_java") {
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/notifications/chime/android:java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/profile_card/android:java",
     "//chrome/browser/settings:java",
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/thumbnail:java",
@@ -496,6 +497,7 @@ java_group("chrome_all_java") {
     "//chrome/android/features/media_router:java",
     "//chrome/android/features/test_dummy/internal:base_module_java",
     "//chrome/android/modules/extra_icu/provider:java",
+    "//chrome/browser/profile_card/android/internal:java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/appmenu/internal:java",
   ]

chrome/android/java/DEPS

@@ -5,6 +5,8 @@ include_rules = [
   "+chrome/browser/flags/android",
   "+chrome/browser/share/android",
   "+chrome/browser/thumbnail/generator/android/java",
+  "+chrome/browser/profile_card/android",
+  "-chrome/browser/profile_card/android/internal",
   "+chrome/browser/ui/android/appmenu",
   "-chrome/browser/ui/android/appmenu/internal",
   "+chrome/browser/ui/messages/android/java",

chrome/browser/profile_card/android/BUILD.gn

@@ -6,11 +6,4 @@ import("//build/config/android/rules.gni")
 
 android_library("java") {
   sources = [ "java/src/org/chromium/chrome/browser/profile_card/ProfileCardCoordinator.java" ]
-  deps = [ "//chrome/lib/lifecycle/public/android:java" ]
-}
-
-android_resources("java_resources") {
-  custom_package = "org.chromium.chrome.browser.profile_card"
-  resource_dirs = [ "java/res" ]
-  deps = [ "//ui/android:ui_java_resources" ]
 }

chrome/browser/profile_card/android/internal/BUILD.gn

@@ -16,15 +16,14 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/profile_card/android:java",
+    "//components/browser_ui/widget/android:java",
+    "//ui/android:ui_full_java",
   ]
 }
 
 android_resources("java_resources") {
   custom_package = "org.chromium.chrome.browser.profile_card.internal"
   resource_dirs = [ "java/res" ]
-  visibility = [ ":*" ]
-
-  # Include resource dependencies needed by :java so that resources may
-  # all be accessed through the same custom_package.
-  deps = [ "//chrome/browser/profile_card:java_resources" ]
 }

chrome/browser/profile_card/android/internal/java/res/layout/profile_card.xml

@@ -3,7 +3,9 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.chromium.chrome.browser.profile_card.ProfileCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/profile_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -12,13 +14,11 @@
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.TextMediumThick.Primary.Inverse" />
+        android:layout_height="wrap_content"/>
 
     <TextView
         android:id="@+id/description"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.TextMediumThick.Primary.Inverse" />
+        android:layout_height="wrap_content"/>
 
-</LinearLayout>
+</org.chromium.chrome.browser.profile_card.ProfileCardView>

chrome/browser/profile_card/android/internal/java/src/org/chromium/chrome/browser/profile_card/ProfileCardCoordinatorImpl.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.profile_card.internal;
+package org.chromium.chrome.browser.profile_card;
 
 import android.view.View;
 
@@ -21,18 +21,17 @@ import org.chromium.ui.widget.ViewRectProvider;
 public class ProfileCardCoordinatorImpl implements ProfileCardCoordinator {
     private static final String TAG = "ShowError";
 
-    private final PropertyModel mModel;
-    private final ProfileCardView mView;
-    private final ProfileCardMediator mMediator;
-    private final PropertyModelChangeProcessor mModelChangeProcessor;
-    private final JSONObject mProfileCardData;
+    private PropertyModel mModel;
+    private ProfileCardView mView;
+    private ProfileCardMediator mMediator;
+    private PropertyModelChangeProcessor mModelChangeProcessor;
+    private JSONObject mProfileCardData;
 
     @Override
     public void update(View anchorView, JSONObject profileCardData) {
         if (mProfileCardData == profileCardData) return;
         ViewRectProvider rectProvider = new ViewRectProvider(anchorView);
-        mView = new ProfileCardView(anchorView.getContext(), anchorView, /*stringId=*/"",
-                /*accessibilityStringId=*/"", rectProvider);
+        mView = new ProfileCardView(anchorView.getContext());
         mProfileCardData = profileCardData;
         mModel = new PropertyModel(ProfileCardProperties.ALL_KEYS);
         mModelChangeProcessor =

chrome/browser/profile_card/android/internal/java/src/org/chromium/chrome/browser/profile_card/ProfileCardMediator.java

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.profile_card.internal;
+package org.chromium.chrome.browser.profile_card;
 
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.DESCRIPTION;
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.IS_DIALOG_VISIBLE;
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.TITLE;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.DESCRIPTION;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.IS_DIALOG_VISIBLE;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.TITLE;
 
 import org.json.JSONException;
 import org.json.JSONObject;

chrome/browser/profile_card/android/internal/java/src/org/chromium/chrome/browser/profile_card/ProfileCardProperties.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.profile_card.internal;
+package org.chromium.chrome.browser.profile_card;
 
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;

chrome/browser/profile_card/android/internal/java/src/org/chromium/chrome/browser/profile_card/ProfileCardView.java

@@ -2,53 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.profile_card.internal;
+package org.chromium.chrome.browser.profile_card;
 
 import android.content.Context;
 import android.text.method.ScrollingMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
-import org.chromium.ui.widget.RectProvider;
+import org.chromium.chrome.browser.profile_card.internal.R;
 
 /**
  * UI component that handles showing a text bubble with a preceding image.
  */
-public class ProfileCardView extends TextBubble {
+public class ProfileCardView extends LinearLayout {
     private View mMainContentView;
     private TextView mTitleTextView;
     private TextView mDescriptionTextView;
-    private ImageButton mFollowBtn;
-    private LinearLayout mNetworkContainer;
 
-    /**
-     * Constructs a {@link ProfileCardView} instance.
-     * @param context  Context to draw resources from.
-     * @param rootView The {@link View} to use for size calculations and for display.
-     * @param stringId The id of the string resource for the text that should be shown.
-     * @param accessibilityStringId The id of the string resource of the accessibility text.
-     * @param anchorRectProvider The {@link RectProvider} used to anchor the text bubble.
-     */
-    public ProfileCardView(Context context, View rootView, String stringId,
-            String accessibilityStringId, RectProvider anchorRectProvider) {
-        super(context, rootView, stringId, accessibilityStringId, /*showArrow=*/true,
-                anchorRectProvider);
-        setColor(context.getResources().getColor(org.chromium.chrome.R.color.material_grey_100));
-        setCardDismissListener();
+    public ProfileCardView(Context context) {
+        super(context);
     }
 
     @Override
-    protected View createContentView() {
+    protected void onFinishInflate() {
+        super.onFinishInflate();
         mMainContentView =
-                LayoutInflater.from(mContext).inflate(R.layout.profile_card, /*root=*/null);
+                LayoutInflater.from(getContext()).inflate(R.layout.profile_card, /*root=*/null);
         mTitleTextView = mMainContentView.findViewById(R.id.title);
         mDescriptionTextView = mMainContentView.findViewById(R.id.description);
         mDescriptionTextView.setMovementMethod(new ScrollingMovementMethod());
-        return mMainContentView;
     }
 
     void setTitle(String title) {
@@ -67,19 +51,9 @@ public class ProfileCardView extends TextBubble {
 
     void setVisibility(boolean visible) {
         if (visible) {
-            setOutsideTouchable(true);
-            show();
+            mMainContentView.setVisibility(View.VISIBLE);
         } else {
-            dismiss();
+            mMainContentView.setVisibility(View.GONE);
         }
     }
-
-    void setCardDismissListener() {
-        addOnDismissListener(new OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                setVisibility(false);
-            }
-        });
-    }
 }

chrome/browser/profile_card/android/internal/java/src/org/chromium/chrome/browser/profile_card/ProfileCardViewBinder.java

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.profile_card.internal;
+package org.chromium.chrome.browser.profile_card;
 
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.DESCRIPTION;
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.IS_DIALOG_VISIBLE;
-import static org.chromium.chrome.features.profile_card.ProfileCardProperties.TITLE;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.DESCRIPTION;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.IS_DIALOG_VISIBLE;
+import static org.chromium.chrome.browser.profile_card.ProfileCardProperties.TITLE;
 
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;