# Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_4_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml
22 lines
733 B
XML
22 lines
733 B
XML
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
tools:context="com.android_app.matan.ara.sagi.thesocialnotework.GmapFragment">
|
|
|
|
<!-- TODO: Update blank fragment layout -->
|
|
<fragment
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/mapFragment"
|
|
class="com.google.android.gms.maps.SupportMapFragment">
|
|
|
|
</fragment>
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:text="@string/hello_blank_fragment" />
|
|
|
|
</FrameLayout>
|