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

Commit f6080b49 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Importance shift."

parents 3cafcba6 98ed0192

src/com/android/settings/notification/ImportanceSeekBarPreference.java

+0 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements 
        SeekBar.OnSeekBarChangeListener {

    private static final String TAG = "ImportanceSeekBarPref";



    public static final int IMPORTANCE_PROGRESS_OFFSET = 2;

    private Callback mCallback;

    private TextView mSummaryTextView;

    private String mSummary;
@@ -89,8 +88,6 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements 
    }



    private String getProgressSummary(int progress) {

        // Map progress 0-4 values to Importance's -2-2.

        progress = progress - IMPORTANCE_PROGRESS_OFFSET;

        switch (progress) {

            case NotificationListenerService.Ranking.IMPORTANCE_NONE:

                return getContext().getString(

src/com/android/settings/notification/TopicNotificationSettings.java

+2 −4
Original line number Diff line number Diff line
@@ -135,13 +135,11 @@ public class TopicNotificationSettings extends SettingsPreferenceFragment { 
                mTopicRow.importance == NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED

                ? NotificationListenerService.Ranking.IMPORTANCE_DEFAULT

                        : mTopicRow.importance;

        mImportance.setProgress(

                importance + ImportanceSeekBarPreference.IMPORTANCE_PROGRESS_OFFSET);

        mImportance.setProgress(importance);

        mImportance.setCallback(new ImportanceSeekBarPreference.Callback() {

            @Override

            public void onImportanceChanged(int progress) {

                mBackend.setImportance(mTopicRow.pkg, mTopicRow.uid, mTopicRow.topic,

                        progress - ImportanceSeekBarPreference.IMPORTANCE_PROGRESS_OFFSET);

                mBackend.setImportance(mTopicRow.pkg, mTopicRow.uid, mTopicRow.topic, progress);

            }

        });

        mPriority.setChecked(mTopicRow.priority);