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

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

Merge "DND ixD changes"

parents 085dcc37 036d7e0b

res/drawable/ic_event.xml

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

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

        <shape android:shape="oval">

            <solid

                android:color="?android:attr/colorAccent" />

            <size

                android:width="@dimen/dashboard_tile_image_size"

                android:height="@dimen/dashboard_tile_image_size" />

        </shape>

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_event_white" />

</layer-list>

res/drawable/ic_event_white.xml

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

Copyright (C) 2018 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"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M17.0,12.0l-5.0,0.0l0.0,5.0l5.0,0.0l0.0,-5.0zM16.0,1.0l0.0,2.0L8.0,3.0L8.0,1.0L6.0,1.0l0.0,2.0L5.0,3.0c-1.11,0.0 -1.9,0.9 -1.99,2.0L3.0,19.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-1.0,0.0L18.0,1.0l-2.0,0.0zm3.0,18.0L5.0,19.0L5.0,8.0l14.0,0.0l0.0,11.0z"/>

</vector>

res/drawable/ic_timelapse.xml

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

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

        <shape android:shape="oval">

            <solid

                android:color="?android:attr/colorAccent" />

            <size

                android:width="@dimen/dashboard_tile_image_size"

                android:height="@dimen/dashboard_tile_image_size" />

        </shape>

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_timelapse_white" />

</layer-list>

res/drawable/ic_timelapse_white.xml

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

Copyright (C) 2018 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"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M16.24,7.76C15.07,6.59 13.54,6.0 12.0,6.0l0.0,6.0l-4.24,4.24c2.34,2.34 6.14,2.34 8.49,0.0 2.34,-2.34 2.34,-6.14 -0.01,-8.48zM12.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.0zm0.0,18.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>

</vector>

res/layout/zen_mode_settings_button.xml

+7 −13
Original line number Diff line number Diff line
@@ -17,31 +17,25 @@ 


<LinearLayout

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

    android:orientation="horizontal"

    android:gravity="bottom"

    android:paddingStart="72dp"

    android:paddingEnd="72dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="wrap_content">



    <Button

        android:id="@+id/zen_mode_settings_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="left"

        android:text="@string/zen_mode_button_turn_on"

        android:paddingEnd="8dp" />

        android:text="@string/zen_mode_button_turn_on"/>



    <Button

        android:id="@+id/zen_mode_settings_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="left"

        android:text="@string/zen_mode_button_turn_off"

        android:paddingEnd="8dp" />

        android:text="@string/zen_mode_button_turn_off" />



</LinearLayout>
 
 No newline at end of file