Merge pull request #11055 from t895/edge-effect2

Android: Remove other color edge effect definitions
dolphin-emu · Sep 11, 2022 · 0586973 · 0586973
2 parents 702e7ba + 0e74acd
commit 0586973
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/Source/Android/app/src/main/res/values-night-v31/themes.xml b/Source/Android/app/src/main/res/values-night-v31/themes.xml
@@ -24,9 +24,6 @@
         <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_surface_variant</item>
         <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 
-        <item name="android:colorControlHighlight">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
-        <item name="android:colorEdgeEffect">@color/m3_sys_color_dynamic_dark_secondary</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
     </style>

diff --git a/Source/Android/app/src/main/res/values-v31/themes.xml b/Source/Android/app/src/main/res/values-v31/themes.xml
@@ -24,9 +24,6 @@
         <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_surface_variant</item>
         <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 
-        <item name="android:colorControlHighlight">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
-        <item name="android:colorEdgeEffect">@color/m3_sys_color_dynamic_light_secondary</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
     </style>

diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
@@ -91,9 +91,6 @@
         <item name="colorSurfaceInverse">@color/green_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/green_inversePrimary</item>
 
-        <item name="android:colorControlHighlight">@color/green_onSurfaceVariant</item>
-        <item name="android:colorEdgeEffect">@color/green_secondary</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
     </style>
@@ -125,9 +122,6 @@
         <item name="colorSurfaceInverse">@color/pink_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/pink_inversePrimary</item>
 
-        <item name="android:colorControlHighlight">@color/pink_onSurfaceVariant</item>
-        <item name="android:colorEdgeEffect">@color/pink_secondary</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
     </style>