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

Commit 7dad4fee authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "m3: move res out of *-watch-v36 dir" into main

parents 26bcafe7 3442efc0

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:alpha="@dimen/disabled_alpha_wear_material3"

          android:color="@color/materialColorOnSurface" />

    <item android:color="@color/materialColorPrimary" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_filled_content_color.xml→core/res/res/color/btn_material_filled_content_color_watch.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="?attr/primaryContentAlpha"

          android:alpha="@dimen/primary_content_alpha_wear_material3"

          android:color="@color/materialColorOnSurface" />

    <item android:color="@color/materialColorOnPrimary" />

</selector>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:alpha="@dimen/disabled_alpha_wear_material3"

          android:color="@color/materialColorOnSurface" />

    <item android:color="@color/materialColorSurfaceContainer" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_filled_tonal_content_color.xml→core/res/res/color/btn_material_filled_tonal_content_color_watch.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="?attr/primaryContentAlpha"

          android:alpha="@dimen/primary_content_alpha_wear_material3"

          android:color="@color/materialColorOnSurface" />

    <item android:color="@color/materialColorOnSurface" />

</selector>
 
 No newline at end of file

core/res/res/color-watch-v36/btn_material_outlined_background_color.xml→core/res/res/color/btn_material_outlined_background_color_watch.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:alpha="@dimen/disabled_alpha_wear_material3"

          android:color="@color/materialColorOnSurface" />

    <item android:color="@color/materialColorOutline" />

</selector>