Merge "Add a method to get initial dentisy of the display from DisplayDensityUtils." into main (c5404d95) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ public class DisplayDensityUtils {
		private final float[] mFloatValues;

		private final int mDefaultDensity;
		private final int mInitialDensity;
		private final int mCurrentIndex;

		public DisplayDensityUtils(@NonNull Context context) {
		@@ -148,6 +149,7 @@ public class DisplayDensityUtils {
		mValues = null;
		mFloatValues = null;
		mDefaultDensity = 0;
		mInitialDensity = 0;
		mCurrentIndex = -1;
		return;
		}
		@@ -179,6 +181,7 @@ public class DisplayDensityUtils {
		mValues = null;
		mFloatValues = null;
		mDefaultDensity = 0;
		mInitialDensity = 0;
		mCurrentIndex = -1;
		return;
		}
		@@ -191,9 +194,11 @@ public class DisplayDensityUtils {
		mValues = null;
		mFloatValues = null;
		mDefaultDensity = 0;
		mInitialDensity = 0;
		mCurrentIndex = -1;
		return;
		}
		mInitialDensity = defaultDensity;

		final Resources res = context.getResources();

		@@ -336,6 +341,10 @@ public class DisplayDensityUtils {
		return mDefaultDensity;
		}

		public int getInitialDensity() {
		return mInitialDensity;
		}

		/**
		* Returns the default density for the specified display.
		*