Revert "Fix various text size problems when system font size is huge"
This reverts commit 19bc1921f2e15bebbde2b4172f94e9d226ab2845
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
index a3b1cf2..35b8319 100644
--- a/res/layout/action_bar_spinner.xml
+++ b/res/layout/action_bar_spinner.xml
@@ -43,7 +43,7 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/spinner_line_1"
- style="@style/AccountSpinnerAnchorTextPrimary"
+ style="@style/action_bar_spinner_primary_text"
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="@style/AccountSpinnerAnchorTextSecondary"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"
android:singleLine="true"
android:ellipsize="end"
android:includeFontPadding="false"
diff --git a/res/layout/action_bar_spinner_dropdown.xml b/res/layout/action_bar_spinner_dropdown.xml
index 41fd00c..ca550ed 100644
--- a/res/layout/action_bar_spinner_dropdown.xml
+++ b/res/layout/action_bar_spinner_dropdown.xml
@@ -20,9 +20,8 @@
-->
<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
@@ -35,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:ellipsize="end"
- style="@style/AccountSpinnerDropdownTextPrimary" />
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
<TextView
android:id="@+id/email_address"
@@ -45,7 +44,7 @@
android:layout_below="@id/display_name"
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
- style="@style/AccountSpinnerDropdownTextSecondary" />
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"/>
</RelativeLayout>
<RelativeLayout
diff --git a/res/layout/action_bar_spinner_dropdown_header.xml b/res/layout/action_bar_spinner_dropdown_header.xml
index 93b0b2f..2f4aad9 100644
--- a/res/layout/action_bar_spinner_dropdown_header.xml
+++ b/res/layout/action_bar_spinner_dropdown_header.xml
@@ -17,5 +17,4 @@
<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" />
diff --git a/res/layout/mailbox_list_header.xml b/res/layout/mailbox_list_header.xml
index b6bba17..4bef0c5 100644
--- a/res/layout/mailbox_list_header.xml
+++ b/res/layout/mailbox_list_header.xml
@@ -18,6 +18,5 @@
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" />
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index deb62c9..d4fb81f 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -23,6 +23,23 @@
<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>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index d690add..21230f6 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -132,6 +132,18 @@
<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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a9af812..c88ff59 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -169,6 +169,21 @@
<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>
diff --git a/src/com/android/email/activity/AccountSelectorAdapter.java b/src/com/android/email/activity/AccountSelectorAdapter.java
index 104010b..2ce13f6 100644
--- a/src/com/android/email/activity/AccountSelectorAdapter.java
+++ b/src/com/android/email/activity/AccountSelectorAdapter.java
@@ -219,11 +219,6 @@
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);