version bump, rename from Pay with Google to Google Pay

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.google.android.gms.samples.wallet"
 
         // Google Payment API is not supported in SDK versions lower than 19
         minSdkVersion 19
 
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -24,9 +24,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.google.android.gms:play-services:11.4.2'
+    implementation 'com.google.android.gms:play-services:11.8.0'
 
     // "wallet" is the only module needed for the Google Payment API and this sample app.
     // Apps that selectively compile Google Play service APIs need only this dependency.
-    //compile 'com.google.android.gms:play-services-wallet:11.4.2'
+    //implementation 'com.google.android.gms:play-services-wallet:11.8.0'
 }

app/src/main/java/com/google/android/gms/samples/wallet/CheckoutActivity.java

@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -36,7 +35,6 @@ import com.google.android.gms.wallet.PaymentDataRequest;
 import com.google.android.gms.wallet.PaymentMethodToken;
 import com.google.android.gms.wallet.PaymentsClient;
 import com.google.android.gms.wallet.TransactionInfo;
-import com.google.android.gms.wallet.WalletConstants;
 
 public class CheckoutActivity extends Activity {
     // Arbitrarily-picked result code.
@@ -44,8 +42,8 @@ public class CheckoutActivity extends Activity {
 
     private PaymentsClient mPaymentsClient;
 
-    private View mPwgButton;
-    private TextView mPwgStatusText;
+    private View mGooglePayButton;
+    private TextView mGooglePayStatusText;
 
     private ItemInfo mBikeItem = new ItemInfo("Simple Bike", 300 * 1000000, R.drawable.bike);
     private long mShippingCost = 90 * 1000000;
@@ -58,10 +56,10 @@ public class CheckoutActivity extends Activity {
         // Set up the mock information for our item in the UI.
         initItemUI();
 
-        mPwgButton = findViewById(R.id.pwg_button);
-        mPwgStatusText = findViewById(R.id.pwg_status);
+        mGooglePayButton = findViewById(R.id.googlepay_button);
+        mGooglePayStatusText = findViewById(R.id.googlepay_status);
 
-        mPwgButton.setOnClickListener(new View.OnClickListener() {
+        mGooglePayButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 requestPayment(view);
@@ -81,7 +79,7 @@ public class CheckoutActivity extends Activity {
                     public void onComplete(Task<Boolean> task) {
                         try {
                             boolean result = task.getResult(ApiException.class);
-                            setPwgAvailable(result);
+                            setGooglePayAvailable(result);
                         } catch (ApiException exception) {
                             // Process error
                             Log.w("isReadyToPay failed", exception);
@@ -90,16 +88,16 @@ public class CheckoutActivity extends Activity {
                 });
     }
 
-    private void setPwgAvailable(boolean available) {
+    private void setGooglePayAvailable(boolean available) {
         // If isReadyToPay returned true, show the button and hide the "checking" text. Otherwise,
         // notify the user that Pay with Google is not available.
         // Please adjust to fit in with your current user flow. You are not required to explicitly
         // let the user know if isReadyToPay returns false.
         if (available) {
-            mPwgStatusText.setVisibility(View.GONE);
-            mPwgButton.setVisibility(View.VISIBLE);
+            mGooglePayStatusText.setVisibility(View.GONE);
+            mGooglePayButton.setVisibility(View.VISIBLE);
         } else {
-            mPwgStatusText.setText(R.string.pwg_status_unavailable);
+            mGooglePayStatusText.setText(R.string.googlepay_status_unavailable);
         }
     }
 
@@ -123,7 +121,7 @@ public class CheckoutActivity extends Activity {
                 }
 
                 // Re-enables the Pay with Google button.
-                mPwgButton.setClickable(true);
+                mGooglePayButton.setClickable(true);
                 break;
         }
     }
@@ -157,7 +155,7 @@ public class CheckoutActivity extends Activity {
     // This method is called when the Pay with Google button is clicked.
     public void requestPayment(View view) {
         // Disables the button to prevent multiple clicks.
-        mPwgButton.setClickable(false);
+        mGooglePayButton.setClickable(false);
 
         // The price provided to the API should include taxes and shipping.
         // This price is not displayed to the user.

app/src/main/java/com/google/android/gms/samples/wallet/Constants.java

@@ -20,7 +20,6 @@ import android.util.Pair;
 
 import com.google.android.gms.wallet.WalletConstants;
 
-import java.io.UncheckedIOException;
 import java.util.Arrays;
 import java.util.List;
 

app/src/main/res/drawable-ja/pay_with_google_button_content.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) Google
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="80dp"
-        android:height="16dp"
-        android:viewportWidth="80.0"
-        android:viewportHeight="16.0">
-    <path
-        android:pathData="M36.564,5.048C37.222,5.65 37.74,6.28 38.104,6.924L37.334,7.484C36.928,6.784 36.438,6.154 35.864,5.608L36.564,5.048ZM35.206,6C35.822,6.56 36.34,7.204 36.732,7.904L35.976,8.436C35.57,7.75 35.066,7.12 34.478,6.56L35.206,6ZM37.642,3.032L37.67,4.278L35.052,4.376C34.66,4.376 34.156,4.614 33.526,5.062C32.84,5.566 32.266,6.154 31.818,6.826C31.272,7.624 31.006,8.436 31.006,9.248C31.006,10.116 31.412,10.816 32.238,11.348C33.134,11.922 34.492,12.244 36.284,12.3L36.032,13.574C33.848,13.546 32.196,13.14 31.104,12.356C30.082,11.628 29.578,10.62 29.578,9.332C29.578,8.268 29.914,7.274 30.6,6.378C31.132,5.65 31.846,5.006 32.742,4.446C30.53,4.614 28.388,4.824 26.316,5.076L26.134,3.76C30.418,3.298 34.254,3.06 37.642,3.032ZM45.45,1.52L46.822,1.52L46.822,3.242L52.184,3.242L52.184,4.53L46.822,4.53L46.822,6.364L50.546,6.364L50.546,7.54C49.804,9.052 48.726,10.34 47.326,11.418C47.956,11.754 48.642,12.076 49.384,12.356C50.392,12.72 51.442,13.042 52.562,13.294L51.792,14.47C50.574,14.148 49.426,13.756 48.334,13.294C47.564,12.958 46.85,12.594 46.192,12.202C44.638,13.168 42.762,13.938 40.578,14.526L39.808,13.336C41.852,12.874 43.602,12.23 45.044,11.418C44.344,10.872 43.728,10.256 43.21,9.584C42.72,8.968 42.37,8.31 42.16,7.61L41.18,7.61L41.18,6.364L45.45,6.364L45.45,4.53L40.116,4.53L40.116,3.242L45.45,3.242L45.45,1.52ZM46.164,10.718C47.396,9.836 48.362,8.8 49.034,7.61L43.476,7.61C43.728,8.268 44.092,8.842 44.568,9.346C45.044,9.85 45.576,10.312 46.164,10.718ZM55.932,14.288L54.49,14.288L54.196,13.042C54.644,13.098 55.064,13.126 55.47,13.126C55.904,13.126 56.128,12.888 56.128,12.426L56.128,9.472C55.456,9.71 54.784,9.934 54.112,10.144L53.776,8.8C54.574,8.618 55.358,8.394 56.128,8.128L56.128,5.258L54.266,5.258L54.266,3.984L56.128,3.984L56.128,1.716L57.416,1.716L57.416,3.984L59.152,3.984L59.152,5.258L57.416,5.258L57.416,7.638C57.962,7.4 58.508,7.148 59.04,6.868L59.04,8.226C58.494,8.478 57.948,8.73 57.416,8.954L57.416,12.734C57.416,13.77 56.912,14.288 55.932,14.288ZM64.444,7.176C65.256,9.178 65.984,11.474 66.614,14.05L65.312,14.386C65.2,13.882 65.074,13.378 64.934,12.888C62.876,13.252 60.65,13.574 58.256,13.882L57.99,12.664C58.452,12.566 58.718,12.412 58.802,12.216L61.406,1.912L62.75,2.094L60.09,12.342C61.84,12.104 63.338,11.866 64.598,11.642C64.206,10.256 63.744,8.898 63.24,7.582L64.444,7.176ZM71.538,1.996L71.328,3.312C73.47,3.48 75.472,3.802 77.334,4.278L77.712,3.004C75.92,2.528 73.862,2.192 71.538,1.996ZM75.43,5.104C74.702,5.104 73.708,5.23 72.448,5.496C71.58,5.664 70.6,5.902 69.536,6.21L69.928,7.498C72.448,6.77 74.296,6.406 75.458,6.406C76.242,6.406 76.844,6.602 77.264,6.994C77.642,7.358 77.838,7.848 77.838,8.492C77.838,9.626 77.278,10.55 76.158,11.25C75.178,11.88 73.764,12.328 71.916,12.594L72.504,13.924C74.702,13.56 76.368,12.944 77.502,12.076C78.706,11.138 79.322,9.92 79.322,8.436C79.322,7.372 78.986,6.56 78.328,5.986C77.656,5.398 76.69,5.104 75.43,5.104Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#3C4043"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M15.2,8.17C15.2,7.639 15.152,7.127 15.064,6.636L8,6.636L8,9.538L12.036,9.538C11.863,10.475 11.334,11.269 10.54,11.801L10.54,13.683L12.964,13.683C14.382,12.377 15.2,10.455 15.2,8.17L15.2,8.17Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#4285F4"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M8,15.5C10.025,15.5 11.723,14.828 12.964,13.683L10.54,11.801C9.868,12.251 9.009,12.517 8,12.517C6.047,12.517 4.393,11.198 3.803,9.425L1.298,9.425L1.298,11.368C2.532,13.819 5.068,15.5 8,15.5Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#34A853"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M3.803,9.425C3.653,8.975 3.568,8.494 3.568,8C3.568,7.506 3.653,7.025 3.803,6.575L3.803,4.632L1.298,4.632C0.79,5.644 0.5,6.79 0.5,8C0.5,9.21 0.79,10.356 1.298,11.368L3.803,9.425Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FBBC05"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M8,3.483C9.101,3.483 10.09,3.861 10.867,4.605L13.018,2.453C11.719,1.243 10.022,0.5 8,0.5C5.068,0.5 2.532,2.181 1.298,4.632L3.803,6.575C4.393,4.802 6.047,3.483 8,3.483Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#EA4335"
-        android:strokeWidth="1"/>
-</vector>

app/src/main/res/drawable-ja/save_to_googlepay_button_content.xml

@@ -0,0 +1,62 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="199dp"
+        android:height="18dp"
+        android:viewportWidth="199.0"
+        android:viewportHeight="18.0">
+    <path
+        android:pathData="M65.392,9.696C63.908,11.292 62.018,12.664 59.694,13.798L58.812,12.636C62.676,10.816 65.406,8.142 67.03,4.586L60.296,4.586L60.296,3.242L68.108,3.242L68.976,3.816C68.22,5.664 67.324,7.26 66.302,8.604C67.156,9.192 67.94,9.766 68.654,10.326C69.83,11.236 70.768,12.062 71.454,12.818L70.32,13.756C69.62,13 68.738,12.202 67.674,11.362C66.96,10.802 66.204,10.242 65.392,9.696ZM73.312,3.13L84.19,3.13L84.988,3.984C84.428,4.964 83.658,6.07 82.678,7.302C81.81,8.366 80.97,9.29 80.158,10.102C81.18,11.012 82.174,11.992 83.126,13.056L82.006,14.008C81.096,12.972 79.962,11.88 78.618,10.718C77.274,9.584 76.042,8.646 74.908,7.918L75.804,6.84C76.896,7.526 77.988,8.31 79.066,9.178C79.766,8.478 80.41,7.792 80.998,7.106C81.754,6.196 82.412,5.314 82.958,4.474L73.312,4.474L73.312,3.13ZM87.966,7.274L98.648,7.274L98.648,8.618L87.966,8.618L87.966,7.274ZM104.72,2.08L106.176,2.08L106.176,6.406C107.282,6.588 108.402,6.868 109.536,7.26C110.572,7.596 111.608,8.002 112.616,8.492L111.986,9.696C111.076,9.276 110.152,8.912 109.228,8.604C108.192,8.254 107.17,7.988 106.176,7.806L106.176,13.868L104.72,13.868L104.72,2.08ZM115.874,3.424L125.772,3.424L126.514,3.998C125.954,6.294 125.002,8.268 123.658,9.92C122.286,11.6 120.522,12.916 118.352,13.868L117.414,12.748C119.206,11.936 120.718,10.928 121.922,9.71C123.266,8.324 124.232,6.672 124.82,4.768L115.874,4.768L115.874,3.424ZM136.548,4.782L137.836,4.782L137.836,6.532L140.174,6.532L140.174,7.806L137.836,7.806L137.836,12.062C137.836,13.014 137.332,13.504 136.324,13.504C136.1,13.504 135.582,13.462 134.798,13.392L134.798,12.174C135.358,12.258 135.848,12.3 136.268,12.3C136.45,12.3 136.548,12.16 136.548,11.894L136.548,8.926C136.24,9.514 135.652,10.214 134.756,11.026C133.916,11.754 133.09,12.384 132.264,12.888L131.41,11.852C132.306,11.292 133.216,10.634 134.112,9.85C134.924,9.122 135.582,8.436 136.086,7.806L131.718,7.806L131.718,6.532L136.548,6.532L136.548,4.782ZM145,2.724C146.33,3.396 147.786,4.32 149.382,5.482L148.472,6.588C146.904,5.468 145.504,4.6 144.286,3.956L145,2.724ZM154.408,4.754L155.752,5.286C154.786,7.484 153.512,9.29 151.916,10.718C150.194,12.216 148.122,13.266 145.686,13.854L145.014,12.566C147.156,12.062 149.06,11.11 150.726,9.71C152.322,8.338 153.54,6.686 154.408,4.754ZM169.482,3.69L169.398,5.062C166.85,5.062 164.512,5.132 162.384,5.286L162.174,3.942C164.596,3.774 167.032,3.69 169.482,3.69ZM162.958,7.988L164.274,8.632C163.742,9.444 163.476,10.088 163.476,10.578C163.476,10.998 163.784,11.32 164.414,11.516C164.946,11.684 165.758,11.782 166.836,11.782C167.774,11.782 168.81,11.712 169.93,11.586L170,12.972C168.6,13.084 167.55,13.14 166.836,13.14C165.212,13.14 164.022,12.944 163.252,12.58C162.426,12.174 162.02,11.53 162.02,10.648C162.02,9.948 162.328,9.066 162.958,7.988ZM159.766,2.192L161.138,2.514C160.606,4.502 160.354,6.49 160.354,8.478C160.354,10.27 160.634,11.866 161.194,13.238L159.864,13.728C159.234,12.16 158.926,10.41 158.926,8.478C158.926,6.42 159.206,4.32 159.766,2.192ZM174.658,1.408L175.918,1.982C175.596,3.004 175.19,3.97 174.686,4.894L174.686,14.47L173.342,14.47L173.342,6.966C172.936,7.498 172.502,8.002 172.04,8.492L171.606,7.078C172.978,5.454 174,3.564 174.658,1.408ZM176.506,2.094L183.282,2.094L183.282,6.742L180.538,6.742L180.538,7.974L184.458,7.974L184.458,9.262L181.728,9.262C182.456,10.522 183.45,11.628 184.724,12.58L183.856,13.742C182.568,12.538 181.504,11.054 180.65,9.262L180.538,9.262L180.538,14.442L179.222,14.442L179.222,9.262L179.096,9.262C178.214,11.18 177.122,12.678 175.82,13.756L175.064,12.552C176.268,11.712 177.248,10.62 178.032,9.262L175.442,9.262L175.442,7.974L179.222,7.974L179.222,6.742L176.506,6.742L176.506,2.094ZM181.966,5.468L181.966,3.368L177.822,3.368L177.822,5.468L181.966,5.468ZM186.442,2.794L190.138,2.794C190.306,2.332 190.446,1.884 190.572,1.436L191.916,1.59C191.804,1.996 191.678,2.402 191.552,2.794L198.538,2.794L198.538,4.096L191.034,4.096C190.516,5.272 189.886,6.378 189.13,7.386L189.13,14.456L187.828,14.456L187.828,8.94C187.464,9.332 187.086,9.696 186.694,10.046L185.868,8.982C187.464,7.568 188.71,5.944 189.592,4.096L186.442,4.096L186.442,2.794ZM190.068,9.374L194.016,9.374L194.016,8.24C194.758,7.82 195.472,7.33 196.158,6.77L191.132,6.77L191.132,5.552L197.824,5.552L197.824,6.77C197.082,7.47 196.256,8.142 195.332,8.772L195.332,9.374L198.72,9.374L198.72,10.662L195.332,10.662L195.332,12.944C195.332,13.91 194.856,14.4 193.904,14.4L192.168,14.4L191.818,13.14C192.294,13.168 192.812,13.182 193.372,13.182C193.792,13.182 194.016,12.958 194.016,12.524L194.016,10.662L190.068,10.662L190.068,9.374Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#3C4043"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M19.526,3.635L19.526,7.718L22.044,7.718C22.644,7.718 23.14,7.516 23.532,7.113C23.935,6.711 24.137,6.231 24.137,5.676C24.137,5.132 23.935,4.658 23.532,4.254C23.14,3.841 22.644,3.634 22.044,3.634L19.526,3.634L19.526,3.635ZM19.526,9.155L19.526,13.891L18.022,13.891L18.022,2.198L22.011,2.198C23.025,2.198 23.885,2.535 24.594,3.21C25.314,3.885 25.674,4.707 25.674,5.676C25.674,6.667 25.314,7.495 24.594,8.158C23.897,8.823 23.035,9.154 22.011,9.154L19.526,9.154L19.526,9.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M27.194,11.442C27.194,11.834 27.36,12.16 27.693,12.422C28.025,12.683 28.415,12.813 28.861,12.813C29.494,12.813 30.057,12.579 30.553,12.112C31.05,11.643 31.297,11.093 31.297,10.463C30.828,10.092 30.174,9.907 29.335,9.907C28.724,9.907 28.215,10.055 27.807,10.349C27.398,10.643 27.194,11.006 27.194,11.442M29.14,5.627C30.252,5.627 31.129,5.924 31.773,6.518C32.415,7.111 32.737,7.925 32.737,8.959L32.737,13.891L31.298,13.891L31.298,12.781L31.233,12.781C30.611,13.695 29.783,14.153 28.747,14.153C27.865,14.153 27.126,13.891 26.532,13.369C25.938,12.846 25.641,12.193 25.641,11.409C25.641,10.581 25.954,9.923 26.581,9.433C27.208,8.943 28.044,8.698 29.09,8.698C29.983,8.698 30.72,8.861 31.297,9.188L31.297,8.844C31.297,8.322 31.09,7.878 30.676,7.513C30.261,7.149 29.777,6.967 29.221,6.967C28.381,6.967 27.717,7.32 27.226,8.029L25.902,7.195C26.632,6.15 27.711,5.627 29.14,5.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M40.993,5.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M13.448,8.134C13.448,7.661 13.408,7.205 13.332,6.768L6.988,6.768L6.988,9.356L10.622,9.356C10.466,10.199 9.994,10.917 9.278,11.398L9.278,13.079L11.447,13.079C12.716,11.908 13.448,10.179 13.448,8.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,14.701C8.804,14.701 10.332,14.105 11.447,13.079L9.278,11.398C8.675,11.804 7.897,12.041 6.988,12.041C5.234,12.041 3.744,10.859 3.212,9.267L0.978,9.267L0.978,10.998C2.085,13.193 4.36,14.701 6.988,14.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M3.212,9.267C3.076,8.861 3.001,8.428 3.001,7.981C3.001,7.534 3.076,7.101 3.212,6.695L3.212,4.964L0.978,4.964C0.52,5.871 0.261,6.896 0.261,7.981C0.261,9.066 0.52,10.091 0.978,10.998L3.212,9.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,3.921C7.98,3.921 8.868,4.262 9.569,4.929L9.569,4.93L11.489,3.012C10.323,1.928 8.803,1.261 6.988,1.261C4.36,1.261 2.085,2.769 0.978,4.964L3.212,6.695C3.744,5.103 5.234,3.921 6.988,3.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M49.5,0.5L49.5,17.5"
+        android:strokeLineCap="round"
+        android:fillType="evenOdd"
+        android:strokeColor="#BDC1C6"
+        android:fillColor="#00000000"
+        android:strokeWidth="1"
+        android:strokeLineJoin="round"/>
+</vector>

app/src/main/res/drawable-ko/save_to_googlepay_button_content.xml

@@ -0,0 +1,62 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="147dp"
+        android:height="18dp"
+        android:viewportWidth="147.0"
+        android:viewportHeight="18.0">
+    <path
+        android:pathData="M69.242,7.946L68.57,8.926C66.652,8.38 64.622,6.826 64.048,5.454C63.558,6.84 61.514,8.394 59.526,8.912L58.896,7.904C60.898,7.554 63.418,5.776 63.418,3.718L63.418,2.766L64.692,2.766L64.692,3.718C64.692,5.762 67.366,7.582 69.242,7.946ZM69.578,12.328L58.532,12.328L58.532,11.32L69.578,11.32L69.578,12.328ZM76.91,10.914L71.184,10.914L71.184,2.976L76.91,2.976L76.91,10.914ZM75.664,9.92L75.664,3.984L72.416,3.984L72.416,9.92L75.664,9.92ZM82.202,7.624L80.242,7.624L80.242,13.98L78.996,13.98L78.996,1.744L80.242,1.744L80.242,6.602L82.202,6.602L82.202,7.624ZM92.376,6.532L85.614,6.532L85.614,8.268L92.768,8.268L92.768,9.29L84.382,9.29L84.382,2.906L92.656,2.906L92.656,3.914L85.614,3.914L85.614,5.552L92.376,5.552L92.376,6.532ZM94.098,12.426L83.052,12.426L83.052,11.418L94.098,11.418L94.098,12.426ZM106.358,9.5L95.312,9.5L95.312,8.478L100.184,8.478L100.184,7.148L96.334,7.148L96.334,6.126L98.266,6.126L97.916,3.9L99.148,3.718L99.428,6.126L102.186,6.126L102.494,3.704L103.74,3.886L103.32,6.126L105.28,6.126L105.28,7.148L101.43,7.148L101.43,8.478L106.358,8.478L106.358,9.5ZM105.084,13.616L96.74,13.616L96.74,10.368L97.972,10.368L97.972,12.622L105.084,12.622L105.084,13.616ZM105.294,3.284L96.32,3.284L96.32,2.29L105.294,2.29L105.294,3.284ZM110.484,2.71C112.192,2.71 113.074,4.32 113.172,6.518L114.362,6.518L114.362,1.982L115.538,1.982L115.538,13.406L114.362,13.406L114.362,7.54L113.172,7.54C113.06,9.71 112.178,11.292 110.484,11.292C108.664,11.292 107.796,9.43 107.796,6.98C107.796,4.544 108.664,2.71 110.484,2.71ZM111.968,6.994C111.968,5.09 111.478,3.76 110.484,3.76C109.518,3.76 109.014,5.09 109.014,6.994C109.014,8.912 109.518,10.228 110.484,10.228C111.478,10.228 111.968,8.912 111.968,6.994ZM117.904,13.98L116.728,13.98L116.728,1.744L117.904,1.744L117.904,13.98ZM130.72,10.424L129.992,11.348C128.802,10.662 127.346,9.108 126.94,7.75C126.562,9.136 125.302,10.69 123.846,11.6L123.048,10.69C124.924,9.612 126.296,7.554 126.296,5.23L126.296,4.04L123.496,4.04L123.496,3.018L130.272,3.018L130.272,4.04L127.57,4.04L127.57,5.216C127.57,7.596 128.984,9.458 130.72,10.424ZM132.064,7.148L129.6,7.148L129.6,6.098L132.064,6.098L132.064,1.744L133.31,1.744L133.31,13.98L132.064,13.98L132.064,7.148ZM145.136,11.6C145.136,13.07 143.596,13.966 141.006,13.966C138.416,13.966 136.876,13.07 136.876,11.6C136.876,10.116 138.416,9.206 141.006,9.206C143.596,9.206 145.136,10.116 145.136,11.6ZM135.546,3.606L135.546,2.584L142.224,2.584L142.224,3.606L139.55,3.606L139.55,3.942C139.55,5.678 141.02,7.036 142.406,7.456L141.72,8.45C140.628,8.016 139.452,6.966 138.934,5.846C138.542,7.022 137.226,8.268 135.966,8.786L135.224,7.82C136.82,7.246 138.29,5.678 138.29,3.97L138.29,3.606L135.546,3.606ZM143.862,11.6C143.862,10.718 142.77,10.228 141.006,10.228C139.242,10.228 138.164,10.718 138.164,11.6C138.164,12.454 139.242,12.958 141.006,12.958C142.77,12.958 143.862,12.454 143.862,11.6ZM146.816,6L144.968,6L144.968,9.276L143.736,9.276L143.736,1.744L144.968,1.744L144.968,4.964L146.816,4.964L146.816,6Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#3C4043"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M19.526,3.635L19.526,7.718L22.044,7.718C22.644,7.718 23.14,7.516 23.532,7.113C23.935,6.711 24.137,6.231 24.137,5.676C24.137,5.132 23.935,4.658 23.532,4.254C23.14,3.841 22.644,3.634 22.044,3.634L19.526,3.634L19.526,3.635ZM19.526,9.155L19.526,13.891L18.022,13.891L18.022,2.198L22.011,2.198C23.025,2.198 23.885,2.535 24.594,3.21C25.314,3.885 25.674,4.707 25.674,5.676C25.674,6.667 25.314,7.495 24.594,8.158C23.897,8.823 23.035,9.154 22.011,9.154L19.526,9.154L19.526,9.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M27.194,11.442C27.194,11.834 27.36,12.16 27.693,12.422C28.025,12.683 28.415,12.813 28.861,12.813C29.494,12.813 30.057,12.579 30.553,12.112C31.05,11.643 31.297,11.093 31.297,10.463C30.828,10.092 30.174,9.907 29.335,9.907C28.724,9.907 28.215,10.055 27.807,10.349C27.398,10.643 27.194,11.006 27.194,11.442M29.14,5.627C30.252,5.627 31.129,5.924 31.773,6.518C32.415,7.111 32.737,7.925 32.737,8.959L32.737,13.891L31.298,13.891L31.298,12.781L31.233,12.781C30.611,13.695 29.783,14.153 28.747,14.153C27.865,14.153 27.126,13.891 26.532,13.369C25.938,12.846 25.641,12.193 25.641,11.409C25.641,10.581 25.954,9.923 26.581,9.433C27.208,8.943 28.044,8.698 29.09,8.698C29.983,8.698 30.72,8.861 31.297,9.188L31.297,8.844C31.297,8.322 31.09,7.878 30.676,7.513C30.261,7.149 29.777,6.967 29.221,6.967C28.381,6.967 27.717,7.32 27.226,8.029L25.902,7.195C26.632,6.15 27.711,5.627 29.14,5.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M40.993,5.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M13.448,8.134C13.448,7.661 13.408,7.205 13.332,6.768L6.988,6.768L6.988,9.356L10.622,9.356C10.466,10.199 9.994,10.917 9.278,11.398L9.278,13.079L11.447,13.079C12.716,11.908 13.448,10.179 13.448,8.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,14.701C8.804,14.701 10.332,14.105 11.447,13.079L9.278,11.398C8.675,11.804 7.897,12.041 6.988,12.041C5.234,12.041 3.744,10.859 3.212,9.267L0.978,9.267L0.978,10.998C2.085,13.193 4.36,14.701 6.988,14.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M3.212,9.267C3.076,8.861 3.001,8.428 3.001,7.981C3.001,7.534 3.076,7.101 3.212,6.695L3.212,4.964L0.978,4.964C0.52,5.871 0.261,6.896 0.261,7.981C0.261,9.066 0.52,10.091 0.978,10.998L3.212,9.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,3.921C7.98,3.921 8.868,4.262 9.569,4.929L9.569,4.93L11.489,3.012C10.323,1.928 8.803,1.261 6.988,1.261C4.36,1.261 2.085,2.769 0.978,4.964L3.212,6.695C3.744,5.103 5.234,3.921 6.988,3.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M49.5,0.5L49.5,17.5"
+        android:strokeLineCap="round"
+        android:fillType="evenOdd"
+        android:strokeColor="#BDC1C6"
+        android:fillColor="#00000000"
+        android:strokeWidth="1"
+        android:strokeLineJoin="round"/>
+</vector>

app/src/main/res/drawable-v21/googlepay_button_background.xml

@@ -22,17 +22,16 @@
             <item
                 android:state_enabled="false"
                 android:state_focused="true"
-                android:drawable="@drawable/pay_with_google_button_background_image_focused" />
+                android:drawable="@drawable/googlepay_button_background_image_focused" />
             <item
                 android:state_enabled="false"
-                android:drawable="@drawable/pay_with_google_button_background_image" />
+                android:drawable="@drawable/googlepay_button_background_image" />
             <!-- Skipping state_pressed="true" because the ripple effect is sufficient feedback -->
             <item
                 android:state_focused="true"
-                android:drawable="@drawable/pay_with_google_button_background_image_focused" />
+                android:drawable="@drawable/googlepay_button_background_image_focused" />
             <item
-                android:drawable="@drawable/pay_with_google_button_background_image" />
+                android:drawable="@drawable/googlepay_button_background_image" />
         </selector>
     </item>
 </ripple>
-

app/src/main/res/drawable-v21/googlepay_button_no_shadow_background.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) Google
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#1f000000">
+    <item>
+        <selector xmlns:android="http://schemas.android.com/apk/res/android" >
+            <item
+                android:state_enabled="false"
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+            <item
+                android:state_enabled="false"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+            <!-- Skipping state_pressed="true" because the ripple effect is sufficient feedback -->
+            <item
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+            <item
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+        </selector>
+    </item>
+</ripple>

app/src/main/res/drawable-v21/pay_with_google_button_no_shadow_background.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#1f000000">
-    <item>
-        <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-            <item
-                android:state_enabled="false"
-                android:state_focused="true"
-                android:drawable="@drawable/pay_with_google_button_no_shadow_background_image_focused" />
-            <item
-                android:state_enabled="false"
-                android:drawable="@drawable/pay_with_google_button_no_shadow_background_image" />
-            <!-- Skipping state_pressed="true" because the ripple effect is sufficient feedback -->
-            <item
-                android:state_focused="true"
-                android:drawable="@drawable/pay_with_google_button_no_shadow_background_image_focused" />
-            <item
-                android:drawable="@drawable/pay_with_google_button_no_shadow_background_image" />
-        </selector>
-    </item>
-</ripple>
-

app/src/main/res/drawable/add_to_googlepay_button_content.xml

@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="92dp"
+        android:height="17dp"
+        android:viewportWidth="92.0"
+        android:viewportHeight="17.0">
+    <path
+        android:pathData="M3.976,2.976L5.768,2.976L9.534,13L7.798,13L6.902,10.438L2.856,10.438L1.946,13L0.21,13L3.976,2.976ZM6.37,8.982L5.306,6L4.914,4.838L4.83,4.838L4.438,6L3.374,8.982L6.37,8.982ZM11.882,12.734C11.359,12.407 10.946,11.957 10.643,11.383C10.34,10.809 10.188,10.158 10.188,9.43C10.188,8.702 10.34,8.051 10.643,7.477C10.946,6.903 11.359,6.453 11.882,6.126C12.405,5.799 12.988,5.636 13.632,5.636C14.136,5.636 14.589,5.748 14.99,5.972C15.391,6.196 15.695,6.471 15.9,6.798L15.97,6.798L15.9,5.79L15.9,2.976L17.44,2.976L17.44,13L15.97,13L15.97,12.076L15.9,12.076C15.695,12.393 15.391,12.664 14.99,12.888C14.589,13.112 14.136,13.224 13.632,13.224C12.988,13.224 12.405,13.061 11.882,12.734ZM14.899,11.516C15.221,11.32 15.48,11.04 15.676,10.676C15.872,10.312 15.97,9.897 15.97,9.43C15.97,8.963 15.872,8.55 15.676,8.191C15.48,7.832 15.221,7.554 14.899,7.358C14.577,7.162 14.229,7.064 13.856,7.064C13.483,7.064 13.133,7.162 12.806,7.358C12.479,7.554 12.218,7.832 12.022,8.191C11.826,8.55 11.728,8.963 11.728,9.43C11.728,9.897 11.826,10.312 12.022,10.676C12.218,11.04 12.479,11.32 12.806,11.516C13.133,11.712 13.483,11.81 13.856,11.81C14.229,11.81 14.577,11.712 14.899,11.516ZM20.614,12.734C20.091,12.407 19.678,11.957 19.375,11.383C19.072,10.809 18.92,10.158 18.92,9.43C18.92,8.702 19.072,8.051 19.375,7.477C19.678,6.903 20.091,6.453 20.614,6.126C21.137,5.799 21.72,5.636 22.364,5.636C22.868,5.636 23.321,5.748 23.722,5.972C24.123,6.196 24.427,6.471 24.632,6.798L24.702,6.798L24.632,5.79L24.632,2.976L26.172,2.976L26.172,13L24.702,13L24.702,12.076L24.632,12.076C24.427,12.393 24.123,12.664 23.722,12.888C23.321,13.112 22.868,13.224 22.364,13.224C21.72,13.224 21.137,13.061 20.614,12.734ZM23.631,11.516C23.953,11.32 24.212,11.04 24.408,10.676C24.604,10.312 24.702,9.897 24.702,9.43C24.702,8.963 24.604,8.55 24.408,8.191C24.212,7.832 23.953,7.554 23.631,7.358C23.309,7.162 22.961,7.064 22.588,7.064C22.215,7.064 21.865,7.162 21.538,7.358C21.211,7.554 20.95,7.832 20.754,8.191C20.558,8.55 20.46,8.963 20.46,9.43C20.46,9.897 20.558,10.312 20.754,10.676C20.95,11.04 21.211,11.32 21.538,11.516C21.865,11.712 22.215,11.81 22.588,11.81C22.961,11.81 23.309,11.712 23.631,11.516ZM33.57,12.958C33.29,12.855 33.061,12.72 32.884,12.552C32.483,12.151 32.282,11.605 32.282,10.914L32.282,7.218L31.036,7.218L31.036,5.86L32.282,5.86L32.282,3.844L33.822,3.844L33.822,5.86L35.558,5.86L35.558,7.218L33.822,7.218L33.822,10.578C33.822,10.961 33.897,11.231 34.046,11.39C34.186,11.577 34.429,11.67 34.774,11.67C34.933,11.67 35.073,11.649 35.194,11.607C35.315,11.565 35.446,11.497 35.586,11.404L35.586,12.902C35.278,13.042 34.905,13.112 34.466,13.112C34.149,13.112 33.85,13.061 33.57,12.958ZM38.312,12.727C37.743,12.396 37.299,11.941 36.982,11.362C36.665,10.783 36.506,10.139 36.506,9.43C36.506,8.721 36.665,8.077 36.982,7.498C37.299,6.919 37.743,6.464 38.312,6.133C38.881,5.802 39.525,5.636 40.244,5.636C40.963,5.636 41.607,5.804 42.176,6.14C42.745,6.476 43.189,6.933 43.506,7.512C43.823,8.091 43.982,8.73 43.982,9.43C43.982,10.139 43.823,10.783 43.506,11.362C43.189,11.941 42.745,12.396 42.176,12.727C41.607,13.058 40.963,13.224 40.244,13.224C39.525,13.224 38.881,13.058 38.312,12.727ZM41.336,11.523C41.672,11.332 41.94,11.056 42.141,10.697C42.342,10.338 42.442,9.915 42.442,9.43C42.442,8.945 42.342,8.525 42.141,8.17C41.94,7.815 41.672,7.542 41.336,7.351C41,7.16 40.636,7.064 40.244,7.064C39.852,7.064 39.488,7.16 39.152,7.351C38.816,7.542 38.548,7.815 38.347,8.17C38.146,8.525 38.046,8.945 38.046,9.43C38.046,9.915 38.146,10.338 38.347,10.697C38.548,11.056 38.816,11.332 39.152,11.523C39.488,11.714 39.852,11.81 40.244,11.81C40.636,11.81 41,11.714 41.336,11.523Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#3C4043"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M70.526,2.635L70.526,6.718L73.044,6.718C73.644,6.718 74.14,6.516 74.532,6.113C74.935,5.711 75.137,5.231 75.137,4.676C75.137,4.132 74.935,3.658 74.532,3.254C74.14,2.841 73.644,2.634 73.044,2.634L70.526,2.634L70.526,2.635ZM70.526,8.155L70.526,12.891L69.022,12.891L69.022,1.198L73.011,1.198C74.025,1.198 74.885,1.535 75.594,2.21C76.314,2.885 76.674,3.707 76.674,4.676C76.674,5.667 76.314,6.495 75.594,7.158C74.897,7.823 74.035,8.154 73.011,8.154L70.526,8.154L70.526,8.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M78.194,10.442C78.194,10.834 78.36,11.16 78.693,11.422C79.025,11.683 79.415,11.813 79.861,11.813C80.494,11.813 81.057,11.579 81.553,11.112C82.05,10.643 82.297,10.093 82.297,9.463C81.828,9.092 81.174,8.907 80.335,8.907C79.724,8.907 79.215,9.055 78.807,9.349C78.398,9.643 78.194,10.006 78.194,10.442M80.14,4.627C81.252,4.627 82.129,4.924 82.773,5.518C83.415,6.111 83.737,6.925 83.737,7.959L83.737,12.891L82.298,12.891L82.298,11.781L82.233,11.781C81.611,12.695 80.783,13.153 79.747,13.153C78.865,13.153 78.126,12.891 77.532,12.369C76.938,11.846 76.641,11.193 76.641,10.409C76.641,9.581 76.954,8.923 77.581,8.433C78.208,7.943 79.044,7.698 80.09,7.698C80.983,7.698 81.72,7.861 82.297,8.188L82.297,7.844C82.297,7.322 82.09,6.878 81.676,6.513C81.261,6.149 80.777,5.967 80.221,5.967C79.381,5.967 78.717,6.32 78.226,7.029L76.901,6.195C77.632,5.15 78.711,4.627 80.14,4.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M91.993,4.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M64.448,7.134C64.448,6.661 64.408,6.205 64.332,5.768L57.988,5.768L57.988,8.356L61.622,8.356C61.466,9.199 60.994,9.917 60.278,10.398L60.278,12.079L62.447,12.079C63.716,10.908 64.448,9.179 64.448,7.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M57.988,13.701C59.804,13.701 61.332,13.105 62.447,12.079L60.278,10.398C59.675,10.804 58.897,11.041 57.988,11.041C56.234,11.041 54.744,9.859 54.212,8.267L51.978,8.267L51.978,9.998C53.085,12.193 55.36,13.701 57.988,13.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M54.212,8.267C54.076,7.861 54.001,7.428 54.001,6.981C54.001,6.534 54.076,6.101 54.212,5.695L54.212,3.964L51.978,3.964C51.52,4.871 51.261,5.896 51.261,6.981C51.261,8.066 51.52,9.091 51.978,9.998L54.212,8.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M57.988,2.921C58.98,2.921 59.868,3.262 60.569,3.929L60.569,3.93L62.489,2.012C61.323,0.928 59.803,0.261 57.988,0.261C55.36,0.261 53.085,1.769 51.978,3.964L54.212,5.695C54.744,4.103 56.234,2.921 57.988,2.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+</vector>

app/src/main/res/drawable/buy_with_googlepay_button_content.xml

@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="102dp"
+        android:height="17dp"
+        android:viewportWidth="102.0"
+        android:viewportHeight="17.0">
+    <path
+        android:pathData="M80.526,2.635L80.526,6.718L83.044,6.718C83.644,6.718 84.14,6.516 84.532,6.113C84.935,5.711 85.137,5.231 85.137,4.676C85.137,4.132 84.935,3.658 84.532,3.254C84.14,2.841 83.644,2.634 83.044,2.634L80.526,2.634L80.526,2.635ZM80.526,8.155L80.526,12.891L79.022,12.891L79.022,1.198L83.011,1.198C84.025,1.198 84.885,1.535 85.594,2.21C86.314,2.885 86.674,3.707 86.674,4.676C86.674,5.667 86.314,6.495 85.594,7.158C84.897,7.823 84.035,8.154 83.011,8.154L80.526,8.154L80.526,8.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M88.194,10.442C88.194,10.834 88.36,11.16 88.693,11.422C89.025,11.683 89.415,11.813 89.861,11.813C90.494,11.813 91.057,11.579 91.553,11.112C92.05,10.643 92.297,10.093 92.297,9.463C91.828,9.092 91.174,8.907 90.335,8.907C89.724,8.907 89.215,9.055 88.807,9.349C88.398,9.643 88.194,10.006 88.194,10.442M90.14,4.627C91.252,4.627 92.129,4.924 92.773,5.518C93.415,6.111 93.737,6.925 93.737,7.959L93.737,12.891L92.298,12.891L92.298,11.781L92.233,11.781C91.611,12.695 90.783,13.153 89.747,13.153C88.865,13.153 88.126,12.891 87.532,12.369C86.938,11.846 86.641,11.193 86.641,10.409C86.641,9.581 86.954,8.923 87.581,8.433C88.208,7.943 89.044,7.698 90.09,7.698C90.983,7.698 91.72,7.861 92.297,8.188L92.297,7.844C92.297,7.322 92.09,6.878 91.676,6.513C91.261,6.149 90.777,5.967 90.221,5.967C89.381,5.967 88.717,6.32 88.226,7.029L86.902,6.195C87.632,5.15 88.711,4.627 90.14,4.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M101.993,4.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M74.448,7.134C74.448,6.661 74.408,6.205 74.332,5.768L67.988,5.768L67.988,8.356L71.622,8.356C71.466,9.199 70.994,9.917 70.278,10.398L70.278,12.079L72.447,12.079C73.716,10.908 74.448,9.179 74.448,7.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M67.988,13.701C69.804,13.701 71.332,13.105 72.447,12.079L70.278,10.398C69.675,10.804 68.897,11.041 67.988,11.041C66.234,11.041 64.744,9.859 64.212,8.267L61.978,8.267L61.978,9.998C63.085,12.193 65.36,13.701 67.988,13.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M64.212,8.267C64.076,7.861 64.001,7.428 64.001,6.981C64.001,6.534 64.076,6.101 64.212,5.695L64.212,3.964L61.978,3.964C61.52,4.871 61.261,5.896 61.261,6.981C61.261,8.066 61.52,9.091 61.978,9.998L64.212,8.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M67.988,2.921C68.98,2.921 69.868,3.262 70.569,3.929L70.569,3.93L72.489,2.012C71.323,0.928 69.803,0.261 67.988,0.261C65.36,0.261 63.085,1.769 61.978,3.964L64.212,5.695C64.744,4.103 66.234,2.921 67.988,2.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M0.148,2.976L3.914,2.976C4.446,2.976 4.938,3.093 5.391,3.326C5.844,3.559 6.205,3.881 6.476,4.292C6.747,4.703 6.882,5.155 6.882,5.65C6.882,6.145 6.758,6.574 6.511,6.938C6.264,7.302 5.939,7.577 5.538,7.764L5.538,7.848C6.042,8.025 6.45,8.319 6.763,8.73C7.076,9.141 7.232,9.621 7.232,10.172C7.232,10.723 7.09,11.213 6.805,11.642C6.52,12.071 6.138,12.405 5.657,12.643C5.176,12.881 4.651,13 4.082,13L0.148,13L0.148,2.976ZM3.844,7.176C4.292,7.176 4.654,7.036 4.929,6.756C5.204,6.476 5.342,6.154 5.342,5.79C5.342,5.426 5.209,5.106 4.943,4.831C4.677,4.556 4.329,4.418 3.9,4.418L1.716,4.418L1.716,7.176L3.844,7.176ZM4.082,11.544C4.558,11.544 4.938,11.395 5.223,11.096C5.508,10.797 5.65,10.452 5.65,10.06C5.65,9.659 5.503,9.311 5.209,9.017C4.915,8.723 4.521,8.576 4.026,8.576L1.716,8.576L1.716,11.544L4.082,11.544ZM9.461,12.447C9.008,11.929 8.782,11.208 8.782,10.284L8.782,5.86L10.322,5.86L10.322,10.074C10.322,10.653 10.46,11.087 10.735,11.376C11.01,11.665 11.372,11.81 11.82,11.81C12.184,11.81 12.506,11.714 12.786,11.523C13.066,11.332 13.281,11.077 13.43,10.76C13.579,10.443 13.654,10.102 13.654,9.738L13.654,5.86L15.194,5.86L15.194,13L13.738,13L13.738,12.076L13.654,12.076C13.458,12.412 13.155,12.687 12.744,12.902C12.333,13.117 11.899,13.224 11.442,13.224C10.574,13.224 9.914,12.965 9.461,12.447ZM19.32,12.608L16.352,5.86L18.074,5.86L20.09,10.718L20.146,10.718L22.106,5.86L23.8,5.86L19.39,16.024L17.766,16.024L19.32,12.608ZM27.586,5.86L29.252,5.86L30.694,10.97L30.75,10.97L32.36,5.86L33.942,5.86L35.538,10.97L35.594,10.97L37.036,5.86L38.674,5.86L36.392,13L34.768,13L33.13,7.876L33.088,7.876L31.464,13L29.868,13L27.586,5.86ZM39.965,4.523C39.764,4.322 39.664,4.077 39.664,3.788C39.664,3.499 39.764,3.254 39.965,3.053C40.166,2.852 40.411,2.752 40.7,2.752C40.989,2.752 41.234,2.852 41.435,3.053C41.636,3.254 41.736,3.499 41.736,3.788C41.736,4.077 41.636,4.322 41.435,4.523C41.234,4.724 40.989,4.824 40.7,4.824C40.411,4.824 40.166,4.724 39.965,4.523ZM39.93,5.86L41.47,5.86L41.47,13L39.93,13L39.93,5.86ZM45.498,12.958C45.218,12.855 44.989,12.72 44.812,12.552C44.411,12.151 44.21,11.605 44.21,10.914L44.21,7.218L42.964,7.218L42.964,5.86L44.21,5.86L44.21,3.844L45.75,3.844L45.75,5.86L47.486,5.86L47.486,7.218L45.75,7.218L45.75,10.578C45.75,10.961 45.825,11.231 45.974,11.39C46.114,11.577 46.357,11.67 46.702,11.67C46.861,11.67 47.001,11.649 47.122,11.607C47.243,11.565 47.374,11.497 47.514,11.404L47.514,12.902C47.206,13.042 46.833,13.112 46.394,13.112C46.077,13.112 45.778,13.061 45.498,12.958ZM49.176,2.976L50.716,2.976L50.716,5.706L50.646,6.798L50.716,6.798C50.921,6.462 51.227,6.184 51.633,5.965C52.039,5.746 52.475,5.636 52.942,5.636C53.81,5.636 54.473,5.89 54.93,6.399C55.387,6.908 55.616,7.601 55.616,8.478L55.616,13L54.076,13L54.076,8.688C54.076,8.147 53.934,7.741 53.649,7.47C53.364,7.199 52.993,7.064 52.536,7.064C52.191,7.064 51.88,7.162 51.605,7.358C51.33,7.554 51.113,7.813 50.954,8.135C50.795,8.457 50.716,8.8 50.716,9.164L50.716,13L49.176,13L49.176,2.976Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#3C4043"
+        android:strokeWidth="1"/>
+</vector>

app/src/main/res/drawable/googlepay_button_background.xml

@@ -19,17 +19,16 @@
     <item
         android:state_enabled="false"
         android:state_focused="true"
-        android:drawable="@drawable/pay_with_google_button_background_image_focused" />
+        android:drawable="@drawable/googlepay_button_background_image_focused" />
     <item
         android:state_enabled="false"
-        android:drawable="@drawable/pay_with_google_button_background_image" />
+        android:drawable="@drawable/googlepay_button_background_image" />
     <item
         android:state_pressed="true"
-        android:drawable="@drawable/pay_with_google_button_background_image_pressed" />
+        android:drawable="@drawable/googlepay_button_background_image_pressed" />
     <item
         android:state_focused="true"
-        android:drawable="@drawable/pay_with_google_button_background_image_focused" />
+        android:drawable="@drawable/googlepay_button_background_image_focused" />
     <item
-        android:drawable="@drawable/pay_with_google_button_background_image" />
+        android:drawable="@drawable/googlepay_button_background_image" />
 </selector>
-

app/src/main/res/drawable/googlepay_button_content.xml

@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="41dp"
+        android:height="17dp"
+        android:viewportWidth="41.0"
+        android:viewportHeight="17.0">
+    <path
+        android:pathData="M19.526,2.635L19.526,6.718L22.044,6.718C22.644,6.718 23.14,6.516 23.532,6.113C23.935,5.711 24.137,5.231 24.137,4.676C24.137,4.132 23.935,3.658 23.532,3.254C23.14,2.841 22.644,2.634 22.044,2.634L19.526,2.634L19.526,2.635ZM19.526,8.155L19.526,12.891L18.022,12.891L18.022,1.198L22.011,1.198C23.025,1.198 23.885,1.535 24.594,2.21C25.314,2.885 25.674,3.707 25.674,4.676C25.674,5.667 25.314,6.495 24.594,7.158C23.897,7.823 23.035,8.154 22.011,8.154L19.526,8.154L19.526,8.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M27.194,10.442C27.194,10.834 27.36,11.16 27.693,11.422C28.025,11.683 28.415,11.813 28.861,11.813C29.494,11.813 30.057,11.579 30.553,11.112C31.05,10.643 31.297,10.093 31.297,9.463C30.828,9.092 30.174,8.907 29.335,8.907C28.724,8.907 28.215,9.055 27.807,9.349C27.398,9.643 27.194,10.006 27.194,10.442M29.14,4.627C30.252,4.627 31.129,4.924 31.773,5.518C32.415,6.111 32.737,6.925 32.737,7.959L32.737,12.891L31.298,12.891L31.298,11.781L31.233,11.781C30.611,12.695 29.783,13.153 28.747,13.153C27.865,13.153 27.126,12.891 26.532,12.369C25.938,11.846 25.641,11.193 25.641,10.409C25.641,9.581 25.954,8.923 26.581,8.433C27.208,7.943 28.044,7.698 29.09,7.698C29.983,7.698 30.72,7.861 31.297,8.188L31.297,7.844C31.297,7.322 31.09,6.878 30.676,6.513C30.261,6.149 29.777,5.967 29.221,5.967C28.381,5.967 27.717,6.32 27.226,7.029L25.902,6.195C26.632,5.15 27.711,4.627 29.14,4.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M40.993,4.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M13.448,7.134C13.448,6.661 13.408,6.205 13.332,5.768L6.988,5.768L6.988,8.356L10.622,8.356C10.466,9.199 9.994,9.917 9.278,10.398L9.278,12.079L11.447,12.079C12.716,10.908 13.448,9.179 13.448,7.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,13.701C8.804,13.701 10.332,13.105 11.447,12.079L9.278,10.398C8.675,10.804 7.897,11.041 6.988,11.041C5.234,11.041 3.744,9.859 3.212,8.267L0.978,8.267L0.978,9.998C2.085,12.193 4.36,13.701 6.988,13.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M3.212,8.267C3.076,7.861 3.001,7.428 3.001,6.981C3.001,6.534 3.076,6.101 3.212,5.695L3.212,3.964L0.978,3.964C0.52,4.871 0.261,5.896 0.261,6.981C0.261,8.066 0.52,9.091 0.978,9.998L3.212,8.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,2.921C7.98,2.921 8.868,3.262 9.569,3.929L9.569,3.93L11.489,2.012C10.323,0.928 8.803,0.261 6.988,0.261C4.36,0.261 2.085,1.769 0.978,3.964L3.212,5.695C3.744,4.103 5.234,2.921 6.988,2.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+</vector>

app/src/main/res/drawable/googlepay_button_no_shadow_background.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) Google
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:state_enabled="false"
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+    <item
+        android:state_enabled="false"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_pressed" />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+    <item
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+</selector>

app/src/main/res/drawable/pay_with_google_button_no_shadow_background.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:drawable="@drawable/pay_with_google_button_no_shadow_background_image_focused" />
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/pay_with_google_button_no_shadow_background_image" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/pay_with_google_button_no_shadow_background_image_pressed" />
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/pay_with_google_button_no_shadow_background_image_focused" />
-    <item
-        android:drawable="@drawable/pay_with_google_button_no_shadow_background_image" />
-</selector>
-

app/src/main/res/drawable/pay_with_google_button_short_content.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) Google
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="49dp"
-        android:height="17dp"
-        android:viewportWidth="49.0"
-        android:viewportHeight="17.0">
-    <path
-        android:pathData="M26.148,2.976L29.62,2.976C30.208,2.976 30.752,3.107 31.251,3.368C31.75,3.629 32.147,3.993 32.441,4.46C32.735,4.927 32.882,5.454 32.882,6.042C32.882,6.63 32.735,7.157 32.441,7.624C32.147,8.091 31.75,8.455 31.251,8.716C30.752,8.977 30.208,9.108 29.62,9.108L27.716,9.108L27.716,13L26.148,13L26.148,2.976ZM29.648,7.624C29.993,7.624 30.292,7.547 30.544,7.393C30.796,7.239 30.987,7.041 31.118,6.798C31.249,6.555 31.314,6.303 31.314,6.042C31.314,5.781 31.249,5.529 31.118,5.286C30.987,5.043 30.796,4.847 30.544,4.698C30.292,4.549 29.993,4.474 29.648,4.474L27.716,4.474L27.716,7.624L29.648,7.624ZM34.964,12.923C34.563,12.722 34.25,12.438 34.026,12.069C33.802,11.7 33.69,11.283 33.69,10.816C33.69,10.079 33.968,9.495 34.523,9.066C35.078,8.637 35.781,8.422 36.63,8.422C37.05,8.422 37.428,8.462 37.764,8.541C38.1,8.62 38.366,8.707 38.562,8.8L38.562,8.436C38.562,7.997 38.399,7.64 38.072,7.365C37.745,7.09 37.325,6.952 36.812,6.952C36.448,6.952 36.105,7.031 35.783,7.19C35.461,7.349 35.202,7.568 35.006,7.848L33.928,7.022C34.245,6.583 34.656,6.243 35.16,6C35.664,5.757 36.224,5.636 36.84,5.636C37.876,5.636 38.674,5.89 39.234,6.399C39.794,6.908 40.074,7.624 40.074,8.548L40.074,13L38.562,13L38.562,12.146L38.492,12.146C38.287,12.454 37.997,12.711 37.624,12.916C37.251,13.121 36.821,13.224 36.336,13.224C35.823,13.224 35.365,13.124 34.964,12.923ZM37.61,11.684C37.909,11.507 38.142,11.269 38.31,10.97C38.478,10.671 38.562,10.349 38.562,10.004C38.347,9.883 38.098,9.785 37.813,9.71C37.528,9.635 37.232,9.598 36.924,9.598C36.345,9.598 35.921,9.712 35.65,9.941C35.379,10.17 35.244,10.466 35.244,10.83C35.244,11.157 35.37,11.425 35.622,11.635C35.874,11.845 36.201,11.95 36.602,11.95C36.975,11.95 37.311,11.861 37.61,11.684ZM43.948,12.608L40.98,5.86L42.702,5.86L44.718,10.718L44.774,10.718L46.734,5.86L48.428,5.86L44.018,16.024L42.394,16.024L43.948,12.608Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#3C4043"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M15.2,8.17C15.2,7.639 15.152,7.127 15.064,6.636L8,6.636L8,9.538L12.036,9.538C11.863,10.475 11.334,11.269 10.54,11.801L10.54,13.683L12.964,13.683C14.382,12.377 15.2,10.455 15.2,8.17L15.2,8.17Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#4285F4"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M8,15.5C10.025,15.5 11.723,14.828 12.964,13.683L10.54,11.801C9.868,12.251 9.009,12.517 8,12.517C6.047,12.517 4.393,11.198 3.803,9.425L1.298,9.425L1.298,11.368C2.532,13.819 5.068,15.5 8,15.5Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#34A853"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M3.803,9.425C3.653,8.975 3.568,8.494 3.568,8C3.568,7.506 3.653,7.025 3.803,6.575L3.803,4.632L1.298,4.632C0.79,5.644 0.5,6.79 0.5,8C0.5,9.21 0.79,10.356 1.298,11.368L3.803,9.425Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FBBC05"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M8,3.483C9.101,3.483 10.09,3.861 10.867,4.605L13.018,2.453C11.719,1.243 10.022,0.5 8,0.5C5.068,0.5 2.532,2.181 1.298,4.632L3.803,6.575C4.393,4.802 6.047,3.483 8,3.483Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#EA4335"
-        android:strokeWidth="1"/>
-</vector>

app/src/main/res/layout/activity_checkout.xml

@@ -67,19 +67,19 @@
             android:layout_marginTop="@dimen/margin_xlarge">
 
             <include
-                android:id="@+id/pwg_button"
-                layout="@layout/pay_with_google_button"
+                android:id="@+id/googlepay_button"
+                layout="@layout/googlepay_button"
                 android:layout_width="@dimen/buy_button_width"
                 android:layout_height="@dimen/buy_button_height"
                 android:visibility="gone" />
 
             <TextView
-                android:id="@+id/pwg_status"
+                android:id="@+id/googlepay_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:text="@string/pwg_status_checking" />
+                android:text="@string/googlepay_status_checking" />
         </FrameLayout>
 
     </LinearLayout>

app/src/main/res/layout/add_to_googlepay_button.xml

@@ -20,9 +20,9 @@
     android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="48sp"
-    android:background="@drawable/pay_with_google_button_background"
+    android:background="@drawable/googlepay_button_background"
     android:padding="4dp"
-    android:contentDescription="@string/pay_with_google_content_description">
+    android:contentDescription="@string/add_to_googlepay_button_content_description">
     <LinearLayout
         android:duplicateParentState="true"
         android:layout_width="match_parent"
@@ -36,12 +36,12 @@
             android:layout_height="0dp"
             android:scaleType="fitCenter"
             android:duplicateParentState="true"
-            android:src="@drawable/pay_with_google_button_content"/>
+            android:src="@drawable/add_to_googlepay_button_content"/>
     </LinearLayout>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:duplicateParentState="true"
-        android:src="@drawable/pay_with_google_button_overlay"/>
+        android:src="@drawable/googlepay_button_overlay"/>
 </RelativeLayout>

app/src/main/res/layout/add_to_googlepay_button_no_shadow.xml

@@ -20,8 +20,8 @@
     android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="40sp"
-    android:background="@drawable/pay_with_google_button_no_shadow_background"
-    android:contentDescription="@string/pay_with_google_content_description">
+    android:background="@drawable/googlepay_button_no_shadow_background"
+    android:contentDescription="@string/add_to_googlepay_button_content_description">
     <LinearLayout
         android:duplicateParentState="true"
         android:layout_width="match_parent"
@@ -35,12 +35,12 @@
             android:layout_height="0dp"
             android:scaleType="fitCenter"
             android:duplicateParentState="true"
-            android:src="@drawable/pay_with_google_button_content"/>
+            android:src="@drawable/add_to_googlepay_button_content"/>
     </LinearLayout>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:duplicateParentState="true"
-        android:src="@drawable/pay_with_google_button_overlay"/>
+        android:src="@drawable/googlepay_button_overlay"/>
 </RelativeLayout>

app/src/main/res/layout/buy_with_googlepay_button.xml

@@ -20,9 +20,9 @@
     android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="48sp"
-    android:background="@drawable/pay_with_google_button_background"
+    android:background="@drawable/googlepay_button_background"
     android:padding="4dp"
-    android:contentDescription="@string/pay_with_google_content_description">
+    android:contentDescription="@string/buy_with_googlepay_button_content_description">
     <LinearLayout
         android:duplicateParentState="true"
         android:layout_width="match_parent"
@@ -36,12 +36,12 @@
             android:layout_height="0dp"
             android:scaleType="fitCenter"
             android:duplicateParentState="true"
-            android:src="@drawable/pay_with_google_button_short_content"/>
+            android:src="@drawable/buy_with_googlepay_button_content"/>
     </LinearLayout>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:duplicateParentState="true"
-        android:src="@drawable/pay_with_google_button_overlay"/>
+        android:src="@drawable/googlepay_button_overlay"/>
 </RelativeLayout>

app/src/main/res/layout/buy_with_googlepay_button_no_shadow.xml

@@ -20,8 +20,8 @@
     android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="40sp"
-    android:background="@drawable/pay_with_google_button_no_shadow_background"
-    android:contentDescription="@string/pay_with_google_content_description">
+    android:background="@drawable/googlepay_button_no_shadow_background"
+    android:contentDescription="@string/buy_with_googlepay_button_content_description">
     <LinearLayout
         android:duplicateParentState="true"
         android:layout_width="match_parent"
@@ -35,12 +35,12 @@
             android:layout_height="0dp"
             android:scaleType="fitCenter"
             android:duplicateParentState="true"
-            android:src="@drawable/pay_with_google_button_short_content"/>
+            android:src="@drawable/buy_with_googlepay_button_content"/>
     </LinearLayout>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:duplicateParentState="true"
-        android:src="@drawable/pay_with_google_button_overlay"/>
+        android:src="@drawable/googlepay_button_overlay"/>
 </RelativeLayout>

app/src/main/res/layout/googlepay_button.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) Google
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true"
+    android:focusable="true"
+    android:layout_width="match_parent"
+    android:layout_height="48sp"
+    android:background="@drawable/googlepay_button_background"
+    android:padding="4dp"
+    android:contentDescription="@string/googlepay_button_content_description">
+    <LinearLayout
+        android:duplicateParentState="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:weightSum="2"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+        <ImageView
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:scaleType="fitCenter"
+            android:duplicateParentState="true"
+            android:src="@drawable/googlepay_button_content"/>
+    </LinearLayout>
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        android:duplicateParentState="true"
+        android:src="@drawable/googlepay_button_overlay"/>
+</RelativeLayout>