From f872876699a22d90bc39f7efaac5b21e224e7c82 Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Fri, 20 May 2011 17:41:07 -0700 Subject: [PATCH] DO NOT MERGE - Fix some issues with 7" layouts. - Use new recommended sw600dp instead of w600dp to avoid having the "personality" change on configuration change - remove the use of xlarge/large for specializing values since the framework team discourages any use of the buckets (and have also changed the ordering so that they take lower priority) Change-Id: Ia6943af9207471b801ce79435ffe9d730b6786b7 --- CleanSpec.mk | 2 ++ .../account_setup_basics.xml | 0 .../account_setup_exchange.xml | 0 .../account_setup_incoming.xml | 0 .../account_setup_names.xml | 0 .../account_setup_options.xml | 0 .../account_setup_outgoing.xml | 0 .../account_setup_basics.xml | 0 .../account_setup_exchange.xml | 0 .../account_setup_incoming.xml | 0 .../account_setup_names.xml | 0 .../account_setup_options.xml | 0 .../account_setup_outgoing.xml | 0 .../account_setup_account_type.xml | 0 .../account_setup_basics_common.xml | 0 .../account_setup_exchange_fragment.xml | 0 .../account_setup_incoming_fragment.xml | 0 .../account_setup_names_common.xml | 0 .../account_setup_options_common.xml | 0 .../account_setup_outgoing_fragment.xml | 0 .../action_bar_current_mailbox.xml | 0 .../message_compose.xml | 0 .../message_compose_attachment.xml | 0 .../message_view_attachment.xml | 0 .../message_view_fragment.xml | 0 .../message_view_invitation.xml | 0 .../three_pane.xml | 0 .../three_pane.xml | 0 res/values-large-land/dimen.xml | 24 ------------------- .../dimensions.xml | 7 +++--- .../styles.xml | 0 .../dimensions.xml | 0 .../styles.xml | 8 +++++++ .../bools.xml | 0 .../colors.xml | 0 .../dimensions.xml | 0 .../styles.xml | 0 .../dimen.xml | 0 .../styles.xml | 13 +++++----- 39 files changed, 20 insertions(+), 34 deletions(-) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_basics.xml (100%) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_exchange.xml (100%) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_incoming.xml (100%) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_names.xml (100%) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_options.xml (100%) rename res/{layout-w600dp-land => layout-sw600dp-land}/account_setup_outgoing.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_basics.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_exchange.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_incoming.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_names.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_options.xml (100%) rename res/{layout-w600dp-port => layout-sw600dp-port}/account_setup_outgoing.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_account_type.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_basics_common.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_exchange_fragment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_incoming_fragment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_names_common.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_options_common.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/account_setup_outgoing_fragment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/action_bar_current_mailbox.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/message_compose.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/message_compose_attachment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/message_view_attachment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/message_view_fragment.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/message_view_invitation.xml (100%) rename res/{layout-w600dp => layout-sw600dp}/three_pane.xml (100%) rename res/{layout-xlarge-land => layout-sw800dp-land}/three_pane.xml (100%) delete mode 100644 res/values-large-land/dimen.xml rename res/{values-w600dp-land => values-sw600dp-land}/dimensions.xml (91%) rename res/{values-w600dp-land => values-sw600dp-land}/styles.xml (100%) rename res/{values-w600dp-port => values-sw600dp-port}/dimensions.xml (100%) rename res/{values-w600dp-port => values-sw600dp-port}/styles.xml (74%) rename res/{values-w600dp => values-sw600dp}/bools.xml (100%) rename res/{values-w600dp => values-sw600dp}/colors.xml (100%) rename res/{values-w600dp => values-sw600dp}/dimensions.xml (100%) rename res/{values-w600dp => values-sw600dp}/styles.xml (100%) rename res/{values-xlarge-land => values-sw800dp-land}/dimen.xml (100%) rename res/{values-large-port => values-sw800dp-port}/styles.xml (70%) diff --git a/CleanSpec.mk b/CleanSpec.mk index 81f5bfd5c..89e2686ff 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 diff --git a/res/layout-w600dp-land/account_setup_basics.xml b/res/layout-sw600dp-land/account_setup_basics.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_basics.xml rename to res/layout-sw600dp-land/account_setup_basics.xml diff --git a/res/layout-w600dp-land/account_setup_exchange.xml b/res/layout-sw600dp-land/account_setup_exchange.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_exchange.xml rename to res/layout-sw600dp-land/account_setup_exchange.xml diff --git a/res/layout-w600dp-land/account_setup_incoming.xml b/res/layout-sw600dp-land/account_setup_incoming.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_incoming.xml rename to res/layout-sw600dp-land/account_setup_incoming.xml diff --git a/res/layout-w600dp-land/account_setup_names.xml b/res/layout-sw600dp-land/account_setup_names.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_names.xml rename to res/layout-sw600dp-land/account_setup_names.xml diff --git a/res/layout-w600dp-land/account_setup_options.xml b/res/layout-sw600dp-land/account_setup_options.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_options.xml rename to res/layout-sw600dp-land/account_setup_options.xml diff --git a/res/layout-w600dp-land/account_setup_outgoing.xml b/res/layout-sw600dp-land/account_setup_outgoing.xml similarity index 100% rename from res/layout-w600dp-land/account_setup_outgoing.xml rename to res/layout-sw600dp-land/account_setup_outgoing.xml diff --git a/res/layout-w600dp-port/account_setup_basics.xml b/res/layout-sw600dp-port/account_setup_basics.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_basics.xml rename to res/layout-sw600dp-port/account_setup_basics.xml diff --git a/res/layout-w600dp-port/account_setup_exchange.xml b/res/layout-sw600dp-port/account_setup_exchange.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_exchange.xml rename to res/layout-sw600dp-port/account_setup_exchange.xml diff --git a/res/layout-w600dp-port/account_setup_incoming.xml b/res/layout-sw600dp-port/account_setup_incoming.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_incoming.xml rename to res/layout-sw600dp-port/account_setup_incoming.xml diff --git a/res/layout-w600dp-port/account_setup_names.xml b/res/layout-sw600dp-port/account_setup_names.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_names.xml rename to res/layout-sw600dp-port/account_setup_names.xml diff --git a/res/layout-w600dp-port/account_setup_options.xml b/res/layout-sw600dp-port/account_setup_options.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_options.xml rename to res/layout-sw600dp-port/account_setup_options.xml diff --git a/res/layout-w600dp-port/account_setup_outgoing.xml b/res/layout-sw600dp-port/account_setup_outgoing.xml similarity index 100% rename from res/layout-w600dp-port/account_setup_outgoing.xml rename to res/layout-sw600dp-port/account_setup_outgoing.xml diff --git a/res/layout-w600dp/account_setup_account_type.xml b/res/layout-sw600dp/account_setup_account_type.xml similarity index 100% rename from res/layout-w600dp/account_setup_account_type.xml rename to res/layout-sw600dp/account_setup_account_type.xml diff --git a/res/layout-w600dp/account_setup_basics_common.xml b/res/layout-sw600dp/account_setup_basics_common.xml similarity index 100% rename from res/layout-w600dp/account_setup_basics_common.xml rename to res/layout-sw600dp/account_setup_basics_common.xml diff --git a/res/layout-w600dp/account_setup_exchange_fragment.xml b/res/layout-sw600dp/account_setup_exchange_fragment.xml similarity index 100% rename from res/layout-w600dp/account_setup_exchange_fragment.xml rename to res/layout-sw600dp/account_setup_exchange_fragment.xml diff --git a/res/layout-w600dp/account_setup_incoming_fragment.xml b/res/layout-sw600dp/account_setup_incoming_fragment.xml similarity index 100% rename from res/layout-w600dp/account_setup_incoming_fragment.xml rename to res/layout-sw600dp/account_setup_incoming_fragment.xml diff --git a/res/layout-w600dp/account_setup_names_common.xml b/res/layout-sw600dp/account_setup_names_common.xml similarity index 100% rename from res/layout-w600dp/account_setup_names_common.xml rename to res/layout-sw600dp/account_setup_names_common.xml diff --git a/res/layout-w600dp/account_setup_options_common.xml b/res/layout-sw600dp/account_setup_options_common.xml similarity index 100% rename from res/layout-w600dp/account_setup_options_common.xml rename to res/layout-sw600dp/account_setup_options_common.xml diff --git a/res/layout-w600dp/account_setup_outgoing_fragment.xml b/res/layout-sw600dp/account_setup_outgoing_fragment.xml similarity index 100% rename from res/layout-w600dp/account_setup_outgoing_fragment.xml rename to res/layout-sw600dp/account_setup_outgoing_fragment.xml diff --git a/res/layout-w600dp/action_bar_current_mailbox.xml b/res/layout-sw600dp/action_bar_current_mailbox.xml similarity index 100% rename from res/layout-w600dp/action_bar_current_mailbox.xml rename to res/layout-sw600dp/action_bar_current_mailbox.xml diff --git a/res/layout-w600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml similarity index 100% rename from res/layout-w600dp/message_compose.xml rename to res/layout-sw600dp/message_compose.xml diff --git a/res/layout-w600dp/message_compose_attachment.xml b/res/layout-sw600dp/message_compose_attachment.xml similarity index 100% rename from res/layout-w600dp/message_compose_attachment.xml rename to res/layout-sw600dp/message_compose_attachment.xml diff --git a/res/layout-w600dp/message_view_attachment.xml b/res/layout-sw600dp/message_view_attachment.xml similarity index 100% rename from res/layout-w600dp/message_view_attachment.xml rename to res/layout-sw600dp/message_view_attachment.xml diff --git a/res/layout-w600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml similarity index 100% rename from res/layout-w600dp/message_view_fragment.xml rename to res/layout-sw600dp/message_view_fragment.xml diff --git a/res/layout-w600dp/message_view_invitation.xml b/res/layout-sw600dp/message_view_invitation.xml similarity index 100% rename from res/layout-w600dp/message_view_invitation.xml rename to res/layout-sw600dp/message_view_invitation.xml diff --git a/res/layout-w600dp/three_pane.xml b/res/layout-sw600dp/three_pane.xml similarity index 100% rename from res/layout-w600dp/three_pane.xml rename to res/layout-sw600dp/three_pane.xml diff --git a/res/layout-xlarge-land/three_pane.xml b/res/layout-sw800dp-land/three_pane.xml similarity index 100% rename from res/layout-xlarge-land/three_pane.xml rename to res/layout-sw800dp-land/three_pane.xml diff --git a/res/values-large-land/dimen.xml b/res/values-large-land/dimen.xml deleted file mode 100644 index 6c4194c1b..000000000 --- a/res/values-large-land/dimen.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - 16dip - 64dip - 64dip - - diff --git a/res/values-w600dp-land/dimensions.xml b/res/values-sw600dp-land/dimensions.xml similarity index 91% rename from res/values-w600dp-land/dimensions.xml rename to res/values-sw600dp-land/dimensions.xml index a91f4eb3b..d9907dd11 100644 --- a/res/values-w600dp-land/dimensions.xml +++ b/res/values-sw600dp-land/dimensions.xml @@ -18,8 +18,6 @@ 120dip - - 304dip @@ -35,6 +33,7 @@ 16dip - 128dip - 128dip + 64dip + 64dip + diff --git a/res/values-w600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml similarity index 100% rename from res/values-w600dp-land/styles.xml rename to res/values-sw600dp-land/styles.xml diff --git a/res/values-w600dp-port/dimensions.xml b/res/values-sw600dp-port/dimensions.xml similarity index 100% rename from res/values-w600dp-port/dimensions.xml rename to res/values-sw600dp-port/dimensions.xml diff --git a/res/values-w600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml similarity index 74% rename from res/values-w600dp-port/styles.xml rename to res/values-sw600dp-port/styles.xml index 8030b0ff5..68f9ec373 100644 --- a/res/values-w600dp-port/styles.xml +++ b/res/values-sw600dp-port/styles.xml @@ -23,4 +23,12 @@ 16dip 16dip + + + diff --git a/res/values-w600dp/bools.xml b/res/values-sw600dp/bools.xml similarity index 100% rename from res/values-w600dp/bools.xml rename to res/values-sw600dp/bools.xml diff --git a/res/values-w600dp/colors.xml b/res/values-sw600dp/colors.xml similarity index 100% rename from res/values-w600dp/colors.xml rename to res/values-sw600dp/colors.xml diff --git a/res/values-w600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml similarity index 100% rename from res/values-w600dp/dimensions.xml rename to res/values-sw600dp/dimensions.xml diff --git a/res/values-w600dp/styles.xml b/res/values-sw600dp/styles.xml similarity index 100% rename from res/values-w600dp/styles.xml rename to res/values-sw600dp/styles.xml diff --git a/res/values-xlarge-land/dimen.xml b/res/values-sw800dp-land/dimen.xml similarity index 100% rename from res/values-xlarge-land/dimen.xml rename to res/values-sw800dp-land/dimen.xml diff --git a/res/values-large-port/styles.xml b/res/values-sw800dp-port/styles.xml similarity index 70% rename from res/values-large-port/styles.xml rename to res/values-sw800dp-port/styles.xml index 2c5fab4b5..8a61b9f56 100644 --- a/res/values-large-port/styles.xml +++ b/res/values-sw800dp-port/styles.xml @@ -1,5 +1,5 @@ - + + + + -