diff options
author | Jin Cao <jinyan@google.com> | 2014-08-15 18:49:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 18:49:25 +0000 |
commit | 8fffd3e30a13c6de2c7379de68d159212ce025b6 (patch) | |
tree | 6f3860f45a226770362c95e14d96539f10e04470 /res | |
parent | 911f4835d79a49e1568889bb83ed4ad61df7d6d1 (diff) | |
parent | d0a35bd5785dca8981ea24b1ee1d40774568f031 (diff) | |
download | android_packages_apps_UnifiedEmail-8fffd3e30a13c6de2c7379de68d159212ce025b6.tar.gz android_packages_apps_UnifiedEmail-8fffd3e30a13c6de2c7379de68d159212ce025b6.tar.bz2 android_packages_apps_UnifiedEmail-8fffd3e30a13c6de2c7379de68d159212ce025b6.zip |
am d0a35bd5: Merge "Some styles clean up" into ub-gmail-ur14-dev
* commit 'd0a35bd5785dca8981ea24b1ee1d40774568f031':
Some styles clean up
Diffstat (limited to 'res')
-rw-r--r-- | res/values-land/styles.xml | 31 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 13 | ||||
-rw-r--r-- | res/values-sw600dp/themes.xml | 14 | ||||
-rw-r--r-- | res/values-v21/styles.xml | 13 | ||||
-rw-r--r-- | res/values-v21/themes.xml | 13 | ||||
-rw-r--r-- | res/values/styles.xml | 106 | ||||
-rw-r--r-- | res/values/themes.xml | 48 |
7 files changed, 103 insertions, 135 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml deleted file mode 100644 index 6ea58082c..000000000 --- a/res/values-land/styles.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 Google Inc. - Licensed to 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. ---> -<resources> - <!-- Compose styles --> - <style name="ComposeFieldLayout" parent="@style/ComposeFieldLayoutBase"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:addStatesFromChildren">true</item> - <item name="android:focusable">false</item> - <item name="android:focusableInTouchMode">false</item> - <item name="android:gravity">center_vertical</item> - <item name="android:paddingTop">0dp</item> - </style> - <!-- End compose styles --> - -</resources> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 3bc647fd2..3c86c8a6b 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -16,19 +16,6 @@ limitations under the License. --> <resources> - - <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> - - <!-- todo - comment out when theme exists --> - <!--<style name="ShortcutWidgetTheme" parent="@style/Theme.Appcompat.Light.Dialog.MinWidth">--> - <!--<item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>--> - <!--<item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>--> - <!--</style>--> - - <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme.Appcompat"> - <item name="android:windowBackground">@color/vacation_responder_background</item> - </style> - <style name="VacationResponderStyle"> <item name="android:paddingLeft">@dimen/vacation_responder_padding_horizontal_wide</item> <item name="android:paddingRight">@dimen/vacation_responder_padding_horizontal_wide</item> diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml new file mode 100644 index 000000000..4909a9d81 --- /dev/null +++ b/res/values-sw600dp/themes.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> + + <!-- todo - comment out when theme exists --> + <!--<style name="ShortcutWidgetTheme" parent="@style/Theme.Appcompat.Light.Dialog.MinWidth">--> + <!--<item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>--> + <!--<item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>--> + <!--</style>--> + + <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme.Appcompat"> + <item name="android:windowBackground">@color/vacation_responder_background</item> + </style> +</resources>
\ No newline at end of file diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml index da4063b11..b4390bcda 100644 --- a/res/values-v21/styles.xml +++ b/res/values-v21/styles.xml @@ -16,25 +16,12 @@ limitations under the License. --> <resources> - <style name="UnifiedEmailTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> - <item name="android:actionModeBackground">@color/action_mode_background</item> - <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item> - <item name="android:listViewWhiteStyle">@android:style/Widget.Material.Light.ListView</item> - <!-- ActionBar color --> - <item name="android:colorPrimary">@color/actionbar_color</item> - <!-- Used by the StatusBar and NavBar (currently broken?) --> - <item name="android:colorPrimaryDark">@color/statusbar_color</item> - <item name="android:colorAccent">@color/accent_blue</item> - </style> - <style name="WaitFragmentTitleBase" parent="android:Widget.Material.TextView" /> <style name="AbstractNewMessageButtonStyleBase" parent="@android:style/Widget.Material.Light.Button"> </style> - <style name="ComposeFieldLayoutBase" /> - <style name="ConversationListFadeBase" parent="android:Widget.Material.Light.ListView" /> <style name="MinTimeProgressViewStyle" parent="android:Widget.Material.Light.ProgressBar" /> diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml new file mode 100644 index 000000000..f45dd63a8 --- /dev/null +++ b/res/values-v21/themes.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="UnifiedEmailTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> + <item name="android:actionModeBackground">@color/action_mode_background</item> + <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item> + <item name="android:listViewWhiteStyle">@android:style/Widget.Material.Light.ListView</item> + <!-- ActionBar color --> + <item name="android:colorPrimary">@color/actionbar_color</item> + <!-- Used by the StatusBar and NavBar (currently broken?) --> + <item name="android:colorPrimaryDark">@color/statusbar_color</item> + <item name="android:colorAccent">@color/accent_blue</item> + </style> +</resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 5edaf030a..590038f3f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -53,7 +53,6 @@ <item name="android:paddingBottom">20dp</item> </style> - <style name="ComposeSubjectView" parent="@style/ComposeEditTextView"> <item name="android:hint">@string/subject_hint</item> <item name="android:imeOptions">actionDone|flagNoExtractUi|flagNoFullscreen</item> @@ -86,9 +85,7 @@ <item name="android:textSize">@dimen/compose_header_text_size</item> </style> - <style name="ComposeFieldLayoutBase" /> - - <style name="ComposeFieldLayout" parent="@style/ComposeFieldLayoutBase"> + <style name="ComposeFieldLayout"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:addStatesFromChildren">true</item> @@ -129,6 +126,32 @@ <item name="android:layout_marginLeft">@dimen/compose_header_btn_padding</item> </style> + <style name="AbstractComposeArea"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_gravity">center_horizontal</item> + <item name="android:animateLayoutChanges">true</item> + <item name="android:background">@android:color/white</item> + </style> + + <style name="AbstractComposeAreaWithRtl" parent="@style/AbstractComposeArea"> + <item name="android:paddingLeft">@dimen/compose_area_start_padding</item> + <item name="android:paddingRight">@dimen/compose_area_end_padding</item> + </style> + + <style name="ComposeArea" parent="AbstractComposeAreaWithRtl" /> + + <style name="ComposeAreaWrapper"> + <item name="android:layout_gravity">center_horizontal</item> + <item name="android:paddingLeft">@dimen/compose_wrapper_side_padding</item> + <item name="android:paddingRight">@dimen/compose_wrapper_side_padding</item> + <item name="android:paddingTop">@dimen/compose_wrapper_top_padding</item> + </style> + + <style name="ComposeAttachmentTileTextEndStyle"> + <item name="android:paddingRight">@dimen/compose_attachment_tile_text_end_padding</item> + </style> + <style name="AttachmentContainer"> <item name="android:background">@drawable/attachment_bg_holo</item> <item name="android:layout_width">match_parent</item> @@ -416,23 +439,6 @@ <item name="android:layout_marginTop">16dip</item> </style> - <style name="ShortcutWidgetTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> - - <style name="ComposeTheme" parent="@style/UnifiedEmailTheme.Appcompat"> - <item name="android:colorBackground">@android:color/white</item> - <item name="android:colorBackgroundCacheHint">@android:color/white</item> - <item name="android:dropDownListViewStyle">@style/ComposeDropdownListViewStyle</item> - <item name="android:windowBackground">@android:color/white</item> - </style> - - <style name="ComposeDropdownListViewStyle"> - <item name="android:dividerHeight">0dp</item> - </style> - - <style name="InvisibleShortcutWidgetTheme" parent="@style/ShortcutWidgetTheme"> - <item name="android:windowNoDisplay">true</item> - </style> - <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow"> <item name="android:src">@drawable/ic_overflow_24dp</item> </style> @@ -445,40 +451,10 @@ <item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item> </style> - <style name="ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> + <style name="ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <item name="android:background">@color/actionbar_color</item> </style> - <style name="UnifiedEmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> - <item name="android:actionBarStyle">@style/ActionBarStyle</item> - <item name="android:actionModeBackground">@color/action_mode_background</item> - <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item> - <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item> - <item name="android:listViewWhiteStyle">@android:style/Widget.Holo.Light.ListView</item> - </style> - - - <style name="UnifiedEmailTheme.Appcompat" parent="@style/Theme.AppCompat.Light.DarkActionBar"> - <item name="actionModeBackground">@color/action_mode_background</item> - <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item> - <item name="colorPrimary">@color/actionbar_color</item> - <!-- Used by the StatusBar and NavBar (currently broken?) --> - <item name="colorPrimaryDark">@color/statusbar_color</item> - <item name="colorAccent">@color/accent_blue</item> - <item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item> - </style> - - <style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/UnifiedEmailTheme.Appcompat"> - <item name="android:windowNoTitle">true</item> - <item name="windowActionBar">false</item> - <item name="windowActionModeOverlay">true</item> - </style> - - <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat.Toolbar" /> - - <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme.Appcompat"> - </style> - <style name="WaitFragmentTitleBase" parent="@android:style/Widget.Holo.TextView" /> <style name="WaitFragmentTitle" parent="@style/WaitFragmentTitleBase"> @@ -959,32 +935,6 @@ <item name="android:paddingLeft">@dimen/custom_from_inner_padding</item> </style> - <style name="AbstractComposeArea"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">center_horizontal</item> - <item name="android:animateLayoutChanges">true</item> - <item name="android:background">@android:color/white</item> - </style> - - <style name="AbstractComposeAreaWithRtl" parent="@style/AbstractComposeArea"> - <item name="android:paddingLeft">@dimen/compose_area_start_padding</item> - <item name="android:paddingRight">@dimen/compose_area_end_padding</item> - </style> - - <style name="ComposeArea" parent="AbstractComposeAreaWithRtl" /> - - <style name="ComposeAreaWrapper"> - <item name="android:layout_gravity">center_horizontal</item> - <item name="android:paddingLeft">@dimen/compose_wrapper_side_padding</item> - <item name="android:paddingRight">@dimen/compose_wrapper_side_padding</item> - <item name="android:paddingTop">@dimen/compose_wrapper_top_padding</item> - </style> - - <style name="ComposeAttachmentTileTextEndStyle"> - <item name="android:paddingRight">@dimen/compose_attachment_tile_text_end_padding</item> - </style> - <style name="FolderTeaserLabelMarginStyle"> <item name="android:layout_marginLeft">@dimen/folder_teaser_label_start_padding</item> <item name="android:layout_marginRight">@dimen/folder_teaser_label_end_padding</item> diff --git a/res/values/themes.xml b/res/values/themes.xml new file mode 100644 index 000000000..4b34591ed --- /dev/null +++ b/res/values/themes.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="UnifiedEmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> + <item name="android:actionBarStyle">@style/ActionBarStyle</item> + <item name="android:actionModeBackground">@color/action_mode_background</item> + <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item> + <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item> + <item name="android:listViewWhiteStyle">@android:style/Widget.Holo.Light.ListView</item> + </style> + + <style name="UnifiedEmailTheme.Appcompat" parent="@style/Theme.AppCompat.Light.DarkActionBar"> + <item name="actionModeBackground">@color/action_mode_background</item> + <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item> + <item name="colorPrimary">@color/actionbar_color</item> + <!-- Used by the StatusBar and NavBar (currently broken?) --> + <item name="colorPrimaryDark">@color/statusbar_color</item> + <item name="colorAccent">@color/accent_blue</item> + <item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item> + </style> + + <style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/UnifiedEmailTheme.Appcompat"> + <item name="android:windowNoTitle">true</item> + <item name="windowActionBar">false</item> + <item name="windowActionModeOverlay">true</item> + </style> + + <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat.Toolbar" /> + + <style name="ComposeTheme" parent="@style/UnifiedEmailTheme.Appcompat"> + <item name="android:colorBackground">@android:color/white</item> + <item name="android:colorBackgroundCacheHint">@android:color/white</item> + <item name="android:dropDownListViewStyle">@style/ComposeDropdownListViewStyle</item> + <item name="android:windowBackground">@android:color/white</item> + </style> + + <style name="ComposeDropdownListViewStyle"> + <item name="android:dividerHeight">0dp</item> + </style> + + <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> + + <style name="ShortcutWidgetTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> + + <style name="InvisibleShortcutWidgetTheme" parent="@style/ShortcutWidgetTheme"> + <item name="android:windowNoDisplay">true</item> + </style> + +</resources>
\ No newline at end of file |