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

Commit c2009692 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch '4513-P-Revert_to_old_color_schemes' into 'v1-pie' 

4513-P-Revert_to_old_color_schemes

See merge request !15
parents 40276014 1a78b90d

java/res/drawable/bg_btn_keyboard_key_normal_off.xml

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

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

    android:viewportHeight="24">

    <path

        android:fillColor="@color/color_default_secondary_text"

        android:pathData="M8,23h8v1H8z"/>

</vector>

java/res/drawable/bg_btn_keyboard_key_normal_on.xml

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

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

    android:viewportHeight="24">

    <path

        android:fillColor="@color/color_default_accent"

        android:pathData="M8,23h8v1H8z"/>

</vector>
 
 No newline at end of file

java/res/drawable/btn_keyboard_key_ics.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


    <!-- Toggle keys. Use checkable/checked state. -->

    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_checked="true"

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

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

    <item android:state_checkable="true"

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

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



    <!-- Empty background keys. -->

    <item android:state_empty="true" android:state_pressed="true"

java/res/drawable/btn_keyboard_key_klp.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


    <!-- Toggle keys. Use checkable/checked state. -->

    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_checked="true"

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

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

    <item android:state_checkable="true"

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

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



    <!-- Empty background keys. -->

    <item android:state_empty="true" android:state_pressed="true"

java/res/drawable/btn_keyboard_key_lxx_dark.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


    <!-- Toggle keys. Use checkable/checked state. -->

    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_pressed="true"

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

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

    <item android:state_checkable="true" android:state_checked="true"

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

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

    <item android:state_checkable="true"

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

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



    <!-- Empty background keys. -->

    <item android:state_empty="true" android:state_pressed="true"