Merge "Pixelperfect: message compose" into honeycomb

This commit is contained in:
Makoto Onuki 2011-01-18 11:09:02 -08:00 committed by Android (Google) Code Review
commit 3407d9683e
5 changed files with 52 additions and 3 deletions

View File

@ -22,9 +22,10 @@
android:layout_width="match_parent"
>
<ScrollView
android:layout_width="@dimen/message_compose_paper_width"
android:layout_height="fill_parent"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="16dip"
style="@style/message_compose_scroll"
android:paddingTop="16dip"
android:paddingBottom="16dip"
android:paddingLeft="32dip"

View File

@ -16,7 +16,6 @@
<!-- xlarge, landscape -->
<resources>
<dimen name="message_compose_paper_width">800dip</dimen>
<dimen name="message_compose_field_label_width">120dip</dimen>
<!-- XL activity dimensions -->

View File

@ -0,0 +1,24 @@
<?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.
-->
<!-- xlarge, landscape -->
<resources>
<!-- Use fixed width in landscape -->
<style name="message_compose_scroll">
<item name="android:layout_width">800dip</item>
</style>
</resources>

View File

@ -16,7 +16,6 @@
<!-- xlarge, portrait -->
<resources>
<dimen name="message_compose_paper_width">700dip</dimen> <!-- STOPSHIP not pixelperfect -->
<dimen name="message_compose_field_label_width">120dip</dimen>
<!-- XL activity dimensions -->

View File

@ -0,0 +1,26 @@
<?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.
-->
<!-- xlarge, portrait -->
<resources>
<!-- Use fixed margin in portrait -->
<style name="message_compose_scroll">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_marginLeft">16dip</item>
<item name="android:layout_marginRight">16dip</item>
</style>
</resources>