OmniSwitch: launcher: no ripple no fun
Why has nobody told me that there is no ripple effect
on the launcher buttons :)
TODO:
if someone could tell me why the ripples are cut off on top
whereas the ones from the GridView are not on the bottom I would be happy
Change-Id: I7511a58daf1692aced9becd4c8de56cc4daa3adb
Reviewed-on: http://review.blissroms.com/3788
Reviewed-by: Vaughn N <rwaterspf1@floydco.net>
Reviewed-by: blueyes <brian.w.petroski@gmail.com>
Tested-by: blueyes <brian.w.petroski@gmail.com>
diff --git a/res/drawable/app_drawer_button.xml b/res/drawable/app_drawer_button.xml
deleted file mode 100644
index a7fc6f9..0000000
--- a/res/drawable/app_drawer_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_app_drawer_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_app_drawer_pressed" />
- <item android:drawable="@drawable/ic_app_drawer" />
-</selector>
diff --git a/res/drawable/camera_button.xml b/res/drawable/camera_button.xml
deleted file mode 100644
index d27c432..0000000
--- a/res/drawable/camera_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_camera_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_camera_pressed" />
- <item android:drawable="@drawable/ic_camera" />
-</selector>
diff --git a/res/drawable/essentials_button.xml b/res/drawable/essentials_button.xml
deleted file mode 100644
index 04630a4..0000000
--- a/res/drawable/essentials_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_essentials_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_essentials_pressed" />
- <item android:drawable="@drawable/ic_essentials" />
-</selector>
diff --git a/res/drawable/favorite_button.xml b/res/drawable/favorite_button.xml
deleted file mode 100644
index 1945ca0..0000000
--- a/res/drawable/favorite_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_favorite_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_favorite_pressed" />
- <item android:drawable="@drawable/ic_favorite" />
-</selector>
diff --git a/res/drawable/favorite_edit_button.xml b/res/drawable/favorite_edit_button.xml
deleted file mode 100644
index ca38001..0000000
--- a/res/drawable/favorite_edit_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_favorite_edit_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_favorite_edit_pressed" />
- <item android:drawable="@drawable/ic_favorite_edit" />
-</selector>
diff --git a/res/drawable/ic_app_drawer_pressed.xml b/res/drawable/ic_app_drawer_pressed.xml
deleted file mode 100644
index 494d2c7..0000000
--- a/res/drawable/ic_app_drawer_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/apps.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="36dp"
- android:width="36dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M16,20H20V16H16M16,14H20V10H16M10,8H14V4H10M16,8H20V4H16M10,14H14V10H10M4,14H8V10H4M4,20H8V16H4M10,20H14V16H10M4,8H8V4H4V8Z" />
-</vector>
diff --git a/res/drawable/ic_camera_pressed.xml b/res/drawable/ic_camera_pressed.xml
deleted file mode 100644
index 705e4fa..0000000
--- a/res/drawable/ic_camera_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/camera.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z" />
-</vector>
diff --git a/res/drawable/ic_essentials_pressed.xml b/res/drawable/ic_essentials_pressed.xml
deleted file mode 100644
index f78bb09..0000000
--- a/res/drawable/ic_essentials_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/arrow_up_drop_circle.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22M17,14L12,9L7,14H17Z" />
-</vector>
diff --git a/res/drawable/ic_favorite_edit_pressed.xml b/res/drawable/ic_favorite_edit_pressed.xml
deleted file mode 100644
index a9a90db..0000000
--- a/res/drawable/ic_favorite_edit_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/playlist_plus.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M2,16H10V14H2M18,14V10H16V14H12V16H16V20H18V16H22V14M14,6H2V8H14M14,10H2V12H14V10Z" />
-</vector>
diff --git a/res/drawable/ic_favorite_pressed.xml b/res/drawable/ic_favorite_pressed.xml
deleted file mode 100644
index 680023f..0000000
--- a/res/drawable/ic_favorite_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/star.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z" />
-</vector>
diff --git a/res/drawable/ic_phone_pressed.xml b/res/drawable/ic_phone_pressed.xml
deleted file mode 100644
index 4d20213..0000000
--- a/res/drawable/ic_phone_pressed.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- drawable/phone.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="32dp"
- android:width="32dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="@color/launcher_shortcut_color_pressed"
- android:pathData="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z" />
-</vector>
diff --git a/res/drawable/ic_settings_pressed.xml b/res/drawable/ic_settings_pressed.xml
deleted file mode 100644
index 075d439..0000000
--- a/res/drawable/ic_settings_pressed.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="44dp"
- android:height="44dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
-
-<path
- android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
- android:fillColor="@color/launcher_shortcut_color_pressed"
- />
-
-</vector>
diff --git a/res/drawable/ic_wallpaper_pressed.xml b/res/drawable/ic_wallpaper_pressed.xml
deleted file mode 100644
index 2693c2f..0000000
--- a/res/drawable/ic_wallpaper_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/image.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="48dp"
- android:width="48dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="@color/launcher_shortcut_color_pressed" android:pathData="M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z" />
-</vector>
diff --git a/res/drawable/omni_settings_button.xml b/res/drawable/omni_settings_button.xml
deleted file mode 100644
index b7b07ab..0000000
--- a/res/drawable/omni_settings_button.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" >
- <bitmap android:src="@drawable/settings"
- android:tint="@color/colorPrimary" />
- </item>
- <item android:state_pressed="true" >
- <bitmap android:src="@drawable/settings"
- android:tint="@color/launcher_shortcut_color_pressed" />
- </item>
- <item>
- <bitmap android:src="@drawable/settings"
- android:tint="@color/launcher_shortcut_color" />
- </item>
-</selector>
diff --git a/res/drawable/phone_button.xml b/res/drawable/phone_button.xml
deleted file mode 100644
index 5c56e7c..0000000
--- a/res/drawable/phone_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_phone_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_phone_pressed" />
- <item android:drawable="@drawable/ic_phone" />
-</selector>
diff --git a/res/drawable/settings_button.xml b/res/drawable/settings_button.xml
deleted file mode 100644
index aa6967f..0000000
--- a/res/drawable/settings_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_settings_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_settings_pressed" />
- <item android:drawable="@drawable/ic_settings" />
-</selector>
diff --git a/res/drawable/wallpaper_button.xml b/res/drawable/wallpaper_button.xml
deleted file mode 100644
index 5fee8e1..0000000
--- a/res/drawable/wallpaper_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/ic_wallpaper_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/ic_wallpaper_pressed" />
- <item android:drawable="@drawable/ic_wallpaper" />
-</selector>
diff --git a/res/layout-land/essentials_panel.xml b/res/layout-land/essentials_panel.xml
index 92d8aa0..5b70073 100644
--- a/res/layout-land/essentials_panel.xml
+++ b/res/layout-land/essentials_panel.xml
@@ -25,7 +25,7 @@
android:id="@+id/phone_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/phone_button"
+ android:src="@drawable/ic_phone"
android:scaleType="centerInside"
android:padding="10dp"
android:visibility="gone" />
@@ -41,7 +41,7 @@
android:id="@+id/camera_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/camera_button"
+ android:src="@drawable/ic_camera"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -54,7 +54,7 @@
android:id="@+id/wallpaper_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/wallpaper_button"
+ android:src="@drawable/ic_wallpaper"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -67,7 +67,7 @@
android:id="@+id/settings_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/settings_button"
+ android:src="@drawable/ic_settings"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -80,7 +80,7 @@
android:id="@+id/omni_settings_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/omni_settings_button"
+ android:src="@drawable/settings"
android:scaleType="centerInside"
android:padding="10dp" />
</LinearLayout>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d396e78..2d987d6 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -67,7 +67,7 @@
android:id="@+id/essentials_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/essentials_button"
+ android:src="@drawable/ic_essentials"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -80,7 +80,7 @@
android:id="@+id/edit_favorite_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/favorite_edit_button"
+ android:src="@drawable/ic_favorite_edit"
android:scaleType="centerInside"
android:padding="10dp"
android:visibility="gone" />
@@ -96,7 +96,7 @@
android:id="@+id/favorite_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/favorite_button"
+ android:src="@drawable/ic_favorite"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -109,7 +109,7 @@
android:id="@+id/app_drawer_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/app_drawer_button"
+ android:src="@drawable/ic_app_drawer"
android:scaleType="centerInside"
android:padding="10dp" />
diff --git a/res/layout/essentials_panel.xml b/res/layout/essentials_panel.xml
index d5d9dd0..f0c45b4 100644
--- a/res/layout/essentials_panel.xml
+++ b/res/layout/essentials_panel.xml
@@ -25,7 +25,7 @@
android:id="@+id/phone_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/phone_button"
+ android:src="@drawable/ic_phone"
android:scaleType="centerInside"
android:padding="10dp"
android:visibility="gone" />
@@ -41,7 +41,7 @@
android:id="@+id/camera_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/camera_button"
+ android:src="@drawable/ic_camera"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -54,7 +54,7 @@
android:id="@+id/wallpaper_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/wallpaper_button"
+ android:src="@drawable/ic_wallpaper"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -67,7 +67,7 @@
android:id="@+id/settings_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/settings_button"
+ android:src="@drawable/ic_settings"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -80,7 +80,7 @@
android:id="@+id/omni_settings_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/omni_settings_button"
+ android:src="@drawable/settings"
android:scaleType="centerInside"
android:padding="10dp" />
</LinearLayout>
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index ee8b8a1..5a74fb9 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -65,7 +65,7 @@
android:id="@+id/essentials_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/essentials_button"
+ android:src="@drawable/ic_essentials"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -78,7 +78,7 @@
android:id="@+id/edit_favorite_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/favorite_edit_button"
+ android:src="@drawable/ic_favorite_edit"
android:scaleType="centerInside"
android:padding="10dp"
android:visibility="gone" />
@@ -94,7 +94,7 @@
android:id="@+id/favorite_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/favorite_button"
+ android:src="@drawable/ic_favorite"
android:scaleType="centerInside"
android:padding="10dp" />
@@ -107,7 +107,7 @@
android:id="@+id/app_drawer_button"
android:layout_height="56dp"
android:layout_width="56dp"
- android:src="@drawable/app_drawer_button"
+ android:src="@drawable/ic_app_drawer"
android:scaleType="centerInside"
android:padding="10dp" />
diff --git a/src/org/omnirom/omniswitch/launcher/Launcher.java b/src/org/omnirom/omniswitch/launcher/Launcher.java
index c993975..0c4bce5 100644
--- a/src/org/omnirom/omniswitch/launcher/Launcher.java
+++ b/src/org/omnirom/omniswitch/launcher/Launcher.java
@@ -263,6 +263,7 @@
startActivity(pickWallpaper);
}
});
+ wallpaperButton.setBackgroundResource(R.drawable.ripple_dark);
View settingsButton = findViewById(R.id.settings_button);
settingsButton.setOnClickListener(new View.OnClickListener() {
@@ -271,6 +272,7 @@
SwitchManager.startSettingsActivity(Launcher.this);
}
});
+ settingsButton.setBackgroundResource(R.drawable.ripple_dark);
View omniSettingsButton = findViewById(R.id.omni_settings_button);
omniSettingsButton.setOnClickListener(new View.OnClickListener() {
@@ -279,6 +281,7 @@
SwitchManager.startOmniSwitchSettingsActivity(Launcher.this);
}
});
+ omniSettingsButton.setBackgroundResource(R.drawable.ripple_dark);
mFavoriteEditButton = (ImageView)findViewById(R.id.edit_favorite_button);
mFavoriteEditButton.setOnClickListener(new View.OnClickListener() {
@@ -288,6 +291,7 @@
dialog.show();
}
});
+ mFavoriteEditButton.setBackgroundResource(R.drawable.ripple_dark);
mFavoriteEditButtonSpace = findViewById(R.id.edit_favorite_button_space);
@@ -302,6 +306,7 @@
}
}
});
+ mAppDrawerButton.setBackgroundResource(R.drawable.ripple_dark);
mFavoriteButton = (ImageView)findViewById(R.id.favorite_button);
mFavoriteButton.setOnClickListener(new View.OnClickListener() {
@@ -314,6 +319,7 @@
}
}
});
+ mFavoriteButton.setBackgroundResource(R.drawable.ripple_dark);
mEssentialsButton = (ImageView)findViewById(R.id.essentials_button);
mEssentialsButton.setOnClickListener(new View.OnClickListener() {
@@ -326,6 +332,8 @@
}
}
});
+ mEssentialsButton.setBackgroundResource(R.drawable.ripple_dark);
+
ImageView phoneButton = (ImageView)findViewById(R.id.phone_button);
phoneButton.setOnClickListener(new View.OnClickListener() {
@Override
@@ -333,6 +341,7 @@
launchPhone();
}
});
+ phoneButton.setBackgroundResource(R.drawable.ripple_dark);
ImageView cameraButton = (ImageView)findViewById(R.id.camera_button);
cameraButton.setOnClickListener(new View.OnClickListener() {
@@ -341,6 +350,7 @@
launchCamera();
}
});
+ cameraButton.setBackgroundResource(R.drawable.ripple_dark);
if (isPhoneVisible()) {
phoneButton.setVisibility(View.VISIBLE);