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

Commit 84395ec9 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Double tap interaction for notifications on lockscreen." into master-lockscreen-dev

parents c8fce688 251957d7

core/res/res/drawable/notification_quantum_bg.xml

+12 −2
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ 
  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_pressed="true"  android:drawable="@drawable/notification_quantum_press" />

    <item android:state_pressed="false" android:drawable="@drawable/notification_quantum_background" />

    <item android:state_pressed="true">

        <shape>

            <solid android:color="#ffd0d0d0" />

            <corners android:radius="@dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

    <item>

        <shape>

            <solid android:color="#fffafafa" />

            <corners android:radius="@dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

</selector>
 
 No newline at end of file

core/res/res/drawable/notification_quantum_background.xml→core/res/res/drawable/notification_quantum_bg_dim.xml

+11 −4
Original line number Diff line number Diff line
@@ -15,7 +15,14 @@ 
  ~ limitations under the License

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="#ffffffff" />

<touch-feedback

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="#ffffffff"

    >

    <item>

        <shape>

            <solid android:color="#f0d0d0d0" />

            <corners android:radius="@dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

</touch-feedback>
 
 No newline at end of file

core/res/res/layout/notification_template_quantum_base.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_quantum_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="64dp"

core/res/res/layout/notification_template_quantum_big_base.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_quantum_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

core/res/res/layout/notification_template_quantum_big_picture.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_quantum_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"