Eleven: Get rid of dark/light variant drawables
UpdateAnd unify them using colorControlNormal
Change-Id: I340ff99b5a2f7124d5ecc11cee6c1c97a9f0d7e3
diff --git a/res/drawable/dnd_list_divider.xml b/res/drawable/dnd_list_divider.xml
index ea3c262..739a851 100644
--- a/res/drawable/dnd_list_divider.xml
+++ b/res/drawable/dnd_list_divider.xml
@@ -19,7 +19,7 @@
android:insetRight="@dimen/list_preferred_item_padding" >
<shape>
- <solid android:color="@color/list_item_divider_color" />
+ <solid android:color="?colorOnSurface" />
<corners android:radius="1.0dip" />
</shape>
diff --git a/res/drawable/dnd_list_divider_light.xml b/res/drawable/dnd_list_divider_light.xml
deleted file mode 100644
index 502463f..0000000
--- a/res/drawable/dnd_list_divider_light.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 The CyanogenMod 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.
--->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
- android:insetLeft="@dimen/drag_and_drop_width"
- android:insetRight="@dimen/list_preferred_item_padding" >
-
- <shape>
- <solid android:color="@color/list_item_divider_color_light" />
- <corners android:radius="1.0dip" />
- </shape>
-
-</inset>
\ No newline at end of file
diff --git a/res/drawable/gripper.xml b/res/drawable/gripper.xml
index 61a66e4..8ff5ec3 100644
--- a/res/drawable/gripper.xml
+++ b/res/drawable/gripper.xml
@@ -1,10 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: Material Design Authors / Google LLC
+ SPDX-License-Identifier: Apache-2.0
+-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960"
+ android:tint="?attr/colorControlNormal">
<path
- android:fillColor="?android:attr/textColorPrimary"
- android:pathData="M11,18c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2 0.9,-2 2,-2 2,0.9 2,2zM9,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM9,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM15,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M360,800Q327,800 303.5,776.5Q280,753 280,720Q280,687 303.5,663.5Q327,640 360,640Q393,640 416.5,663.5Q440,687 440,720Q440,753 416.5,776.5Q393,800 360,800ZM600,800Q567,800 543.5,776.5Q520,753 520,720Q520,687 543.5,663.5Q567,640 600,640Q633,640 656.5,663.5Q680,687 680,720Q680,753 656.5,776.5Q633,800 600,800ZM360,560Q327,560 303.5,536.5Q280,513 280,480Q280,447 303.5,423.5Q327,400 360,400Q393,400 416.5,423.5Q440,447 440,480Q440,513 416.5,536.5Q393,560 360,560ZM600,560Q567,560 543.5,536.5Q520,513 520,480Q520,447 543.5,423.5Q567,400 600,400Q633,400 656.5,423.5Q680,447 680,480Q680,513 656.5,536.5Q633,560 600,560ZM360,320Q327,320 303.5,296.5Q280,273 280,240Q280,207 303.5,183.5Q327,160 360,160Q393,160 416.5,183.5Q440,207 440,240Q440,273 416.5,296.5Q393,320 360,320ZM600,320Q567,320 543.5,296.5Q520,273 520,240Q520,207 543.5,183.5Q567,160 600,160Q633,160 656.5,183.5Q680,207 680,240Q680,273 656.5,296.5Q633,320 600,320Z"/>
</vector>
diff --git a/res/drawable/gripper_light.xml b/res/drawable/gripper_light.xml
deleted file mode 100644
index 02f1ec8..0000000
--- a/res/drawable/gripper_light.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="@color/white"
- android:pathData="M11,18c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2 0.9,-2 2,-2 2,0.9 2,2zM9,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM9,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM15,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM15,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>
diff --git a/res/drawable/menu_button.xml b/res/drawable/menu_button.xml
index 28b88e2..58988db 100644
--- a/res/drawable/menu_button.xml
+++ b/res/drawable/menu_button.xml
@@ -1,24 +1,14 @@
-<!-- Copyright (c) 2021 The LineageOS 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.
+<!--
+ SPDX-FileCopyrightText: Material Design Authors / Google LLC
+ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportWidth="960"
+ android:viewportHeight="960"
+ android:tint="?attr/colorControlNormal">
<path
- android:fillColor="?android:attr/textColorPrimary"
- android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0
--2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320Z"/>
</vector>
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
deleted file mode 100644
index c6090d9..0000000
--- a/res/drawable/menu_button_light.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (c) 2021 The LineageOS 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="@color/white"
- android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0
--2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>
diff --git a/res/drawable/selectable_background.xml b/res/drawable/selectable_background.xml
index cc32cb7..802d118 100644
--- a/res/drawable/selectable_background.xml
+++ b/res/drawable/selectable_background.xml
@@ -15,4 +15,4 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/white" />
+ android:color="@android:color/white" />
diff --git a/res/drawable/selectable_background_light.xml b/res/drawable/selectable_background_light.xml
deleted file mode 100644
index ed49ae5..0000000
--- a/res/drawable/selectable_background_light.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The CyanogenMod 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/primary" />
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 1bc9321..0e85dfb 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -56,7 +56,7 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/grid_item_padding_right"
- android:src="@drawable/menu_button_light" />
+ android:src="@drawable/menu_button" />
</FrameLayout>
</FrameLayout>
</androidx.cardview.widget.CardView>
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index c97b784..1c0254c 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -24,7 +24,7 @@
android:layout_width="@dimen/drag_and_drop_width"
android:layout_height="@dimen/drag_and_drop_height"
android:layout_centerVertical="true"
- android:src="@drawable/gripper_light" />
+ android:src="@drawable/gripper" />
<FrameLayout
android:layout_width="wrap_content"
@@ -40,5 +40,5 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:src="@drawable/dnd_list_divider_light" />
+ android:src="@drawable/dnd_list_divider" />
</RelativeLayout>
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index 83ef961..34ac086 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -70,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/grid_item_padding_right"
- android:src="@drawable/menu_button_light" />
+ android:src="@drawable/menu_button" />
</LinearLayout>
</FrameLayout>
</androidx.cardview.widget.CardView>
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 2c4526b..4ad0523 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -56,6 +56,6 @@
android:layout_weight="0"
android:scaleType="centerInside"
android:background="@drawable/selectable_background"
- android:src="@drawable/menu_button_light" />
+ android:src="@drawable/menu_button" />
</org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 48512e1..5e440e2 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -76,5 +76,5 @@
android:layout_height="@dimen/overflow_height"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:src="@drawable/menu_button_light" />
+ android:src="@drawable/menu_button" />
</RelativeLayout>