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

Remove ActivityManagerNative dependency for adjusting font scale

Browse Source 
ActivityManagerService now holds a ContentObserver for
Settings.System.FONT_SCALE, so it is no longer necessary to notify
ActivityManagerNative of a configuration update involving the font scale
directly.

Bug:23033258
Change-Id: Ifd002bd25724b133e83a1285be2953019178c65a
This commit is contained in:
Casey Burkhardt
2016-01-31 10:53:20 -08:00
parent b7a7158b18
commit a8b2a5072c
4 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,12 +21,11 @@ import com.android.settings.R;
import com.android.settings.PreviewSeekBarPreferenceFragment;
import android.annotation.Nullable;
import android.app.ActivityManagerNative;
import android.content.ContentResolver;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.RemoteException;
import android.util.Log;
import android.provider.Settings;
/**
* Preference fragment used to control font size.
@@ -44,11 +43,13 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
mPreviewSampleResIds = new int[]{R.layout.font_size_preview};
Resources res = getContext().getResources();
final ContentResolver resolver = getContext().getContentResolver();
// Mark the appropriate item in the preferences list.
final Configuration origConfig = res.getConfiguration();
mEntries = res.getStringArray(R.array.entries_font_size);
final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
mInitialIndex = fontSizeValueToIndex(origConfig.fontScale, strEntryValues);
final float currentScale =
Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, 1.0f);
mInitialIndex = fontSizeValueToIndex(currentScale, strEntryValues);
mValues = new float[strEntryValues.length];
for (int i = 0; i < strEntryValues.length; ++i) {
mValues[i] = Float.parseFloat(strEntryValues[i]);
@@ -64,17 +65,12 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
}
/**
* Persists the selected font size and sends a configuration change.
* Persists the selected font size.
*/
@Override
protected void commit() {
Configuration config = getContext().getResources().getConfiguration();
config.fontScale = mValues[mCurrentIndex];
try {
ActivityManagerNative.getDefault().updatePersistentConfiguration(config);
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to save font size setting");
}
final ContentResolver resolver = getContext().getContentResolver();
Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, mValues[mCurrentIndex]);
}
@Override
@@ -98,4 +94,4 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
return indices.length-1;
}
}
}