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

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

Browse Source
This commit is contained in:
Anna Galusza
2016-03-28 18:14:36 +00:00
committed by Android (Google) Code Review
parent c53f337443 a2a9d9afa0
commit 65e940b8c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
View File

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

3
src/com/android/settings/display/ScreenZoomPreference.java
View File

@@ -21,6 +21,7 @@ import com.android.settingslib.display.DisplayDensityUtils;
import android.content.Context; import android.content.Context;
import android.support.v4.content.res.TypedArrayUtils; import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
/** /**
@@ -40,7 +41,7 @@ public class ScreenZoomPreference extends PreferenceGroup {
if (defaultIndex < 0) { if (defaultIndex < 0) {
setVisible(false); setVisible(false);
setEnabled(false); setEnabled(false);
} else { } else if (TextUtils.isEmpty(getSummary())) {
final String[] entries = density.getEntries(); final String[] entries = density.getEntries();
final int currentIndex = density.getCurrentIndex(); final int currentIndex = density.getCurrentIndex();
setSummary(entries[currentIndex]); setSummary(entries[currentIndex]);