Merge "Remove 'force overflow button' logic." into cm-11.0 (a2da00e9) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -3326,14 +3326,6 @@ public final class Settings {
		*/
		public static final String KEY_APP_SWITCH_LONG_PRESS_ACTION = "key_app_switch_long_press_action";

		/**
		* Control the display of the action overflow button within app UI.
		* 0 = use system default
		* 1 = force on
		* @hide
		*/
		public static final String UI_FORCE_OVERFLOW_BUTTON = "ui_force_overflow_button";

		/**
		* Performance profile
		* @see config_perf_profile_prop in frameworks/base/core/res/res/values/config.xml

+0 −12

Original line number	Diff line number	Diff line
		@@ -228,8 +228,6 @@ public class ViewConfiguration {
		private final int mOverflingDistance;
		private final boolean mFadingMarqueeEnabled;

		private Context mContext;

		static final SparseArray<ViewConfiguration> sConfigurations =
		new SparseArray<ViewConfiguration>(2);

		@@ -277,8 +275,6 @@ public class ViewConfiguration {
		sizeAndDensity = density;
		}

		mContext = context;

		mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f);
		mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f);
		mMinimumFlingVelocity = (int) (density * MINIMUM_FLING_VELOCITY + 0.5f);
		@@ -698,14 +694,6 @@ public class ViewConfiguration {
		// do nothing, continue trying to guess
		}

		// Report no menu key if overflow button is forced to enabled
		ContentResolver res = mContext.getContentResolver();
		boolean forceOverflowButton = Settings.System.getInt(res,
		Settings.System.UI_FORCE_OVERFLOW_BUTTON, 0) == 1;
		if (forceOverflowButton) {
		return false;
		}

		// Report menu key presence based on hardware key rebinding
		try {
		return wm.hasMenuKeyEnabled();