Amend last commit. Added new drawables and removed obsolete drawables and layouts.
Karim Abou Zeid
BIN
app/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
Normal file
|
After Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 215 B |
BIN
app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
Normal file
|
After Width: | Height: | Size: 294 B |
|
Before Width: | Height: | Size: 399 B |
BIN
app/src/main/res/drawable-hdpi/ic_skip_next_white_36dp.png
Normal file
|
After Width: | Height: | Size: 304 B |
BIN
app/src/main/res/drawable-hdpi/ic_skip_previous_white_36dp.png
Normal file
|
After Width: | Height: | Size: 334 B |
BIN
app/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
Normal file
|
After Width: | Height: | Size: 126 B |
|
Before Width: | Height: | Size: 193 B |
BIN
app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
Normal file
|
After Width: | Height: | Size: 231 B |
|
Before Width: | Height: | Size: 318 B |
BIN
app/src/main/res/drawable-mdpi/ic_skip_next_white_36dp.png
Normal file
|
After Width: | Height: | Size: 216 B |
BIN
app/src/main/res/drawable-mdpi/ic_skip_previous_white_36dp.png
Normal file
|
After Width: | Height: | Size: 235 B |
BIN
app/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
Normal file
|
After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 256 B |
BIN
app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
Normal file
|
After Width: | Height: | Size: 367 B |
|
Before Width: | Height: | Size: 477 B |
BIN
app/src/main/res/drawable-xhdpi/ic_skip_next_white_36dp.png
Normal file
|
After Width: | Height: | Size: 368 B |
BIN
app/src/main/res/drawable-xhdpi/ic_skip_previous_white_36dp.png
Normal file
|
After Width: | Height: | Size: 373 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
Normal file
|
After Width: | Height: | Size: 285 B |
|
Before Width: | Height: | Size: 352 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
Normal file
|
After Width: | Height: | Size: 490 B |
|
Before Width: | Height: | Size: 666 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_skip_next_white_36dp.png
Normal file
|
After Width: | Height: | Size: 543 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_36dp.png
Normal file
|
After Width: | Height: | Size: 552 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png
Normal file
|
After Width: | Height: | Size: 431 B |
|
Before Width: | Height: | Size: 436 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
Normal file
|
After Width: | Height: | Size: 651 B |
|
Before Width: | Height: | Size: 835 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_36dp.png
Normal file
|
After Width: | Height: | Size: 749 B |
|
After Width: | Height: | Size: 728 B |
|
|
@ -1,88 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ 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
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="64dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/album_art"
|
||||
android:layout_width="@dimen/notification_big_icon_width"
|
||||
android:layout_height="@dimen/notification_big_icon_height"
|
||||
android:layout_weight="0"
|
||||
android:scaleType="centerCrop"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="fill_vertical"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="@dimen/notification_big_icon_height"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/notification_info_container_padding_bottom"
|
||||
android:paddingStart="@dimen/notification_info_container_padding_left">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_artist"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/media_actions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:orientation="horizontal"
|
||||
tools:ignore="ContentDescription">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_toggle_play_pause"
|
||||
style="@style/NotificationButton"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:src="@drawable/ic_play_arrow_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_next"
|
||||
style="@style/NotificationButton"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:src="@drawable/ic_skip_next_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_quit"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_close_white_24dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ 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
|
||||
-->
|
||||
|
||||
<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
|
||||
<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/status_bar_latest_event_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="128dp"
|
||||
tools:ignore="ContentDescription">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/album_art"
|
||||
android:layout_width="128dp"
|
||||
android:layout_height="128dp"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_quit"
|
||||
style="@style/NotificationButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/notification_selector"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_close_white_24dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toStartOf="@+id/button_quit"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:gravity="center"
|
||||
android:minHeight="@dimen/notification_big_icon_height"
|
||||
android:orientation="vertical"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingTop="12dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_artist"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/album_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/media_actions"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_prev"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_skip_previous_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_toggle_play_pause"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_play_arrow_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_next"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_skip_next_white_48dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/action_divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_above="@+id/media_actions"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:background="@drawable/notification_template_divider_media" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ 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
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="64dp"
|
||||
android:orientation="horizontal"
|
||||
tools:ignore="ContentDescription">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/album_art"
|
||||
android:layout_width="@dimen/notification_big_icon_width"
|
||||
android:layout_height="@dimen/notification_big_icon_height"
|
||||
android:layout_weight="0"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="fill_vertical"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="@dimen/notification_big_icon_height"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/notification_info_container_padding_bottom"
|
||||
android:paddingLeft="@dimen/notification_info_container_padding_left"
|
||||
android:paddingStart="@dimen/notification_info_container_padding_left">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_artist"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/media_actions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_toggle_play_pause"
|
||||
style="@style/NotificationButton"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:src="@drawable/ic_play_arrow_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_next"
|
||||
style="@style/NotificationButton"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:src="@drawable/ic_skip_next_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_quit"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_close_white_24dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ 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
|
||||
-->
|
||||
|
||||
<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
|
||||
<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/status_bar_latest_event_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="128dp"
|
||||
tools:ignore="ContentDescription">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/album_art"
|
||||
android:layout_width="@dimen/notification_albumart_size"
|
||||
android:layout_height="@dimen/notification_albumart_size"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_quit"
|
||||
style="@style/NotificationButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_gravity="center"
|
||||
android:background="?android:selectableItemBackground"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_close_white_24dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@+id/button_quit"
|
||||
android:layout_toStartOf="@+id/button_quit"
|
||||
android:layout_toRightOf="@+id/album_art"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:gravity="center"
|
||||
android:minHeight="@dimen/notification_big_icon_height"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingTop="12dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_artist"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/album_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/media_actions"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_toRightOf="@+id/album_art"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_prev"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_skip_previous_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_toggle_play_pause"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_play_arrow_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_next"
|
||||
style="@style/NotificationButton"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_skip_next_white_48dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/action_divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_above="@+id/media_actions"
|
||||
android:layout_toRightOf="@+id/album_art"
|
||||
android:layout_toEndOf="@+id/album_art"
|
||||
android:background="@drawable/notification_template_divider_media" />
|
||||
|
||||
</RelativeLayout>
|
||||