Merge "Avoid 60ms QS inflations on UI thread after density changes" into udc-qpr-dev (72ac76b7) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -28,11 +28,11 @@ import android.content.res.Resources;
		public class InterestingConfigChanges {
		private final Configuration mLastConfiguration = new Configuration();
		private final int mFlags;
		private int mLastDensity;

		public InterestingConfigChanges() {
		this(ActivityInfo.CONFIG_LOCALE \| ActivityInfo.CONFIG_LAYOUT_DIRECTION
		\| ActivityInfo.CONFIG_UI_MODE \| ActivityInfo.CONFIG_ASSETS_PATHS);
		\| ActivityInfo.CONFIG_UI_MODE \| ActivityInfo.CONFIG_ASSETS_PATHS
		\| ActivityInfo.CONFIG_DENSITY);
		}

		public InterestingConfigChanges(int flags) {
		@@ -50,11 +50,6 @@ public class InterestingConfigChanges {
		public boolean applyNewConfig(Resources res) {
		int configChanges = mLastConfiguration.updateFrom(
		Configuration.generateDelta(mLastConfiguration, res.getConfiguration()));
		boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
		if (densityChanged \|\| (configChanges & (mFlags)) != 0) {
		mLastDensity = res.getDisplayMetrics().densityDpi;
		return true;
		}
		return false;
		return (configChanges & (mFlags)) != 0;
		}
		}