Merge "Adds the Swipe Up settings page under gestures" into pi-dev (cb5899f7) · Commits · e / os / android_packages_apps_Settings

res/xml/gestures.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,12 @@
		android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings"
		settings:controller="com.android.settings.gestures.DoubleTwistPreferenceController" />

		<Preference
		android:key="gesture_swipe_up_input_summary"
		android:title="@string/swipe_up_to_switch_apps_title"
		android:fragment="com.android.settings.gestures.SwipeUpGestureSettings"
		settings:controller="com.android.settings.gestures.SwipeUpPreferenceController" />

		<Preference
		android:key="gesture_double_tap_screen_input_summary"
		android:title="@string/ambient_display_title"

res/xml/swipe_up_gesture_settings.xml

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:key="gesture_swipe_up_screen"
		android:title="@string/swipe_up_to_switch_apps_title">

		<SwitchPreference
		android:key="gesture_swipe_up"
		android:title="@string/swipe_up_to_switch_apps_title"
		android:summary="@string/swipe_up_to_switch_apps_summary"
		app:keywords="@string/keywords_gesture"
		app:controller="com.android.settings.gestures.SwipeUpPreferenceController" />

		</PreferenceScreen>
		No newline at end of file

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ import com.android.settings.gestures.AssistGestureSettings;
		import com.android.settings.gestures.DoubleTapPowerSettings;
		import com.android.settings.gestures.DoubleTapScreenSettings;
		import com.android.settings.gestures.DoubleTwistGestureSettings;
		import com.android.settings.gestures.SwipeUpGestureSettings;
		import com.android.settings.gestures.PickupGestureSettings;
		import com.android.settings.gestures.SwipeToNotificationSettings;
		import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
		@@ -188,6 +189,7 @@ public class SettingsGateway {
		DoubleTapScreenSettings.class.getName(),
		PickupGestureSettings.class.getName(),
		DoubleTwistGestureSettings.class.getName(),
		SwipeUpGestureSettings.class.getName(),
		CryptKeeperSettings.class.getName(),
		DataUsageSummary.class.getName(),
		DataUsageSummaryLegacy.class.getName(),

src/com/android/settings/gestures/GestureSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ public class GestureSettings extends DashboardFragment {
		private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";
		private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";
		private static final String KEY_PREVENT_RINGING = "gesture_prevent_ringing_summary";
		private static final String KEY_SWIPE_UP = "gesture_swipe_up_input_summary";

		private AmbientDisplayConfiguration mAmbientDisplayConfig;

		@@ -96,6 +97,7 @@ public class GestureSettings extends DashboardFragment {
		keys.add(KEY_SWIPE_DOWN);
		keys.add(KEY_DOUBLE_TAP_POWER);
		keys.add(KEY_DOUBLE_TWIST);
		keys.add(KEY_SWIPE_UP);
		keys.add(KEY_DOUBLE_TAP_SCREEN);
		keys.add(KEY_PICK_UP);
		keys.add(KEY_PREVENT_RINGING);

src/com/android/settings/gestures/SwipeUpGestureSettings.java

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.gestures;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.provider.SearchIndexableResource;

		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;

		import java.util.Arrays;
		import java.util.List;

		public class SwipeUpGestureSettings extends DashboardFragment {

		private static final String TAG = "SwipeUpGesture";

		public static final String PREF_KEY_SUGGESTION_COMPLETE =
		"pref_swipe_up_suggestion_complete";

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
		.getSuggestionFeatureProvider(context);
		SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
		prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
		}

		@Override
		public int getMetricsCategory() {
		return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_UP;
		}

		@Override
		protected String getLogTag() {
		return TAG;
		}

		@Override
		protected int getPreferenceScreenResId() {
		return R.xml.swipe_up_gesture_settings;
		}

		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.swipe_up_gesture_settings;
		return Arrays.asList(sir);
		}

		@Override
		protected boolean isPageSearchEnabled(Context context) {
		return SwipeUpPreferenceController.isGestureAvailable(context);
		}
		};
		}