From 8c22f5bc4dd99bd28ef113398b3eda7da50bc6d9 Mon Sep 17 00:00:00 2001
From: Jan-Felix Schmakeit <jfschmakeit@google.com>
Date: Tue, 27 Oct 2015 12:28:01 +1100
Subject: [PATCH] Update comments for Maps API key string.

Change-Id: I9cf155b786dfdbc0332419838eb1b358d91e7f84
---
 ApiDemos/README.md                                 |  2 +-
 .../app/src/debug/res/values/google_maps_api.xml   | 14 +++++---------
 .../app/src/release/res/values/google_maps_api.xml |  4 ++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ApiDemos/README.md b/ApiDemos/README.md
index 04f3abda..7273666d 100644
--- a/ApiDemos/README.md
+++ b/ApiDemos/README.md
@@ -30,7 +30,7 @@ If prompted for a gradle configuration accept the default settings.
 
 Alternatively use the "gradlew build" command to build the project directly.
 
-Don't forget to add your API key to the AndroidManifest.xml.
+Don't forget to add your API key to the file ``debug/values/google_maps_api.xml`` for your debug keystore.
 (See [https://developers.google.com/maps/documentation/android/start](https://developers.google.com/maps/documentation/android/start#get_an_android_certificate_and_the_google_maps_api_key))
 
 Support
diff --git a/ApiDemos/app/src/debug/res/values/google_maps_api.xml b/ApiDemos/app/src/debug/res/values/google_maps_api.xml
index 2400f398..a50a5d1c 100644
--- a/ApiDemos/app/src/debug/res/values/google_maps_api.xml
+++ b/ApiDemos/app/src/debug/res/values/google_maps_api.xml
@@ -2,18 +2,14 @@
     <!--
     TODO: Before you run your application, you need a Google Maps API key.
 
-    To get one, follow this link, follow the directions and press "Create" at the end:
-
-    https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=A7:8A:7F:FD:01:05:0C:11:6C:A4:0F:78:37:0D:10:28:23:3B:98:E0%3Bmapdemo.example.com.googlemapsapidemos
-
-    You can also add your credentials to an existing key, using this line:
-    A7:8A:7F:FD:01:05:0C:11:6C:A4:0F:78:37:0D:10:28:23:3B:98:E0;mapdemo.example.com.googlemapsapidemos
-
-    Alternatively, follow the directions here:
-    https://developers.google.com/maps/documentation/android/start#get-key
+    See this page for more information:
+    https://developers.google.com/maps/documentation/android/start#get_an_android_certificate_and_the_google_maps_api_key
 
     Once you have your key (it starts with "AIza"), replace the "google_maps_key"
     string in this file.
+
+    Note: This resource is used for the debug build target. Update this file if you just want to run
+    the demo app.
     -->
     <string name="google_maps_key" translatable="false" templateMergeStrategy="preserve">
         YOUR_KEY_HERE
diff --git a/ApiDemos/app/src/release/res/values/google_maps_api.xml b/ApiDemos/app/src/release/res/values/google_maps_api.xml
index a533f806..f4e8c513 100644
--- a/ApiDemos/app/src/release/res/values/google_maps_api.xml
+++ b/ApiDemos/app/src/release/res/values/google_maps_api.xml
@@ -7,6 +7,10 @@
 
     Once you have your key (it starts with "AIza"), replace the "google_maps_key"
     string in this file.
+
+    Note: This resource is used for the release build target. You likely only want to update the string
+    in the debug/.../google_maps_api.xml instead if you just want to run this app.
+    (This file is used for the release target that uses the release key store.)
     -->
     <string name="google_maps_key" translatable="false" templateMergeStrategy="preserve">
         YOUR_KEY_HERE