Index: chrome/android/java/res/layout/playback_notification_bar.xml |
diff --git a/chrome/android/java/res/layout/remote_notification_bar.xml b/chrome/android/java/res/layout/playback_notification_bar.xml |
similarity index 54% |
copy from chrome/android/java/res/layout/remote_notification_bar.xml |
copy to chrome/android/java/res/layout/playback_notification_bar.xml |
index 5cce18db45e360240a30d7ce9cb30f073d01f763..58e3db9324d58c75bc00122eeec6eac07c1b55b4 100644 |
--- a/chrome/android/java/res/layout/remote_notification_bar.xml |
+++ b/chrome/android/java/res/layout/playback_notification_bar.xml |
@@ -1,16 +1,16 @@ |
<?xml version="1.0" encoding="utf-8"?> |
-<!-- Copyright 2014 The Chromium Authors. All rights reserved. |
+<!-- Copyright 2015 The Chromium Authors. All rights reserved. |
Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. --> |
<!-- |
- Notification layout for remote controls. |
- ___________________________________________________________ |
- | | | | |
- | | [Living Room TV] | _ | |
- | ICON | =====0============================= | || |_| | |
- | | Playing "[Web Page Title]" | | |
- |________|______________________________________|_________| |
+ Notification layout for media controls. |
+ _______________________________________________________ |
+ | | | | |
+ | | Playing [media title] | | |
+ | ICON | =====0============================= | || | |
+ | | [www.example.com] | | |
+ |________|______________________________________|_____| |
--> |
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
android:layout_width="match_parent" |
@@ -34,7 +34,7 @@ |
android:layout_height="match_parent" |
android:contentDescription="@null" |
android:scaleType="center" |
- android:src="@drawable/ic_notification_media_route" /> |
+ android:src="@drawable/audio_playing" /> |
</FrameLayout> |
<LinearLayout |
@@ -51,17 +51,7 @@ |
android:layout_gravity="start" |
android:ellipsize="end" |
android:singleLine="true" |
- style="@style/RemoteNotificationTitle"/> |
- |
- <!-- android:visibility is set to 'gone' by default since we don't want to show it as long |
- as the duration of the video is unknown. The duration can be unknown in the case of |
- live streaming videos or YouTube. --> |
- <ProgressBar |
- android:id="@+id/progress" |
- android:layout_width="match_parent" |
- android:layout_height="wrap_content" |
- android:visibility="gone" |
- style="@style/RemoteNotificationProgressBar"/> |
+ style="@style/MediaNotificationTitle"/> |
<TextView |
android:id="@+id/status" |
@@ -70,32 +60,18 @@ |
android:layout_gravity="start" |
android:ellipsize="end" |
android:singleLine="true" |
- style="@style/RemoteNotificationText"/> |
+ style="@style/MediaNotificationText"/> |
</LinearLayout> |
<ImageButton |
android:id="@+id/playpause" |
android:src="@drawable/ic_vidcontrol_play" |
- android:layout_width="40dp" |
- android:layout_height="48dp" |
- android:layout_marginStart="8dp" |
+ android:layout_width="@android:dimen/notification_large_icon_width" |
+ android:layout_height="@android:dimen/notification_large_icon_height" |
android:gravity="center" |
- android:padding="8dp" |
android:scaleType="center" |
android:background="?android:attr/selectableItemBackground" |
android:contentDescription="@null"/> |
- <ImageButton |
- android:id="@+id/stop" |
- android:src="@drawable/ic_vidcontrol_stop" |
- android:layout_width="40dp" |
- android:layout_height="48dp" |
- android:layout_marginEnd="8dp" |
- android:gravity="center" |
- android:padding="8dp" |
- android:scaleType="center" |
- android:background="?android:attr/selectableItemBackground" |
- android:contentDescription="@string/accessibility_stop"/> |
- |
-</LinearLayout> |
+</LinearLayout> |