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

Commit e620ead4 authored by Garvit Narang's avatar Garvit Narang Committed by Android (Google) Code Review
Browse files

Merge "Revert "bc25: impl baseline button styling Filled & Filled_Tonal"" into main

parents 314441aa cd3ccd66

core/res/res/color-watch-v36/btn_material_filled_background_color.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:color="?attr/materialColorOnSurface" />

    <item android:state_enabled="true"

          android:color="?attr/materialColorPrimary" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_filled_text_color.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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_enabled="false"

          android:alpha="?attr/primaryContentAlpha"

          android:color="?attr/materialColorOnSurface" />

    <item android:state_enabled="true"

          android:color="?attr/materialColorOnPrimary" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_filled_tonal_background_color.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:color="?attr/materialColorOnSurface" />

    <item android:state_enabled="true"

          android:color="?attr/materialColorSurfaceContainer" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_filled_tonal_text_color.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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_enabled="false"

          android:alpha="?attr/primaryContentAlpha"

          android:color="?attr/materialColorOnSurface" />

    <item android:state_enabled="true"

          android:color="?attr/materialColorOnSurface" />

</selector>
 
 No newline at end of file

core/res/res/drawable-watch-v36/btn_background_material_filled.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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="?attr/colorControlHighlight">

    <item>

        <shape android:shape="rectangle">

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

            <corners android:radius="?android:attr/buttonCornerRadius"/>

            <size

                android:width="@dimen/btn_material_width"

                android:height="@dimen/btn_material_height" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file