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

Commit a3904c40 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Derive HapticButton from MaterialButton 

Change-Id: I1897bfbd75be10cea20cbf7c6aac0af7c0526108
parent 61ba7b3d

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -40,5 +40,6 @@ android_app { 
        "androidx.fragment_fragment",

        "androidx.gridlayout_gridlayout",

        "androidx.recyclerview_recyclerview",

        "com.google.android.material_material",

    ],

}

res/drawable/pad_button_advanced_background.xml

deleted100644 → 0
+0 −19
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.

  -->



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

    android:color="@color/pad_button_advanced_ripple_color" />
 
 No newline at end of file

res/drawable/pad_button_background.xml

deleted100644 → 0
+0 −19
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.

  -->



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

    android:color="@color/pad_button_ripple_color" />
 
 No newline at end of file

res/drawable/pad_button_inverse_background.xml

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

<!--

  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.

  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.

  -->



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

    android:color="@color/pad_button_advanced_ripple_color">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <corners android:radius="4dip" />

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

        </shape>

    </item>

    <item>

        <selector

            android:enterFadeDuration="@android:integer/config_longAnimTime"

            android:exitFadeDuration="@android:integer/config_longAnimTime">

            <item android:state_selected="true">

                <shape android:shape="rectangle">

                    <corners android:radius="4dip" />

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

                </shape>

            </item>

        </selector>

    </item>

</ripple>

res/values-w375dp-h768dp-port/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="PadButtonStyle.Advanced">

        <item name="background">@drawable/pad_button_advanced_background</item>

        <item name="android:textColor">@color/pad_button_advanced_text_color</item>

        <item name="android:textSize">27dip</item>

    </style>