Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e940b8 authored Mar 28, 2016 by Anna Galusza Committed by Android (Google) Code Review Mar 28, 2016

Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug:...

Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev

parents c53f3374 a2a9d9af

src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import com.android.settings.R;
		* Preference fragment used to control font size.
		*/
		public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFragment {
		private static final String LOG_TAG = "ToggleFontSizePreferenceFragment";

		private float[] mValues;

src/com/android/settings/display/ScreenZoomPreference.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.settingslib.display.DisplayDensityUtils;
		import android.content.Context;
		import android.support.v4.content.res.TypedArrayUtils;
		import android.support.v7.preference.PreferenceGroup;
		import android.text.TextUtils;
		import android.util.AttributeSet;

		/**
		@@ -40,7 +41,7 @@ public class ScreenZoomPreference extends PreferenceGroup {
		if (defaultIndex < 0) {
		setVisible(false);
		setEnabled(false);
		} else {
		} else if (TextUtils.isEmpty(getSummary())) {
		final String[] entries = density.getEntries();
		final int currentIndex = density.getCurrentIndex();
		setSummary(entries[currentIndex]);