diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-09 17:21:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 17:21:25 +0000 |
| commit | dedbffac992d9699ce36c4e49a8656b648b5b17c (patch) | |
| tree | 21d688a505ad27a4cfb80307a46209d741bf4642 /packages/SystemUI/res | |
| parent | 52cb4ef7c98654b65234033626a14d6eb0071a2b (diff) | |
| parent | b5e17a04226b931240cea1e38dd7e39750b2dbb8 (diff) | |
| download | frameworks_base-dedbffac992d9699ce36c4e49a8656b648b5b17c.zip frameworks_base-dedbffac992d9699ce36c4e49a8656b648b5b17c.tar.gz frameworks_base-dedbffac992d9699ce36c4e49a8656b648b5b17c.tar.bz2 | |
am a9f3d599: Merge "Make header card look clickable."
* commit 'a9f3d5990208ac9919f3d5cf5270b5b6c7b323b2':
Make header card look clickable.
Diffstat (limited to 'packages/SystemUI/res')
4 files changed, 34 insertions, 1 deletions
diff --git a/packages/SystemUI/res/drawable/notification_header_bg.xml b/packages/SystemUI/res/drawable/notification_header_bg.xml new file mode 100644 index 0000000..c5ba18b --- /dev/null +++ b/packages/SystemUI/res/drawable/notification_header_bg.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 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 + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <shape> + <solid android:color="#ff54656e" /> + <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" /> + </shape> + </item> + <item> + <shape> + <solid android:color="#ff374248" /> + <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 372bde2..5b3f365 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -102,6 +102,8 @@ <include layout="@layout/status_bar_expanded_header" android:layout_width="match_parent" android:layout_height="@dimen/status_bar_header_height" + android:layout_marginLeft="@dimen/notification_side_padding" + android:layout_marginRight="@dimen/notification_side_padding" /> <include diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 460dd4b..18b5293 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -25,6 +25,7 @@ android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="false" + android:elevation="14dp" > <View diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 9281265..c78ff8e 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -30,7 +30,6 @@ <drawable name="recents_callout_line">#99ffffff</drawable> <drawable name="notification_item_background_legacy_color">#ffaaaaaa</drawable> <drawable name="heads_up_notification_bg_pressed">#ff33B5E5</drawable> - <drawable name="notification_header_bg">#FF000000</drawable> <color name="notification_panel_scrim_color">#A0000000</color> <color name="notification_panel_scrim_color_keyguard">#80000000</color> <color name="batterymeter_frame_color">#66FFFFFF</color><!-- 40% white --> |