Merged to head

This commit is contained in:
Rodrigo Damazio
2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
+15 -38
View File
@@ -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,46 +105,23 @@ 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"/>
<RadioGroup android:id="@+id/sendtogoogle_group_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<RadioButton android:id="@+id/sendtogoogle_send_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats"/>
<RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats_and_points"
android:enabled="false"/>
</RadioGroup>
</LinearLayout>
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:paddingLeft="2dip"
android:paddingRight="2dip"
android:paddingTop="4dip">
<!-- left spacer -->
<LinearLayout style="@style/DialogButtonSpacer"/>
<Button android:id="@+id/sendtogoogle_cancel"
android:layout_gravity="left"
android:text="@string/cancel"
style="@style/DialogButton"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/sendtogoogle_send_now"
android:layout_gravity="left"
android:text="@string/send_google_send_now"
style="@style/Button"/>
<Button android:id="@+id/sendtogoogle_cancel"
android:layout_gravity="right"
android:text="@string/sendtogoogle_send_now"
style="@style/DialogButton"/>
<!-- right spacer -->
<LinearLayout style="@style/DialogButtonSpacer"/>
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>