PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rules without a configuration activity aren't clickable." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-03-24 22:11:52 +00:00
committed by Android (Google) Code Review
parent 1997f76cfc 2bcb0778c3
commit befc5c59eb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -311,6 +311,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
ServiceInfo si = mServiceListing.findService(mContext, CONFIG, rule.getOwner()); ServiceInfo si = mServiceListing.findService(mContext, CONFIG, rule.getOwner());
ComponentName settingsActivity = getSettingsActivity(si); ComponentName settingsActivity = getSettingsActivity(si);
setIntent(getRuleIntent(action, settingsActivity, mId)); setIntent(getRuleIntent(action, settingsActivity, mId));
setSelectable(settingsActivity != null || isSystemRule);
setWidgetLayoutResource(R.layout.zen_rule_widget); setWidgetLayoutResource(R.layout.zen_rule_widget);
} }
@@ -323,6 +324,8 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
if (v != null) { if (v != null) {
v.setOnClickListener(mDeleteListener); v.setOnClickListener(mDeleteListener);
} }
view.setDividerAllowedAbove(true);
view.setDividerAllowedBelow(true);
} }
private final View.OnClickListener mDeleteListener = new View.OnClickListener() { private final View.OnClickListener mDeleteListener = new View.OnClickListener() {