ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d8296ff4: Merge "Fix various text size problems when system font size is huge"

Browse Source 
* commit 'd8296ff4f2137c1e72324760afc93517350450c2':
  Fix various text size problems when system font size is huge
This commit is contained in:
Vikram Aggarwal 2011-12-08 09:02:31 -08:00 committed by Android Git Automerger
commit 1010b5389f
8 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/action_bar_spinner.xml
View File

@ -43,7 +43,7 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/spinner_line_1"
style="@style/action_bar_spinner_primary_text"
style="@style/AccountSpinnerAnchorTextPrimary"
android:singleLine="true"
android:ellipsize="end"
android:includeFontPadding="false"
@ -51,7 +51,7 @@
android:layout_height="wrap_content" />
<TextView
android:id="@+id/spinner_line_2"
style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"
style="@style/AccountSpinnerAnchorTextSecondary"
android:singleLine="true"
android:ellipsize="end"
android:includeFontPadding="false"

7
res/layout/action_bar_spinner_dropdown.xml
View File

@ -20,8 +20,9 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/spinnerDropDownItemStyle"
android:layout_height="48dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dip"
android:gravity="center_vertical">
<RelativeLayout
@ -34,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:ellipsize="end"
style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
style="@style/AccountSpinnerDropdownTextPrimary" />
<TextView
android:id="@+id/email_address"
@ -44,7 +45,7 @@
android:layout_below="@id/display_name"
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"/>
style="@style/AccountSpinnerDropdownTextSecondary" />
</RelativeLayout>
<RelativeLayout

1
res/layout/action_bar_spinner_dropdown_header.xml
View File

@ -17,4 +17,5 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/display_name"
android:ellipsize="end"
android:textColor="@color/label_list_heading_text_color"
style="?android:attr/listSeparatorTextViewStyle" />

1
res/layout/mailbox_list_header.xml
View File

@ -18,5 +18,6 @@
android:id="@+id/display_name"
android:layout_width="match_parent"
android:ellipsize="end"
android:textColor="@color/label_list_heading_text_color"
style="?android:attr/listSeparatorTextViewStyle"
android:layout_marginLeft="@dimen/mailbox_list_padding_left" />

17
res/values-land/styles.xml
View File

@ -23,23 +23,6 @@
<item name="android:ellipsize">end</item>
</style>
<style name="action_bar_spinner_primary_text">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/text_primary_color</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
<style name="action_bar_spinner_secondary_text">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">12sp</item>
<item name="android:textColor">@color/text_secondary_color</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
<item name="android:layout_marginTop">-2dip</item>
</style>
<style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
<item name="android:layout_width">32dip</item>
<item name="android:layout_height">24dip</item>

12
res/values-sw600dp/styles.xml
View File

@ -132,18 +132,6 @@
<item name="android:layout_alignParentRight">true</item>
</style>
<style name="action_bar_spinner_primary_text">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">@color/text_primary_color</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
<style name="action_bar_spinner_secondary_text">
<item name="android:visibility">gone</item>
</style>
<style name="Attachment.Button" parent="@android:style/Widget.Holo.Button.Borderless">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">1</item>

15
res/values/styles.xml
View File

@ -169,21 +169,6 @@
<item name="android:ellipsize">end</item>
</style>
<style name="action_bar_spinner_primary_text">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/text_primary_color</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
<style name="action_bar_spinner_secondary_text">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/text_secondary_color</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
<item name="android:layout_marginTop">-4dip</item>
</style>
<style name="search_header">
<item name="android:layout_height">32dip</item>
<item name="android:layout_width">match_parent</item>

5
src/com/android/email/activity/AccountSelectorAdapter.java
View File

@ -219,6 +219,11 @@ public class AccountSelectorAdapter extends CursorAdapter {
return (getItemViewType(position) != AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER);
}
@Override
public boolean areAllItemsEnabled() {
return false;
}
public boolean isAccountItem(int position) {
Cursor c = getCursor();
c.moveToPosition(position);