Reverting back to using png instead of xml for copy icon.

Copy icon from xml isn't displayed. FReverting to using png while
figuring out why this is happening.


Bug: 788943
Change-Id: Ic2941708a27bfe1019b85db16bbf9fe8bc2137b0
Reviewed-on: https://chromium-review.googlesource.com/803278
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524049}

chrome/android/java/res/layout/password_entry_editor_copyable_row.xml

@@ -27,7 +27,6 @@
         android:layout_gravity="end"
         android:layout_marginTop="15dp"
         android:layout_marginEnd="15dp"
-        app:srcCompat="@drawable/ic_content_copy_black"
         app:chrometint="@color/black_alpha_54"
         android:contentDescription="@string/password_entry_editor_copy_stored_username"
         style="?android:attr/buttonStyleSmall" />

chrome/android/java/res/layout/password_entry_editor_interactive.xml

@@ -75,7 +75,6 @@
                 android:layout_gravity="end"
                 android:layout_marginTop="15dp"
                 android:layout_marginEnd="15dp"
-                app:srcCompat="@drawable/ic_content_copy_black"
                 app:chrometint="@color/black_alpha_54"
                 android:contentDescription="@string/password_entry_editor_copy_stored_password"
                 style="?android:attr/buttonStyleSmall" />

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryEditor.java

@@ -12,6 +12,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.StringRes;
+import android.support.v7.content.res.AppCompatResources;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -27,6 +28,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager.LayoutParams;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
@@ -250,6 +252,10 @@ public class PasswordEntryEditor extends Fragment {
     private void hookupCopyUsernameButton(View usernameView) {
         final ImageButton copyUsernameButton =
                 (ImageButton) usernameView.findViewById(R.id.password_entry_editor_copy);
+        final ImageView copy_image = usernameView.findViewById(R.id.password_entry_editor_copy);
+        copy_image.setImageDrawable(
+                AppCompatResources.getDrawable(getActivity(), R.drawable.ic_content_copy_black));
+
         copyUsernameButton.setContentDescription(
                 getActivity().getString(R.string.password_entry_editor_copy_stored_username));
         copyUsernameButton.setOnClickListener(new View.OnClickListener() {
@@ -274,6 +280,10 @@ public class PasswordEntryEditor extends Fragment {
                 (ImageButton) siteView.findViewById(R.id.password_entry_editor_copy);
         copySiteButton.setContentDescription(
                 getActivity().getString(R.string.password_entry_editor_copy_stored_site));
+        final ImageView copy_image = siteView.findViewById(R.id.password_entry_editor_copy);
+        copy_image.setImageDrawable(
+                AppCompatResources.getDrawable(getActivity(), R.drawable.ic_content_copy_black));
+
         copySiteButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -348,6 +358,10 @@ public class PasswordEntryEditor extends Fragment {
                 (ImageButton) mView.findViewById(R.id.password_entry_editor_copy_password);
         final ImageButton viewPasswordButton =
                 (ImageButton) mView.findViewById(R.id.password_entry_editor_view_password);
+        final ImageView copy_password =
+                mView.findViewById(R.id.password_entry_editor_copy_password);
+        copy_password.setImageDrawable(
+                AppCompatResources.getDrawable(getActivity(), R.drawable.ic_content_copy_black));
         copyPasswordButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -391,5 +405,4 @@ public class PasswordEntryEditor extends Fragment {
             }
         });
     }
-
 }