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
This commit is contained in:
parent
faaf1e60f8
commit
f872876699
|
@ -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/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/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
|
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||||
|
|
|
@ -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>
|
|
||||||
|
|
|
@ -18,8 +18,6 @@
|
||||||
<resources>
|
<resources>
|
||||||
<dimen name="message_compose_field_label_width">120dip</dimen>
|
<dimen name="message_compose_field_label_width">120dip</dimen>
|
||||||
|
|
||||||
<!-- XL activity dimensions -->
|
|
||||||
|
|
||||||
<!-- width of mailbox list -->
|
<!-- width of mailbox list -->
|
||||||
<dimen name="mailbox_list_width">304dip</dimen>
|
<dimen name="mailbox_list_width">304dip</dimen>
|
||||||
<!-- width of the message list, on the message list + message view mode. -->
|
<!-- width of the message list, on the message list + message view mode. -->
|
||||||
|
@ -35,6 +33,7 @@
|
||||||
|
|
||||||
<!-- Account Setup Activities -->
|
<!-- Account Setup Activities -->
|
||||||
<dimen name="setup_padding_top">16dip</dimen>
|
<dimen name="setup_padding_top">16dip</dimen>
|
||||||
<dimen name="setup_padding_left">128dip</dimen>
|
<dimen name="setup_padding_left">64dip</dimen>
|
||||||
<dimen name="setup_padding_right">128dip</dimen>
|
<dimen name="setup_padding_right">64dip</dimen>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
|
@ -23,4 +23,12 @@
|
||||||
<item name="android:layout_marginLeft">16dip</item>
|
<item name="android:layout_marginLeft">16dip</item>
|
||||||
<item name="android:layout_marginRight">16dip</item>
|
<item name="android:layout_marginRight">16dip</item>
|
||||||
</style>
|
</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>
|
</resources>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -14,13 +14,14 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
<!-- tablet, portrait -->
|
||||||
|
|
||||||
<resources>
|
<resources>
|
||||||
|
<!-- Override previous button in really large tablets -->
|
||||||
<style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
|
<style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
|
||||||
<item name="android:layout_alignParentBottom">true</item>
|
<item name="android:layout_toRightOf">@+id/main_content"</item>
|
||||||
<item name="android:layout_alignParentLeft">true</item>
|
<item name="android:layout_alignParentRight">true</item>
|
||||||
<item name="android:layout_marginBottom">48dip</item>
|
|
||||||
<item name="android:layout_marginLeft">48dip</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue