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

Commit 4d5bba55 authored by Beverly's avatar Beverly
Browse files

Fix null-pointer in EnableZenModeDialog 

Fixes: 154675084
Test: atest EnableZenModeDialogTest
Change-Id: I3e4f9aefb065eb7cdc9d0f5248639bf7ea9efbc6
parent e5d67a7f

packages/SettingsLib/src/com/android/settingslib/notification/EnableZenModeDialog.java

+28 −32
Original line number Diff line number Diff line
@@ -358,9 +358,11 @@ public class EnableZenModeDialog { 
            }

        });



        // minus button

        final ImageView button1 = (ImageView) row.findViewById(android.R.id.button1);

        button1.setOnClickListener(new View.OnClickListener() {

        final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);

        final ImageView minusButton = (ImageView) row.findViewById(android.R.id.button1);

        final ImageView plusButton = (ImageView) row.findViewById(android.R.id.button2);

        if (rowId == COUNTDOWN_CONDITION_INDEX && time > 0) {

            minusButton.setOnClickListener(new View.OnClickListener() {

                @Override

                public void onClick(View v) {

                    onClickTimeButton(row, tag, false /*down*/, rowId);
@@ -368,39 +370,33 @@ public class EnableZenModeDialog { 
                }

            });



        // plus button

        final ImageView button2 = (ImageView) row.findViewById(android.R.id.button2);

        button2.setOnClickListener(new View.OnClickListener() {

            plusButton.setOnClickListener(new View.OnClickListener() {

                @Override

                public void onClick(View v) {

                    onClickTimeButton(row, tag, true /*up*/, rowId);

                    tag.lines.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);

                }

            });



        final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);

        if (rowId == COUNTDOWN_CONDITION_INDEX && time > 0) {

            button1.setVisibility(View.VISIBLE);

            button2.setVisibility(View.VISIBLE);

            if (mBucketIndex > -1) {

                button1.setEnabled(mBucketIndex > 0);

                button2.setEnabled(mBucketIndex < MINUTE_BUCKETS.length - 1);

                minusButton.setEnabled(mBucketIndex > 0);

                plusButton.setEnabled(mBucketIndex < MINUTE_BUCKETS.length - 1);

            } else {

                final long span = time - System.currentTimeMillis();

                button1.setEnabled(span > MIN_BUCKET_MINUTES * MINUTES_MS);

                minusButton.setEnabled(span > MIN_BUCKET_MINUTES * MINUTES_MS);

                final Condition maxCondition = ZenModeConfig.toTimeCondition(mContext,

                        MAX_BUCKET_MINUTES, ActivityManager.getCurrentUser());

                button2.setEnabled(!Objects.equals(condition.summary, maxCondition.summary));

                plusButton.setEnabled(!Objects.equals(condition.summary, maxCondition.summary));

            }



            button1.setAlpha(button1.isEnabled() ? 1f : .5f);

            button2.setAlpha(button2.isEnabled() ? 1f : .5f);

            minusButton.setAlpha(minusButton.isEnabled() ? 1f : .5f);

            plusButton.setAlpha(plusButton.isEnabled() ? 1f : .5f);

        } else {

            if (button1 != null) {

                ((ViewGroup) row).removeView(button1);

            if (minusButton != null) {

                ((ViewGroup) row).removeView(minusButton);

            }

            if (button2 != null) {

                ((ViewGroup) row).removeView(button2);



            if (plusButton != null) {

                ((ViewGroup) row).removeView(plusButton);

            }

        }

    }