Merge commit 'a9dde5b94b753eb43dcb1fffe4f4fc0cb934fa8d' into HEAD

devrel-build · devrel-build · commit feffd7e0dbb6 · 2015-10-27T02:33:36.000Z
diff --git a/AndroidWearMap/Wearable/src/main/java/com/example/androidwearmap/MainActivity.java b/AndroidWearMap/Wearable/src/main/java/com/example/androidwearmap/MainActivity.java
@@ -23,6 +23,7 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.wearable.activity.WearableActivity;
 import android.support.wearable.view.DismissOverlayView;
diff --git a/AndroidWearMap/Wearable/src/main/res/layout/activity_main.xml b/AndroidWearMap/Wearable/src/main/res/layout/activity_main.xml
@@ -17,28 +17,28 @@
   limitations under the License.
   -->
 
-<FrameLayout android:id="@+id/root_container"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:map="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/root_container"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
 
     <FrameLayout
-        android:id="@+id/map_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            android:id="@+id/map_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
         <fragment
-            android:id="@+id/map"
-            android:name="com.google.android.gms.maps.MapFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            map:ambientEnabled="true" />
+                android:id="@+id/map"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:name="com.google.android.gms.maps.MapFragment"/>
 
     </FrameLayout>
 
     <android.support.wearable.view.DismissOverlayView
-        android:id="@+id/dismiss_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+            android:id="@+id/dismiss_overlay"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"/>
 </FrameLayout>
