Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev (03dbaf15) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -788,6 +788,7 @@ public class VolumeDialog {
		public void onConfigurationChanged() {
		updateWindowWidthH();
		mSpTexts.update();
		mZenFooter.onConfigurationChanged();
		}

		@Override

+11 −2

Original line number	Diff line number	Diff line
		@@ -36,10 +36,11 @@ public class ZenFooter extends LinearLayout {
		private static final String TAG = Util.logTag(ZenFooter.class);

		private final Context mContext;
		private final SpTexts mSpTexts;

		private TextView mSummaryLine1;
		private TextView mSummaryLine2;
		private View mEndNowButton;
		private TextView mEndNowButton;
		private int mZen = -1;
		private ZenModeConfig mConfig;
		private ZenModeController mController;
		@@ -47,6 +48,7 @@ public class ZenFooter extends LinearLayout {
		public ZenFooter(Context context, AttributeSet attrs) {
		super(context, attrs);
		mContext = context;
		mSpTexts = new SpTexts(mContext);
		setLayoutTransition(new LayoutTransition());
		}

		@@ -55,7 +57,10 @@ public class ZenFooter extends LinearLayout {
		super.onFinishInflate();
		mSummaryLine1 = (TextView) findViewById(R.id.volume_zen_summary_line_1);
		mSummaryLine2 = (TextView) findViewById(R.id.volume_zen_summary_line_2);
		mEndNowButton = findViewById(R.id.volume_zen_end_now);
		mEndNowButton = (TextView) findViewById(R.id.volume_zen_end_now);
		mSpTexts.add(mSummaryLine1);
		mSpTexts.add(mSummaryLine2);
		mSpTexts.add(mEndNowButton);
		}

		public void init(final ZenModeController controller) {
		@@ -122,4 +127,8 @@ public class ZenFooter extends LinearLayout {
		Util.setText(mSummaryLine2, line2);
		}

		public void onConfigurationChanged() {
		mSpTexts.update();
		}

		}