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

Commit 3641a80a authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Merge decor caption button drawables."

parents 7c858285 11a0f294

core/res/res/color/decor_button_dark_color.xml

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

<!-- Copyright (C) 2016 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_window_focused="true" android:color="#FF000000" />

    <item android:color="#33000000" />

</selector>

core/res/res/color/decor_button_light_color.xml

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

<!-- Copyright (C) 2016 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_window_focused="true" android:color="#FFFFFFFF" />

    <item android:color="#33FFFFFF" />

</selector>

core/res/res/drawable/decor_close_button_dark.xml

+27 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project

<!--

Copyright (C) 2015 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.
@@ -13,10 +13,19 @@ 
    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_window_focused="true"

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

    <item android:drawable="@drawable/ic_decor_close_button_dark_unfocused" />

</selector>

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

        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="@color/decor_button_dark_color"

        >

    <group android:scaleX="0.5"

            android:scaleY="0.5"

            android:translateX="8.0"

            android:translateY="8.0" >

        <path

            android:fillColor="@color/white"

            android:pathData="M6.9,4.0l-2.9,2.9 9.1,9.1 -9.1,9.200001 2.9,2.799999 9.1,-9.1 9.1,9.1 2.9,-2.799999 -9.1,-9.200001 9.1,-9.1 -2.9,-2.9 -9.1,9.2z"/>

    </group>

</vector>

core/res/res/drawable/decor_close_button_light.xml

+27 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project

<!--

Copyright (C) 2015 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.
@@ -13,10 +13,19 @@ 
    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_window_focused="true"

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

    <item android:drawable="@drawable/ic_decor_close_button_light_unfocused" />

</selector>

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

        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="@color/decor_button_light_color"

        >

    <group android:scaleX="0.5"

            android:scaleY="0.5"

            android:translateX="8.0"

            android:translateY="8.0" >

        <path

                android:fillColor="@color/white"

                android:pathData="M6.9,4.0l-2.9,2.9 9.1,9.1 -9.1,9.200001 2.9,2.799999 9.1,-9.1 9.1,9.1 2.9,-2.799999 -9.1,-9.200001 9.1,-9.1 -2.9,-2.9 -9.1,9.2z"/>

    </group>

</vector>

core/res/res/drawable/decor_maximize_button_dark.xml

+20 −5
Original line number Diff line number Diff line
@@ -14,9 +14,24 @@ 
     limitations under the License.

-->



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

    <item android:state_window_focused="true"

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

    <item android:drawable="@drawable/ic_decor_maximize_button_dark_unfocused" />

</selector>

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

        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="@color/decor_button_dark_color"

        >

    <group android:scaleX="0.5"

            android:scaleY="0.5"

            android:translateX="8.0"

            android:translateY="8.0" >

        <path

            android:fillColor="@color/white"

            android:pathData="M2.0,4.0l0.0,16.0l28.0,0.0L30.0,4.0L2.0,4.0zM26.0,16.0L6.0,16.0L6.0,8.0l20.0,0.0L26.0,16.0z"/>

        <path

            android:fillColor="@color/white"

            android:pathData="M2.0,24.0l28.0,0.0l0.0,4.0l-28.0,0.0z"/>

    </group>

</vector>