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

Merge "Inline settings update." into nyc-dev

Browse Source 
am: 60cdc23913

* commit '60cdc23913835b68baffe2269ae32a41b7803ccc':
  Inline settings update.
This commit is contained in:
Julia Reynolds
2016-03-03 15:57:11 +00:00
committed by android-build-merger
parent 755935a8b3 60cdc23913
commit 5192fad12a
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,12 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
importanceSlider.setVisibility(View.VISIBLE);
importanceButtons.setVisibility(View.GONE);
} else {
bindToggles(importanceButtons, sbn, systemApp);
int userImportance = NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
try {
userImportance =
mINotificationManager.getImportance(sbn.getPackageName(), sbn.getUid());
} catch (RemoteException e) {}
bindToggles(importanceButtons, userImportance, systemApp);
importanceButtons.setVisibility(View.VISIBLE);
importanceSlider.setVisibility(View.GONE);
}
@@ -144,7 +149,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
if (mBlock.isChecked()) {
progress = NotificationListenerService.Ranking.IMPORTANCE_NONE;
} else if (mSilent.isChecked()) {
progress = NotificationListenerService.Ranking.IMPORTANCE_DEFAULT;
progress = NotificationListenerService.Ranking.IMPORTANCE_LOW;
} else {
progress = NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
}
@@ -158,7 +163,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
}
}
private void bindToggles(final View importanceButtons, final StatusBarNotification sbn,
private void bindToggles(final View importanceButtons, final int importance,
final boolean systemApp) {
mBlock = (RadioButton) importanceButtons.findViewById(R.id.block_importance);
mSilent = (RadioButton) importanceButtons.findViewById(R.id.silent_importance);
@@ -169,7 +174,11 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
} else {
mReset.setText(mContext.getString(R.string.do_not_silence_block));
}
mReset.setChecked(true);
if (importance == NotificationListenerService.Ranking.IMPORTANCE_LOW) {
mSilent.setChecked(true);
} else {
mReset.setChecked(true);
}
}
private void bindSlider(final View importanceSlider, final StatusBarNotification sbn,

2
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -1320,7 +1320,7 @@ public class NotificationManagerService extends SystemService {
@Override
public int getImportance(String pkg, int uid) {
checkCallerIsSystem();
enforceSystemOrSystemUI("Caller not system or systemui");
return mRankingHelper.getImportance(pkg, uid);
}