merge heads

This commit is contained in:
Jimmy Shih
2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -26,7 +26,7 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_title"
android:text="@string/send_google_title"
android:textSize="20dip"
android:textColor="#fff"
android:layout_marginLeft="10dip"/>
@@ -55,7 +55,7 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_mymaps"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_mymaps"
android:text="@string/send_google_my_maps"
android:textSize="20dip"
android:checked="true"/>
<RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
@@ -64,11 +64,11 @@ limitations under the License.
<RadioButton android:id="@+id/sendtogoogle_create_new_map"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_create_new_map"/>
android:text="@string/send_google_new_map"/>
<RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_pick_existing_map"/>
android:text="@string/send_google_existing_map"/>
</RadioGroup>
</LinearLayout>
</TableRow>
@@ -86,7 +86,7 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_fusiontables"
android:text="@string/send_google_fusion_tables"
android:textSize="20dip"
android:checked="true"/>
</LinearLayout>
@@ -105,7 +105,7 @@ limitations under the License.
<CheckBox android:id="@+id/sendtogoogle_google_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_google_docs"
android:text="@string/send_google_docs"
android:textSize="20dip"
android:checked="true"/>
</LinearLayout>
@@ -116,11 +116,11 @@ limitations under the License.
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/sendtogoogle_send_now"
android:layout_gravity="left"
android:text="@string/sendtogoogle_send_now"
android:text="@string/send_google_send_now"
style="@style/Button"/>
<Button android:id="@+id/sendtogoogle_cancel"
android:layout_gravity="right"
android:text="@string/cancel"
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>