merge heads

2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+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:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+  <!-- apiKey corresponds to certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
+  <com.google.android.maps.MapView
+    android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"
+    android:clickable="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:id="@+id/map_view"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent" />
+  <TextView
+    android:background="@color/background_warning"
+    android:drawableLeft="@android:drawable/ic_dialog_alert"
+    android:gravity="center"
+    android:id="@+id/map_message"
+    android:layout_alignParentTop="true"
+    android:layout_width="fill_parent"
+    android:padding="8dp"
+    android:textColor="@android:color/primary_text_dark"
+    android:visibility="gone"
+    style="@style/TextMedium.WithIcon" />
+</RelativeLayout>