Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use simpler layout for auto-redacted notifications

Browse Source 
Saves us some views.

Bug: 17346296
Change-Id: I024f566354db2b6b93d50fcfb15f8434a1c2976b
This commit is contained in:
Jorim Jaggi
2014-09-09 23:56:09 +02:00
parent f8a52c0667
commit ed713ee58d
2 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
packages/SystemUI/res/layout/notification_public_default.xml Normal file
View File

@@ -0,0 +1,77 @@
<?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
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:internal="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/status_bar_latest_event_content"
android:layout_width="match_parent"
android:layout_height="64dp"
internal:layout_minHeight="64dp"
internal:layout_maxHeight="64dp"
>
<ImageView android:id="@+id/icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:scaleType="centerInside"
/>
<DateTimeView android:id="@+id/time"
android:textAppearance="@android:style/TextAppearance.Material.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_alignParentEnd="true"
android:layout_alignBaseline="@id/title"
android:singleLine="true"
android:gravity="center"
android:paddingStart="8dp"
android:visibility="gone"
/>
<TextView android:id="@+id/title"
android:textAppearance="@android:style/TextAppearance.Material.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/icon"
android:layout_toStartOf="@id/time"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
/>
<ImageView android:id="@+id/profile_badge_line3"
android:layout_width="@*android:dimen/notification_badge_size"
android:layout_height="@*android:dimen/notification_badge_size"
android:layout_below="@id/title"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:layout_alignParentEnd="true"
android:scaleType="fitCenter"
android:visibility="gone"
/>
<TextView android:id="@+id/text"
android:textAppearance="@android:style/TextAppearance.Material.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/title"
android:layout_below="@id/title"
android:layout_toStartOf="@id/profile_badge_line3"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
/>
</RelativeLayout>

20
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -1325,12 +1325,12 @@ public abstract class BaseStatusBar extends SystemUI implements
if (publicViewLocal == null) {
// Add a basic notification template
publicViewLocal = LayoutInflater.from(mContext).inflate(
com.android.internal.R.layout.notification_template_material_base,
R.layout.notification_public_default,
expandedPublic, false);
publicViewLocal.setIsRootNamespace(true);
expandedPublic.setContractedChild(publicViewLocal);
final TextView title = (TextView) publicViewLocal.findViewById(com.android.internal.R.id.title);
final TextView title = (TextView) publicViewLocal.findViewById(R.id.title);
try {
title.setText(pmUser.getApplicationLabel(
pmUser.getApplicationInfo(entry.notification.getPackageName(), 0)));
@@ -1338,10 +1338,9 @@ public abstract class BaseStatusBar extends SystemUI implements
title.setText(entry.notification.getPackageName());
}
final ImageView icon = (ImageView) publicViewLocal.findViewById(
com.android.internal.R.id.icon);
final ImageView icon = (ImageView) publicViewLocal.findViewById(R.id.icon);
final ImageView profileBadge = (ImageView) publicViewLocal.findViewById(
com.android.internal.R.id.profile_badge_line3);
R.id.profile_badge_line3);
final StatusBarIcon ic = new StatusBarIcon(entry.notification.getPackageName(),
entry.notification.getUser(),
@@ -1372,16 +1371,13 @@ public abstract class BaseStatusBar extends SystemUI implements
}
final View privateTime = contentViewLocal.findViewById(com.android.internal.R.id.time);
final DateTimeView time = (DateTimeView) publicViewLocal.findViewById(R.id.time);
if (privateTime != null && privateTime.getVisibility() == View.VISIBLE) {
final View timeStub = publicViewLocal.findViewById(com.android.internal.R.id.time);
timeStub.setVisibility(View.VISIBLE);
final DateTimeView dateTimeView = (DateTimeView)
publicViewLocal.findViewById(com.android.internal.R.id.time);
dateTimeView.setTime(entry.notification.getNotification().when);
time.setVisibility(View.VISIBLE);
time.setTime(entry.notification.getNotification().when);
}
final TextView text = (TextView) publicViewLocal.findViewById(
com.android.internal.R.id.text);
final TextView text = (TextView) publicViewLocal.findViewById(R.id.text);
if (text != null) {
text.setText(R.string.notification_hidden_text);
text.setTextAppearance(mContext,