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

Merge "sysui: refactor for extensibility" into nyc-dev

Browse Source 
am: 415ebdb

* commit '415ebdb88027a4885f6ff95b3dfb7466144dc0e4':
  sysui: refactor for extensibility

Change-Id: Ifc0db571e1b9fbe3d8d66d0303d59ec16bc3c29b
This commit is contained in:
Muyuan Li
2016-03-29 20:36:53 +00:00
committed by android-build-merger
parent e82ac120fd 415ebdb880
commit 86a28f0e37
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -86,7 +86,7 @@ public class ZenModePanel extends LinearLayout {
= new Intent(Settings.ACTION_ZEN_MODE_PRIORITY_SETTINGS);
private final Context mContext;
private final LayoutInflater mInflater;
protected final LayoutInflater mInflater;
private final H mHandler = new H();
private final ZenPrefs mPrefs;
private final TransitionHelper mTransitionHelper = new TransitionHelper();
@@ -100,7 +100,7 @@ public class ZenModePanel extends LinearLayout {
private TextView mZenIntroductionMessage;
private View mZenIntroductionConfirm;
private TextView mZenIntroductionCustomize;
private LinearLayout mZenConditions;
protected LinearLayout mZenConditions;
private TextView mZenAlarmWarning;
private Callback mCallback;
@@ -304,14 +304,18 @@ public class ZenModePanel extends LinearLayout {
}
}
protected void addZenConditions(int count) {
for (int i = 0; i < count; i++) {
mZenConditions.addView(mInflater.inflate(R.layout.zen_mode_condition, this, false));
}
}
public void init(ZenModeController controller) {
mController = controller;
mCountdownConditionSupported = mController.isCountdownConditionSupported();
final int countdownDelta = mCountdownConditionSupported ? COUNTDOWN_CONDITION_COUNT : 0;
final int minConditions = 1 /*forever*/ + countdownDelta;
for (int i = 0; i < minConditions; i++) {
mZenConditions.addView(mInflater.inflate(R.layout.zen_mode_condition, this, false));
}
addZenConditions(minConditions);
mSessionZen = getSelectedZen(-1);
handleUpdateManualRule(mController.getManualRule());
if (DEBUG) Log.d(mTag, "init mExitCondition=" + mExitCondition);