Merge "Tablet ticker." (a11dde3e) · Commits · e / os / android_frameworks_base

api/current.xml

+31 −0

Original line number	Diff line number	Diff line
		@@ -32558,6 +32558,27 @@
		visibility="public"
		>
		</field>
		<field name="tickerIcons"
		type="android.graphics.Bitmap[]"
		transient="false"
		volatile="false"
		value="null"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="tickerSubtitle"
		type="java.lang.CharSequence"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="tickerText"
		type="java.lang.CharSequence"
		transient="false"
		@@ -32568,6 +32589,16 @@
		visibility="public"
		>
		</field>
		<field name="tickerTitle"
		type="java.lang.CharSequence"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="vibrate"
		type="long[]"
		transient="false"

core/java/android/app/Notification.java

+92 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import java.util.Date;
		import android.app.PendingIntent;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Bitmap;
		import android.media.AudioManager;
		import android.net.Uri;
		import android.os.Parcel;
		@@ -124,10 +125,46 @@ public class Notification implements Parcelable

		/**
		* Text to scroll across the screen when this item is added to
		* the status bar.
		* the status bar on large and smaller devices.
		*
		* <p>This field is provided separately from the other ticker fields
		* both for compatibility and to allow an application to choose different
		* text for when the text scrolls in and when it is displayed all at once
		* in conjunction with one or more icons.
		*
		* @see #tickerTitle
		* @see #tickerSubtitle
		* @see #tickerIcons
		*/
		public CharSequence tickerText;

		/**
		* The title line for the ticker over a the fat status bar on xlarge devices.
		*
		* @see #tickerText
		* @see #tickerSubtitle
		* @see #tickerIcons
		*/
		public CharSequence tickerTitle;

		/**
		* The subtitle line for the ticker over a the fat status bar on xlarge devices.
		*
		* @see #tickerText
		* @see #tickerTitle
		* @see #tickerIcons
		*/
		public CharSequence tickerSubtitle;

		/**
		* The icons to show to the left of the other ticker fields.
		*
		* @see #tickerText
		* @see #tickerTitle
		* @see #tickerSubtitle
		*/
		public Bitmap[] tickerIcons;

		/**
		* The view that will represent this notification in the expanded status bar.
		*/
		@@ -346,6 +383,21 @@ public class Notification implements Parcelable
		if (parcel.readInt() != 0) {
		tickerText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
		}
		if (parcel.readInt() != 0) {
		tickerTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
		}
		if (parcel.readInt() != 0) {
		tickerSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
		}
		final int tickerIconCount = parcel.readInt();
		if (tickerIconCount >= 0) {
		tickerIcons = new Bitmap[tickerIconCount];
		for (int i=0; i<tickerIconCount; i++) {
		if (parcel.readInt() != 0) {
		tickerIcons[i] = Bitmap.CREATOR.createFromParcel(parcel);
		}
		}
		}
		if (parcel.readInt() != 0) {
		contentView = RemoteViews.CREATOR.createFromParcel(parcel);
		}
		@@ -382,6 +434,19 @@ public class Notification implements Parcelable
		if (this.tickerText != null) {
		that.tickerText = this.tickerText.toString();
		}
		if (this.tickerTitle != null) {
		that.tickerTitle = this.tickerTitle.toString();
		}
		if (this.tickerSubtitle != null) {
		that.tickerSubtitle = this.tickerSubtitle.toString();
		}
		if (this.tickerIcons != null) {
		final int N = this.tickerIcons.length;
		that.tickerIcons = new Bitmap[N];
		for (int i=0; i<N; i++) {
		that.tickerIcons[i] = Bitmap.createBitmap(this.tickerIcons[i]);
		}
		}
		if (this.contentView != null) {
		that.contentView = this.contentView.clone();
		}
		@@ -438,6 +503,32 @@ public class Notification implements Parcelable
		} else {
		parcel.writeInt(0);
		}
		if (tickerTitle != null) {
		parcel.writeInt(1);
		TextUtils.writeToParcel(tickerTitle, parcel, flags);
		} else {
		parcel.writeInt(0);
		}
		if (tickerSubtitle != null) {
		parcel.writeInt(1);
		TextUtils.writeToParcel(tickerSubtitle, parcel, flags);
		} else {
		parcel.writeInt(0);
		}
		if (tickerIcons != null) {
		final int N = tickerIcons.length;
		parcel.writeInt(N);
		for (int i=0; i<N; i++) {
		if (tickerIcons[i] != null) {
		parcel.writeInt(1);
		tickerIcons[i].writeToParcel(parcel, flags);
		} else {
		parcel.writeInt(0);
		}
		}
		} else {
		parcel.writeInt(-1);
		}
		if (contentView != null) {
		parcel.writeInt(1);
		contentView.writeToParcel(parcel, 0);

packages/SystemUI/res/layout-xlarge/status_bar.xml

+21 −49

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/* apps/common/assets/default/default/skins/StatusBar.xml
		**
		** Copyright 2006, 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.
		*/
		* Copyright (C) 2010 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.
		-->

		<!-- android:background="@drawable/status_bar_closed_default_background" -->
		@@ -65,41 +62,16 @@

		</com.android.systemui.statusbar.tablet.NotificationIconArea>

		<LinearLayout android:id="@+id/ticker"
		android:layout_width="300dip"
		android:layout_height="match_parent"
		android:paddingLeft="6dip"
		android:animationCache="false"
		android:layout_alignLeft="@id/notificationIcons"
		android:layout_alignTop="@id/notificationIcons"
		android:orientation="horizontal"
		android:visibility="gone"
		>
		<ImageView android:id="@+id/tickerIcon"
		<FrameLayout
		android:id="@+id/ticker"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginRight="8dip"
		/>
		<com.android.systemui.statusbar.TickerView android:id="@+id/tickerText"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:paddingTop="2dip"
		android:paddingRight="10dip">
		<TextView
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		/>
		<TextView
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:layout_alignParentLeft="true"
		android:layout_toLeftOf="@+id/systemInfo"
		android:paddingLeft="6dip"
		android:gravity="center_vertical"
		android:animateLayoutChanges="true"
		/>
		</com.android.systemui.statusbar.TickerView>
		</LinearLayout>

		<include layout="@layout/status_bar_center"
		android:layout_width="256dip"

packages/SystemUI/res/layout-xlarge/ticker.xml

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (C) 2010 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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:background="#ff000000"
		>

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_gravity="center_vertical"
		android:orientation="vertical"
		android:paddingLeft="12dp"
		>

		<TextView android:id="@+id/title"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textStyle="bold"
		android:maxLines="1"
		/>
		<TextView android:id="@+id/subtitle"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="1"
		/>
		</LinearLayout>

		</LinearLayout>

packages/SystemUI/res/layout-xlarge/ticker_compat.xml

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (C) 2010 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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:background="#ff000000"
		>

		<TextView android:id="@+id/text"
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:layout_marginLeft="12dp"
		android:gravity="center_vertical"
		android:maxLines="2"
		/>

		</LinearLayout>