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

Commit 4c421630 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update design of channel pages."

parents 6f822c10 4253be91

res/drawable/ic_notification_alert.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

Copyright (C) 2019 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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@android:color/transparent" />

            <size

                android:height="48dp"

                android:width="48dp"/>

            <stroke android:width="1dp"

                    android:color="@color/notification_alert_color"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

            android:height="24dp"

            android:width="24dp"

            android:viewportHeight="24"

            android:viewportWidth="24">

            <path

                android:fillColor="@color/notification_alert_color"

                android:pathData="M7.58 4.08L6.15 2.65C3.75 4.48 2.17 7.3 2.03 10.5h2c.15-2.65 1.51-4.97 3.55-6.42zm12.39 6.42h2c-.15-3.2-1.73-6.02-4.12-7.85l-1.42 1.43c2.02 1.45 3.39 3.77 3.54 6.42zM18 11c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2v-5zm-6 11c.14 0 .27-.01.4-.04.65-.14 1.18-.58 1.44-1.18.1-.24.15-.5.15-.78h-4c.01 1.1.9 2 2.01 2z"/>

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

res/drawable/ic_notification_block.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

Copyright (C) 2019 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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@android:color/transparent" />

            <size

                android:height="48dp"

                android:width="48dp"/>

            <stroke android:width="1dp"

                    android:color="@color/notification_block_color"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

            android:height="24dp"

            android:width="24dp"

            android:viewportHeight="24"

            android:viewportWidth="24">

            <path

                android:fillColor="@color/notification_block_color"

                android:pathData="M12.0,2.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zM4.0,12.0c0.0,-4.42 3.58,-8.0 8.0,-8.0 1.85,0.0 3.5,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4.0,13.85 4.0,12.0zm8.0,8.0c-1.85,0.0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20.0,10.15 20.0,12.0c0.0,4.42 -3.58,8.0 -8.0,8.0z"/>

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

res/drawable/ic_notification_silence.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

Copyright (C) 2019 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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@android:color/transparent" />

            <size

                android:height="48dp"

                android:width="48dp"/>

            <stroke android:width="1dp"

                    android:color="@color/notification_silence_color"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

            android:height="24dp"

            android:width="24dp"

            android:viewportHeight="24"

            android:viewportWidth="24">

            <path

                android:fillColor="@color/notification_silence_color"

                android:pathData="M20 18.69L7.84 6.14 5.27 3.49 4 4.76l2.8 2.8v.01c-.52.99-.8 2.16-.8 3.42v5l-2 2v1h13.73l2 2L21 19.72l-1-1.03zM12 22c1.11 0 2-.89 2-2h-4c0 1.11.89 2 2 2zm6-7.32V11c0-3.08-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68c-.15.03-.29.08-.42.12-.1.03-.2.07-.3.11h-.01c-.01 0-.01 0-.02.01-.23.09-.46.2-.68.31 0 0-.01 0-.01.01L18 14.68z" />

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

res/layout/notif_importance_preference.xml

0 → 100644
+104 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 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.

  -->



<LinearLayout

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

    android:id="@+id/app_entities_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/block"

        android:layout_width="0dp"

        android:layout_weight="33.33"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:layout_marginTop="16dp"

        android:orientation="vertical"

        android:gravity="center">



        <ImageButton

            android:id="@+id/block_icon"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:src="@drawable/ic_notification_block"

            android:contentDescription="@string/notification_block_title" />

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/notification_block_title"

            android:layout_marginTop="@dimen/notification_importance_toggle_marginTop"

            android:layout_marginBottom="@dimen/notification_importance_toggle_marginBottom"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/silence"

        android:layout_width="0dp"

        android:layout_weight="33.33"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:layout_marginTop="16dp"

        android:orientation="vertical"

        android:gravity="center">



        <ImageButton

            android:id="@+id/silence_icon"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:src="@drawable/ic_notification_silence"

            android:contentDescription="@string/notification_silence_title" />

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/notification_silence_title"

            android:layout_marginTop="@dimen/notification_importance_toggle_marginTop"

            android:layout_marginBottom="@dimen/notification_importance_toggle_marginBottom"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/alert"

        android:layout_width="0dp"

        android:layout_weight="33.33"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:layout_marginTop="16dp"

        android:orientation="vertical"

        android:gravity="center">



        <ImageButton

            android:id="@+id/alert_icon"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:src="@drawable/ic_notification_alert"

            android:contentDescription="@string/notification_alert_title" />

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/notification_alert_title"

            android:layout_marginTop="@dimen/notification_importance_toggle_marginTop"

            android:layout_marginBottom="@dimen/notification_importance_toggle_marginBottom"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ 
    <color name="face_anim_particle_color_4">#fffdd835</color> <!-- Material Yellow 600 -->

    <color name="face_anim_particle_error">#ff9e9e9e</color> <!-- Material Gray 500 -->



    <!-- notification settings -->

    <color name="notification_block_color">#ffff0000</color>

    <color name="notification_silence_color">#fbbc04</color>

    <color name="notification_alert_color">#30a751</color>



    <!-- launcher icon color -->

    <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>