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

Commit 7f5a9461 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Revert "Adding dialer assets, styles, and attributes for theming." 

We have another strategy which does not involve framework modifications.

This reverts commit 330bca02.

Conflicts:

	api/current.xml
	core/res/res/values/public.xml

CR: Ed Carrigan
parent bcd67d73

api/current.xml

+5 −49
Original line number Diff line number Diff line
@@ -2770,50 +2770,6 @@ 
 visibility="public"

>

</field>

<field name="dialerDeleteButtonStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843407"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dialerDialpadButtonStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843409"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dialerInputStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843406"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dialerScreenBackgroundStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843408"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dialogIcon"

 type="int"

 transient="false"
@@ -3357,7 +3313,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843411"

 value="16843407"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -3940,7 +3896,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843412"

 value="16843408"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -5337,7 +5293,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843410"

 value="16843406"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7218,7 +7174,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843413"

 value="16843409"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7229,7 +7185,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843414"

 value="16843410"

 static="true"

 final="true"

 deprecated="not deprecated"

core/res/res/drawable/btn_dial.xml

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

<!-- Copyright (C) 2008 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_pressed="true"

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

    <item android:state_focused="true"

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

    <item

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

</selector>

core/res/res/drawable/btn_dial_delete.xml

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

<!-- Copyright (C) 2008 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_pressed="true" 

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

    <item android:state_focused="true"

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

    <item

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

</selector>

core/res/res/drawable/btn_dial_delete_activated.9.png

deleted100644 → 0
−960 B
Loading image diff...

core/res/res/drawable/btn_dial_delete_active.xml

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

<!-- Copyright (C) 2008 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_pressed="true" 

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

    <item android:state_focused="true"

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

    <item

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

</selector>