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

Merge "Fix talkback ordering of zen duration dialog" into rvc-dev am: b59775ada7 am: e526c39729

Browse Source 
Change-Id: I4ebe0660c69f0bf214a72131e5e57303a8fd0dd0
This commit is contained in:
TreeHugger Robot
2020-03-30 20:04:18 +00:00
committed by Automerger Merge Worker
parent 872ea8a955 e526c39729
commit fc76178d77
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java
View File

@@ -25,6 +25,7 @@ import android.service.notification.Condition;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -228,39 +229,40 @@ public class ZenDurationDialog {
} }
private void updateButtons(ConditionTag tag, View row, int rowIndex) { private void updateButtons(ConditionTag tag, View row, int rowIndex) {
// minus button final ImageView minusButton = (ImageView) row.findViewById(android.R.id.button1);
final ImageView button1 = (ImageView) row.findViewById(android.R.id.button1); final ImageView plusButton = (ImageView) row.findViewById(android.R.id.button2);
button1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onClickTimeButton(row, tag, false /*down*/, rowIndex);
tag.lines.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
});
// plus button
final ImageView button2 = (ImageView) row.findViewById(android.R.id.button2);
button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onClickTimeButton(row, tag, true /*up*/, rowIndex);
tag.lines.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
});
final long time = tag.countdownZenDuration; final long time = tag.countdownZenDuration;
if (rowIndex == COUNTDOWN_CONDITION_INDEX) { if (rowIndex == COUNTDOWN_CONDITION_INDEX) {
button1.setVisibility(View.VISIBLE); minusButton.setOnClickListener(new View.OnClickListener() {
button2.setVisibility(View.VISIBLE); @Override
public void onClick(View v) {
onClickTimeButton(row, tag, false /*down*/, rowIndex);
tag.lines.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
});
button1.setEnabled(time > MIN_BUCKET_MINUTES); plusButton.setOnClickListener(new View.OnClickListener() {
button2.setEnabled(tag.countdownZenDuration != MAX_BUCKET_MINUTES); @Override
public void onClick(View v) {
onClickTimeButton(row, tag, true /*up*/, rowIndex);
tag.lines.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
});
minusButton.setVisibility(View.VISIBLE);
plusButton.setVisibility(View.VISIBLE);
button1.setAlpha(button1.isEnabled() ? 1f : .5f); minusButton.setEnabled(time > MIN_BUCKET_MINUTES);
button2.setAlpha(button2.isEnabled() ? 1f : .5f); plusButton.setEnabled(tag.countdownZenDuration != MAX_BUCKET_MINUTES);
minusButton.setAlpha(minusButton.isEnabled() ? 1f : .5f);
plusButton.setAlpha(plusButton.isEnabled() ? 1f : .5f);
} else { } else {
button1.setVisibility(View.GONE); if (minusButton != null) {
button2.setVisibility(View.GONE); ((ViewGroup) row).removeView(minusButton);
}
if (plusButton != null) {
((ViewGroup) row).removeView(plusButton);
}
} }
} }