Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dedbffac authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am a9f3d599: Merge "Make header card look clickable." 

* commit 'a9f3d5990208ac9919f3d5cf5270b5b6c7b323b2':
  Make header card look clickable.
parents 52cb4ef7 b5e17a04

packages/SystemUI/res/drawable/notification_header_bg.xml

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
<?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

packages/SystemUI/res/layout/status_bar_expanded.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,8 @@ 
    <include layout="@layout/status_bar_expanded_header"

    <include layout="@layout/status_bar_expanded_header"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_header_height"

        android:layout_height="@dimen/status_bar_header_height"

        android:layout_marginLeft="@dimen/notification_side_padding"

        android:layout_marginRight="@dimen/notification_side_padding"

        />

        />





    <include

    <include

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
    android:orientation="horizontal"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:baselineAligned="false"

    android:baselineAligned="false"

    android:elevation="14dp"

    >

    >





    <View

    <View

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ 
    <drawable name="recents_callout_line">#99ffffff</drawable>

    <drawable name="recents_callout_line">#99ffffff</drawable>

    <drawable name="notification_item_background_legacy_color">#ffaaaaaa</drawable>

    <drawable name="notification_item_background_legacy_color">#ffaaaaaa</drawable>

    <drawable name="heads_up_notification_bg_pressed">#ff33B5E5</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">#A0000000</color>

    <color name="notification_panel_scrim_color_keyguard">#80000000</color>

    <color name="notification_panel_scrim_color_keyguard">#80000000</color>

    <color name="batterymeter_frame_color">#66FFFFFF</color><!-- 40% white -->

    <color name="batterymeter_frame_color">#66FFFFFF</color><!-- 40% white -->