diff options
author | Chris Wren <cwren@android.com> | 2012-04-23 16:05:42 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 13:51:52 -0700 |
commit | b023bf85a080442117b5dae8d402bce60cd0a610 (patch) | |
tree | 39b11be5f7199a781235d9c961673b3f54cab74b /core | |
parent | 32ef750af01732b6446427412df4b442e68f2c6c (diff) | |
download | frameworks_base-b023bf85a080442117b5dae8d402bce60cd0a610.zip frameworks_base-b023bf85a080442117b5dae8d402bce60cd0a610.tar.gz frameworks_base-b023bf85a080442117b5dae8d402bce60cd0a610.tar.bz2 |
let default notifications with actions get bigger that 64dp.
Bug: 6377749
Change-Id: I8c92ef67b59f7a44b61926c32480cce6990a1375
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/Notification.java | 2 | ||||
-rw-r--r-- | core/res/res/layout/notification_template_big_base.xml | 148 | ||||
-rw-r--r-- | core/res/res/values/public.xml | 1 |
3 files changed, 150 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b581f99..0a996df 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1450,7 +1450,7 @@ public class Notification implements Parcelable private RemoteViews makeBigContentView() { if (mActions.size() == 0) return null; - return applyStandardTemplateWithActions(R.layout.notification_template_base); + return applyStandardTemplateWithActions(R.layout.notification_template_big_base); } private RemoteViews generateActionButton(Action action) { diff --git a/core/res/res/layout/notification_template_big_base.xml b/core/res/res/layout/notification_template_big_base.xml new file mode 100644 index 0000000..5de584d --- /dev/null +++ b/core/res/res/layout/notification_template_big_base.xml @@ -0,0 +1,148 @@ +<?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:drawable/notification_bg" + 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_marginBottom="-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> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 05150fd..1a631ef 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1097,6 +1097,7 @@ <java-symbol type="layout" name="notification_action" /> <java-symbol type="layout" name="notification_intruder_content" /> <java-symbol type="layout" name="notification_template_base" /> + <java-symbol type="layout" name="notification_template_big_base" /> <java-symbol type="layout" name="notification_template_big_picture" /> <java-symbol type="layout" name="notification_template_big_text" /> <java-symbol type="layout" name="notification_template_part_time" /> |