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

Commit 015e96cc authored by Andrei Stingaceanu's avatar Andrei Stingaceanu
Browse files

Floating toolbar old theme fix 

The floating toolbar now has it's own theming:
* material_light used for all light themes
* material_dark for dark themes

The attributes are not public.

Bug: 21177954
Change-Id: I7ccf9c677be44d510ab48168c0215d37456be059
parent a31940df

core/res/res/drawable/floating_popup_background_dark.xml

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

<!--

/* Copyright 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.

** 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.

*/

-->

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

       android:shape="rectangle">

    <solid android:color="@color/background_floating_material_dark" />

    <corners android:radius="2dp" />

</shape>

core/res/res/drawable/floating_popup_background.xml→core/res/res/drawable/floating_popup_background_light.xml

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

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

    android:shape="rectangle">

    <solid android:color="?attr/colorBackgroundFloating" />

    <solid android:color="@color/background_floating_material_light" />

    <corners android:radius="2dp" />

</shape>

core/res/res/drawable/ic_ab_back_material_dark.xml

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

<!--

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"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:autoMirrored="true"

        android:tint="@color/secondary_text_material_dark">

  <path

      android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"

      android:fillColor="@color/white"/>

</vector>

core/res/res/drawable/ic_ab_back_material_light.xml

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

<!--

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"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:autoMirrored="true"

        android:tint="@color/secondary_text_material_light">

  <path

      android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"

      android:fillColor="@color/white"/>

</vector>

core/res/res/drawable/ic_menu_moreoverflow_material.xml

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

<!--

Copyright (C) 2014 The Android Open Source Project