Gestures for expanding notifications. (6a858c34) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1681,7 +1681,7 @@ public class Notification implements Parcelable
		}

		private RemoteViews makeBigContentView() {
		RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_base);
		RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_big_text);

		contentView.setTextViewText(R.id.big_text, mBigText);
		contentView.setViewVisibility(R.id.big_text, View.VISIBLE);

core/res/res/layout/adaptive_notification_wrapper.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2008, 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.
		*/
		-->
		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/text1"
		android:textAppearance="?android:attr/dropDownHintAppearance"
		android:singleLine="true"
		android:layout_marginLeft="3dip"
		android:layout_marginTop="3dip"
		android:layout_marginRight="3dip"
		android:layout_marginBottom="3dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

core/res/res/layout/notification_template_base.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,9 +15,13 @@
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:internal="http://schemas.android.com/apk/prv/res/android"
		android:background="@android:color/background_dark"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		internal:layout_minHeight="64dp"
		internal:layout_maxHeight="64dp"
		>
		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/notification_large_icon_width"

core/res/res/layout/notification_template_big_picture.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -15,9 +15,13 @@
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:internal="http://schemas.android.com/apk/prv/res/android"
		android:background="@android:color/background_dark"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		internal:layout_minHeight="65dp"
		internal:layout_maxHeight="unbounded"
		>
		<ImageView
		android:id="@+id/big_picture"

core/res/res/layout/notification_template_big_text.xml

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2012 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.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:internal="http://schemas.android.com/apk/prv/res/android"
		android:background="@android:color/background_dark"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		internal:layout_minHeight="65dp"
		internal:layout_maxHeight="unbounded"
		>
		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/notification_large_icon_width"
		android:layout_height="@dimen/notification_large_icon_height"
		android:background="@android:drawable/notify_panel_notification_icon_bg_tile"
		android:scaleType="center"
		/>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="fill_vertical"
		android:layout_marginLeft="@dimen/notification_large_icon_width"
		android:minHeight="@dimen/notification_large_icon_height"
		android:orientation="vertical"
		android:paddingLeft="12dp"
		android:paddingRight="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:gravity="center_vertical"
		>
		<LinearLayout
		android:id="@+id/line1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		>
		<TextView android:id="@+id/title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:layout_weight="1"
		/>
		<ViewStub android:id="@+id/time"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:visibility="gone"
		android:layout="@layout/notification_template_part_time"
		/>
		<ViewStub android:id="@+id/chronometer"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:visibility="gone"
		android:layout="@layout/notification_template_part_chronometer"
		/>
		</LinearLayout>
		<TextView android:id="@+id/text2"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="-2dp"
		android:layout_mgarginBottom="-2dp"
		android:singleLine="true"
		android:fadingEdge="horizontal"
		android:ellipsize="marquee"
		android:visibility="gone"
		/>
		<TextView android:id="@+id/big_text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="false"
		android:visibility="gone"
		/>
		<LinearLayout
		android:id="@+id/line3"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		>
		<TextView android:id="@+id/text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_gravity="center"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		/>
		<TextView android:id="@+id/info"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:singleLine="true"
		android:gravity="center"
		android:paddingLeft="8dp"
		/>
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_weight="0"
		android:scaleType="center"
		android:paddingLeft="8dp"
		android:visibility="gone"
		android:drawableAlpha="180"
		/>
		</LinearLayout>
		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		style="?android:attr/progressBarStyleHorizontal"
		/>
		<LinearLayout
		android:id="@+id/actions"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		>
		<!-- actions will be added here -->
		</LinearLayout>
		</LinearLayout>
		</FrameLayout>