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

Merge "Merge \"Fix guts are not bound properly.\" into nyc-dev am: 9ea3916063" into nyc-mr1-dev

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-23 21:50:14 +00:00
committed by Android (Google) Code Review
parent 38d7897690 f03046aa20
commit 1ecbced5cb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1083,8 +1083,8 @@ public abstract class BaseStatusBar extends SystemUI implements
pkgicon = pmUser.getDefaultActivityIcon(); pkgicon = pmUser.getDefaultActivityIcon();
} }
((ImageView) row.findViewById(R.id.app_icon)).setImageDrawable(pkgicon); ((ImageView) guts.findViewById(R.id.app_icon)).setImageDrawable(pkgicon);
((TextView) row.findViewById(R.id.pkgname)).setText(appname); ((TextView) guts.findViewById(R.id.pkgname)).setText(appname);
final View settingsButton = guts.findViewById(R.id.more_settings); final View settingsButton = guts.findViewById(R.id.more_settings);
if (appUid >= 0) { if (appUid >= 0) {
@@ -1100,8 +1100,9 @@ public abstract class BaseStatusBar extends SystemUI implements
settingsButton.setVisibility(View.GONE); settingsButton.setVisibility(View.GONE);
} }
guts.bindImportance(pmUser, sbn, row, mNotificationData.getImportance(sbn.getKey())); guts.bindImportance(pmUser, sbn, mNotificationData.getImportance(sbn.getKey()));
row.findViewById(R.id.done).setOnClickListener(new View.OnClickListener() {
guts.findViewById(R.id.done).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// If the user has security enabled, show challenge if the setting is changed. // If the user has security enabled, show challenge if the setting is changed.

6
packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
View File

@@ -173,7 +173,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
} }
void bindImportance(final PackageManager pm, final StatusBarNotification sbn, void bindImportance(final PackageManager pm, final StatusBarNotification sbn,
final ExpandableNotificationRow row, final int importance) { final int importance) {
mINotificationManager = INotificationManager.Stub.asInterface( mINotificationManager = INotificationManager.Stub.asInterface(
ServiceManager.getService(Context.NOTIFICATION_SERVICE)); ServiceManager.getService(Context.NOTIFICATION_SERVICE));
mStartingUserImportance = NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED; mStartingUserImportance = NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
@@ -191,8 +191,8 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
// unlikely. // unlikely.
} }
final View importanceSlider = row.findViewById(R.id.importance_slider); final View importanceSlider = findViewById(R.id.importance_slider);
final View importanceButtons = row.findViewById(R.id.importance_buttons); final View importanceButtons = findViewById(R.id.importance_buttons);
if (mShowSlider) { if (mShowSlider) {
bindSlider(importanceSlider, systemApp); bindSlider(importanceSlider, systemApp);
importanceSlider.setVisibility(View.VISIBLE); importanceSlider.setVisibility(View.VISIBLE);