Merge "Move WakeGestureScreenGestureSettings" (50bdbe92) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9892,8 +9892,6 @@

	<!-- Preference and settings suggestion title text for display wake-up gesture [CHAR LIMIT=60]-->		<!-- Preference and settings suggestion title text for display wake-up gesture [CHAR LIMIT=60]-->
	<string name="ambient_display_wake_screen_title">Wake up display</string>		<string name="ambient_display_wake_screen_title">Wake up display</string>
	<!-- Summary text for ambient display wake-up gesture [CHAR LIMIT=NONE]-->
	<string name="ambient_display_wake_screen_summary"></string>

	<!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->		<!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
	<string name="ambient_display_pickup_summary" product="default">To check time, notifications, and other info, pick up your phone.</string>		<string name="ambient_display_pickup_summary" product="default">To check time, notifications, and other info, pick up your phone.</string>

res/xml/security_lockscreen_settings.xml

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -59,12 +59,6 @@
	android:summary="@string/doze_always_on_summary"		android:summary="@string/doze_always_on_summary"
	settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController" />		settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController" />

	<Preference
	android:key="ambient_display_wake_screen"
	android:title="@string/ambient_display_wake_screen_title"
	android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"
	settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />

	<Preference		<Preference
	android:key="ambient_display_tap"		android:key="ambient_display_tap"
	android:title="@string/ambient_display_tap_screen_title"		android:title="@string/ambient_display_tap_screen_title"

res/xml/wake_screen_gesture_settings.xml

deleted100644 → 0

+0 −37

Original line number	Original line	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_wake_screen_screen"
	android:title="@string/ambient_display_wake_screen_title">

	<com.android.settings.widget.VideoPreference
	android:key="gesture_wake_screen_video"
	app:animation="@raw/gesture_ambient_wake_screen"
	app:preview="@drawable/gesture_ambient_wake_screen" />

	<SwitchPreference
	android:key="gesture_wake_screen"
	android:title="@string/ambient_display_wake_screen_title"
	android:summary="@string/ambient_display_wake_screen_summary"
	app:keywords="@string/keywords_gesture"
	app:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController"
	app:allowDividerAbove="true" />

	</PreferenceScreen>
	No newline at end of file

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

deleted100644 → 0

+0 −65

Original line number	Original line	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.app.settings.SettingsEnums;
	import android.content.Context;
	import android.provider.SearchIndexableResource;

	import com.android.settings.R;
	import com.android.settings.dashboard.DashboardFragment;
	import com.android.settings.search.BaseSearchIndexProvider;
	import com.android.settingslib.search.SearchIndexable;

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

	@SearchIndexable
	public class WakeScreenGestureSettings extends DashboardFragment {

	private static final String TAG = "WakeScreenGestureSettings";

	public static final String PREF_KEY_SUGGESTION_COMPLETE =
	"pref_wake_screen_gesture_suggestion_complete";

	@Override
	public int getMetricsCategory() {
	return SettingsEnums.SETTINGS_GESTURE_WAKE_SCREEN;
	}

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

	@Override
	protected int getPreferenceScreenResId() {
	return R.xml.wake_screen_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.wake_screen_gesture_settings;
	return Arrays.asList(sir);
	}
	};

	}

tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java

deleted100644 → 0

+0 −50

Original line number	Original line	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 static com.google.common.truth.Truth.assertThat;

	import android.provider.SearchIndexableResource;

	import org.junit.Before;
	import org.junit.Test;
	import org.junit.runner.RunWith;
	import org.robolectric.RobolectricTestRunner;
	import org.robolectric.RuntimeEnvironment;

	import java.util.List;

	@RunWith(RobolectricTestRunner.class)
	public class WakeScreenGestureSettingsTest {

	private WakeScreenGestureSettings mSettings;

	@Before
	public void setUp() {
	mSettings = new WakeScreenGestureSettings();
	}

	@Test
	public void testSearchIndexProvider_shouldIndexResource() {
	final List<SearchIndexableResource> indexRes =
	WakeScreenGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
	RuntimeEnvironment.application, true /* enabled */);

	assertThat(indexRes).isNotNull();
	assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
	}
	}