diff options
| author | Abodunrinwa Toki <toki@google.com> | 2015-04-30 16:25:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 16:25:08 +0000 |
| commit | 9d0b4d9eb6be89a03c3a93728157660c8445ca1b (patch) | |
| tree | 907568f564638b3b1bcdd07218be529804303ac8 /core/res | |
| parent | 5d957de6db6189ba4e067d35cc11f8c0b725d5c0 (diff) | |
| parent | 74f745fe887528354bc2a48267e59141d565ebc3 (diff) | |
| download | frameworks_base-9d0b4d9eb6be89a03c3a93728157660c8445ca1b.zip frameworks_base-9d0b4d9eb6be89a03c3a93728157660c8445ca1b.tar.gz frameworks_base-9d0b4d9eb6be89a03c3a93728157660c8445ca1b.tar.bz2 | |
am 74f745fe: am d0363bc3: am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
* commit '74f745fe887528354bc2a48267e59141d565ebc3':
Use theme attributes for FloatingToolbar colors.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/floating_popup_container.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/floating_popup_menu_button.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/floating_popup_overflow_list_item | 2 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/core/res/res/layout/floating_popup_container.xml b/core/res/res/layout/floating_popup_container.xml index e1af94c..c2b4ccc 100644 --- a/core/res/res/layout/floating_popup_container.xml +++ b/core/res/res/layout/floating_popup_container.xml @@ -24,4 +24,4 @@ android:elevation="2dp" android:focusable="true" android:focusableInTouchMode="true" - android:background="@color/floating_toolbar_background_color"/> + android:background="?attr/colorBackgroundFloating"/> diff --git a/core/res/res/layout/floating_popup_menu_button.xml b/core/res/res/layout/floating_popup_menu_button.xml index 70227fa..23ae7f0 100644 --- a/core/res/res/layout/floating_popup_menu_button.xml +++ b/core/res/res/layout/floating_popup_menu_button.xml @@ -29,5 +29,5 @@ android:fontFamily="sans-serif" android:textSize="@dimen/floating_toolbar_text_size" android:textAllCaps="true" - android:textColor="@color/floating_toolbar_text_color" + android:textColor="?attr/colorForeground" android:background="?attr/selectableItemBackground" /> diff --git a/core/res/res/layout/floating_popup_overflow_list_item b/core/res/res/layout/floating_popup_overflow_list_item index c0db1bd..59a6d7e 100644 --- a/core/res/res/layout/floating_popup_overflow_list_item +++ b/core/res/res/layout/floating_popup_overflow_list_item @@ -31,5 +31,5 @@ android:ellipsize="end" android:fontFamily="sans-serif" android:textSize="@dimen/floating_toolbar_text_size" - android:textColor="@color/floating_toolbar_text_color" + android:textColor="?attr/colorForeground" android:textAllCaps="true" /> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index f1d2242..b9825c5 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -174,8 +174,4 @@ <color name="Pink_800">#ffad1457</color> <color name="Red_700">#ffc53929</color> <color name="Red_800">#ffb93221</color> - - <!-- Floating toolbar colors --> - <color name="floating_toolbar_text_color">#DD000000</color> - <color name="floating_toolbar_background_color">#FAFAFA</color> </resources> |