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

Commit 1a689691 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Reintroduced the clear all button" into lmp-dev

parents 3c153519 eceda3d8

packages/SystemUI/res/drawable/ic_clear_all.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  ~ 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

  -->

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

    <size

        android:width="32dp"

        android:height="32dp"/>



    <viewport

        android:viewportWidth="48.0"

        android:viewportHeight="48.0"/>



    <path

        android:fill="#FFFFFFFF"

        android:pathData="M10.0,26.0l28.0,0.0l0.0,-4.0L10.0,22.0L10.0,26.0zM6.0,34.0l28.0,0.0l0.0,-4.0L6.0,30.0L6.0,34.0zM14.0,14.0l0.0,4.0l28.0,0.0l0.0,-4.0L14.0,14.0z"/>

</vector>

packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<!--

  ~ 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

  -->



<!-- Extends Framelayout -->

<com.android.systemui.statusbar.DismissView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone"

        >

    <Button

            android:id="@+id/dismiss_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="0dp"

            android:textColor="#ffffffff"

            android:text="@string/clear_all_notifications_text"

            android:textSize="18sp"

            android:textAllCaps="true"

            android:paddingTop="@dimen/clear_all_padding_top"

            android:paddingEnd="8dp"

            android:layout_gravity="end|center_vertical"

            android:drawableEnd="@drawable/ic_clear_all"

            android:drawablePadding="4dp"

            android:fontFamily="sans-serif-light"

            android:background="@drawable/ripple_drawable" />

</com.android.systemui.statusbar.DismissView>

packages/SystemUI/res/layout/super_status_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ 
    <com.android.systemui.statusbar.phone.PanelHolder

        android:id="@+id/panel_holder"

        android:layout_width="match_parent"

        android:layout_height="match_parent" >

        android:layout_height="match_parent"

        android:background="@color/transparent" >

        <include layout="@layout/status_bar_expanded"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -371,6 +371,9 @@ 
    <!-- Battery level padding end when in expanded QS (but not on Keyguard) -->

    <dimen name="battery_level_padding_end">4dp</dimen>



    <!-- The top padding of the clear all button -->

    <dimen name="clear_all_padding_top">4dp</dimen>



    <!-- Largest size an avatar might need to be drawn in the user picker, status bar, or

         quick settings header -->

    <dimen name="max_avatar_size">48dp</dimen>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -732,6 +732,9 @@ 
    <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->

    <string name="media_projection_remember_text">Don\'t show again</string>



    <!-- The text to clear all notifications. [CHAR LIMIT=60] -->

    <string name="clear_all_notifications_text">Clear all</string>



    <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->

    <string name="media_projection_action_text">Start now</string>

</resources>