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

am 17aa1d45: am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev

Browse Source 
* commit '17aa1d45a88b14fe6f0283f79c2602d3243335ae':
  Zen: Fix recent regression in mode selection after reboot.
This commit is contained in:
John Spurlock
2014-09-16 22:20:31 +00:00
committed by Android Git Automerger
parent d97c3fa75f 85f84643e8
commit 59957b2c77
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java
View File

@@ -32,6 +32,7 @@ import java.util.Objects;
public class SegmentedButtons extends LinearLayout {
private static final Typeface MEDIUM = Typeface.create("sans-serif-medium", Typeface.NORMAL);
private static final Typeface BOLD = Typeface.create("sans-serif", Typeface.BOLD);
private static final int LABEL_RES_KEY = R.id.label;
private final Context mContext;
private final LayoutInflater mInflater;
@@ -69,6 +70,7 @@ public class SegmentedButtons extends LinearLayout {
public void addButton(int labelResId, Object value) {
final Button b = (Button) mInflater.inflate(R.layout.segmented_button, this, false);
b.setTag(LABEL_RES_KEY, labelResId);
b.setText(labelResId);
final LayoutParams lp = (LayoutParams) b.getLayoutParams();
if (getChildCount() == 0) {
@@ -80,6 +82,14 @@ public class SegmentedButtons extends LinearLayout {
b.setOnClickListener(mClick);
}
public void updateLocale() {
for (int i = 0; i < getChildCount(); i++) {
final Button b = (Button) getChildAt(i);
final int labelResId = (Integer) b.getTag(LABEL_RES_KEY);
b.setText(labelResId);
}
}
private void fireOnSelected() {
if (mCallback != null) {
mCallback.onSelected(mSelectedValue);

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

@@ -120,7 +120,10 @@ public class ZenModePanel extends LinearLayout {
super.onFinishInflate();
mZenButtons = (SegmentedButtons) findViewById(R.id.zen_buttons);
addZenButtons();
mZenButtons.addButton(R.string.interruption_level_none, Global.ZEN_MODE_NO_INTERRUPTIONS);
mZenButtons.addButton(R.string.interruption_level_priority,
Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
mZenButtons.addButton(R.string.interruption_level_all, Global.ZEN_MODE_OFF);
mZenButtons.setCallback(mZenButtonsCallback);
mZenSubhead = findViewById(R.id.zen_subhead);
@@ -170,13 +173,6 @@ public class ZenModePanel extends LinearLayout {
setExpanded(false);
}
private void addZenButtons() {
mZenButtons.addButton(R.string.interruption_level_none, Global.ZEN_MODE_NO_INTERRUPTIONS);
mZenButtons.addButton(R.string.interruption_level_priority,
Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
mZenButtons.addButton(R.string.interruption_level_all, Global.ZEN_MODE_OFF);
}
public void setHidden(boolean hidden) {
if (mHidden == hidden) return;
mHidden = hidden;
@@ -238,8 +234,7 @@ public class ZenModePanel extends LinearLayout {
}
public void updateLocale() {
mZenButtons.removeAllViews();
addZenButtons();
mZenButtons.updateLocale();
}
private void setExitCondition(Condition exitCondition) {