Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d177111 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Inline settings update." into nyc-dev am: 60cdc239 

am: 5192fad1

* commit '5192fad1':
  Inline settings update.
parents 90fd11ca 5192fad1

packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java

+13 −4
Original line number Diff line number Diff line
@@ -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,8 +174,12 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab 
        } else {

            mReset.setText(mContext.getString(R.string.do_not_silence_block));

        }

        if (importance == NotificationListenerService.Ranking.IMPORTANCE_LOW) {

            mSilent.setChecked(true);

        } else {

            mReset.setChecked(true);

        }

    }



    private void bindSlider(final View importanceSlider, final StatusBarNotification sbn,

            final boolean systemApp) {

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }