diff options
| author | Jin Cao <jinyan@google.com> | 2014-08-11 18:11:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 17:09:02 +0000 |
| commit | c013991008a8d7baf4ae40103c150b99f0a102e8 (patch) | |
| tree | c4ad8cff8e399fe14bd1d30016f84faf411068c9 /res | |
| parent | 3ac30be5d27ce8657413fef6784655d299fff2e3 (diff) | |
| parent | 74e96c46e83c0fe24a2494be4cd43df0842573c9 (diff) | |
| download | android_packages_apps_UnifiedEmail-c013991008a8d7baf4ae40103c150b99f0a102e8.tar.gz android_packages_apps_UnifiedEmail-c013991008a8d7baf4ae40103c150b99f0a102e8.tar.bz2 android_packages_apps_UnifiedEmail-c013991008a8d7baf4ae40103c150b99f0a102e8.zip | |
Merge "Speculative fix on compose crash" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-v21/styles.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml index 814fd5cac..da4063b11 100644 --- a/res/values-v21/styles.xml +++ b/res/values-v21/styles.xml @@ -45,4 +45,8 @@ <style name="AbstractVacationResponderDateSpinnerBase" parent="android:Widget.Material.Light.Spinner" /> + + <style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextViewStyleBase"> + <item name="android:popupElevation">0dp</item> + </style> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index ba1e0911d..1afa22735 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -17,7 +17,7 @@ --> <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Compose Styles --> - <style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView"> + <style name="RecipientEditTextViewStyleBase" parent="@style/RecipientEditTextView"> <item name="android:layout_gravity">center_vertical</item> <item name="android:gravity">center_vertical</item> <item name="android:maxLines">@integer/chips_max_lines</item> @@ -25,11 +25,12 @@ <item name="android:paddingBottom">12dp</item> <item name="android:paddingLeft">0dp</item> <item name="android:paddingRight">0dp</item> - <item name="android:popupElevation">0dp</item> <item name="android:textColor">@color/compose_user_text</item> <item name="android:textSize">@dimen/compose_header_text_size</item> </style> + <style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextViewStyleBase" /> + <style name="ToRecipientEditTextViewStyle" parent="@style/RecipientEditTextViewStyle"> <item name="android:layout_width">0dp</item> <item name="android:layout_weight">1</item> |