Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2

This commit is contained in:
Ben Komalo 2011-05-25 09:42:10 -07:00 committed by Android (Google) Code Review
commit a40be727bb
39 changed files with 20 additions and 34 deletions

View File

@ -53,6 +53,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_inte
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
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.
-->
<!-- large, landscape -->
<resources>
<!-- Account Setup Activities -->
<dimen name="setup_padding_top">16dip</dimen>
<dimen name="setup_padding_left">64dip</dimen>
<dimen name="setup_padding_right">64dip</dimen>
</resources>

View File

@ -18,8 +18,6 @@
<resources>
<dimen name="message_compose_field_label_width">120dip</dimen>
<!-- XL activity dimensions -->
<!-- width of mailbox list -->
<dimen name="mailbox_list_width">304dip</dimen>
<!-- width of the message list, on the message list + message view mode. -->
@ -35,6 +33,7 @@
<!-- Account Setup Activities -->
<dimen name="setup_padding_top">16dip</dimen>
<dimen name="setup_padding_left">128dip</dimen>
<dimen name="setup_padding_right">128dip</dimen>
<dimen name="setup_padding_left">64dip</dimen>
<dimen name="setup_padding_right">64dip</dimen>
</resources>

View File

@ -23,4 +23,12 @@
<item name="android:layout_marginLeft">16dip</item>
<item name="android:layout_marginRight">16dip</item>
</style>
<style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
<item name="android:layout_alignParentBottom">true</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_marginBottom">48dip</item>
<item name="android:layout_marginLeft">48dip</item>
</style>
</resources>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -14,13 +14,14 @@
limitations under the License.
-->
<!-- tablet, portrait -->
<resources>
<!-- Override previous button in really large tablets -->
<style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
<item name="android:layout_alignParentBottom">true</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_marginBottom">48dip</item>
<item name="android:layout_marginLeft">48dip</item>
<item name="android:layout_toRightOf">@+id/main_content"</item>
<item name="android:layout_alignParentRight">true</item>
</style>
</resources>