Removing paging tuner setting. (e0657680) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -1186,11 +1186,6 @@
		<!-- Option to use new paging layout in quick settings [CHAR LIMIT=60] -->
		<string name="qs_paging" translatable="false">Use the new Quick Settings</string>

		<!-- Disables fast-toggling recents via the recents button. DO NOT TRANSLATE -->
		<string name="overview_disable_fast_toggle_via_button">Disable fast toggle</string>
		<!-- Description for the toggle for fast-toggling recents via the recents button. DO NOT TRANSLATE -->
		<string name="overview_disable_fast_toggle_via_button_desc">Disable launch timeout while paging</string>

		<!-- Toggle to enable the gesture to enter split-screen by swiping up from the Overview button. [CHAR LIMIT=60]-->
		<string name="overview_nav_bar_gesture">Enable split-screen swipe-up gesture</string>
		<!-- Description for the toggle to enable the gesture to enter split-screen by swiping up from the Overview button. [CHAR LIMIT=NONE]-->

packages/SystemUI/res/xml/tuner_prefs.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -137,11 +137,6 @@
		android:key="other"
		android:title="@string/other" >

		<com.android.systemui.tuner.TunerSwitch
		android:key="overview_disable_fast_toggle_via_button"
		android:title="@string/overview_disable_fast_toggle_via_button"
		android:summary="@string/overview_disable_fast_toggle_via_button_desc" />

		<com.android.systemui.tuner.TunerSwitch
		android:key="overview_nav_bar_gesture"
		android:title="@string/overview_nav_bar_gesture"

packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ public class RecentsDebugFlags implements TunerService.Tunable {
		public static final boolean EnableHistory = false;
		// Overrides the Tuner flags and enables the timeout
		private static final boolean EnableFastToggleTimeout = false;
		// Overrides the Tuner flags and enables the paging via the Recents button
		private static final boolean EnablePaging = false;

		// Enables us to create mock recents tasks
		public static final boolean EnableMockTasks = false;
		@@ -54,10 +56,6 @@ public class RecentsDebugFlags implements TunerService.Tunable {
		public static final int MockTaskGroupsTaskCount = 12;
		}

		private static final String KEY_ENABLE_PAGING = "overview_enable_paging";

		private boolean mEnablePaging;

		/**
		* We read the prefs once when we start the activity, then update them as the tuner changes
		* the flags.
		@@ -65,7 +63,6 @@ public class RecentsDebugFlags implements TunerService.Tunable {
		public RecentsDebugFlags(Context context) {
		// Register all our flags, this will also call onTuningChanged() for each key, which will
		// initialize the current state of each flag
		TunerService.get(context).addTunable(this, KEY_ENABLE_PAGING);
		}

		/**
		@@ -83,16 +80,11 @@ public class RecentsDebugFlags implements TunerService.Tunable {
		* @return whether we are enabling paging.
		*/
		public boolean isPagingEnabled() {
		return mEnablePaging;
		return Static.EnablePaging;
		}

		@Override
		public void onTuningChanged(String key, String newValue) {
		switch (key) {
		case KEY_ENABLE_PAGING:
		mEnablePaging = (newValue != null) && (Integer.parseInt(newValue) != 0);
		break;
		}
		EventBus.getDefault().send(new DebugFlagsChangedEvent());
		}
		}