Merge "Add 'Reach to check' to lock screen settings" (259986da) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -9584,6 +9584,20 @@
		<!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
		<string name="ambient_display_pickup_summary" product="device">To check time, notifications, and other info, pick up your device.</string>

		<!-- Preference and settings suggestion title text for reach gesture (phone) [CHAR LIMIT=60]-->
		<string name="ambient_display_reach_title" product="default">Reach to check phone</string>
		<!-- Preference and settings suggestion title text for reach gesture (tablet) [CHAR LIMIT=60]-->
		<string name="ambient_display_reach_title" product="tablet">Reach to check tablet</string>
		<!-- Preference and settings suggestion title text for reach gesture (device) [CHAR LIMIT=60]-->
		<string name="ambient_display_reach_title" product="device">Reach to check device</string>

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

		<!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
		<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
		<!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->

res/xml/reach_gesture_settings.xml

0 → 100644

+37 −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_reach_screen"
		android:title="@string/ambient_display_reach_title">

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

		<SwitchPreference
		android:key="gesture_reach"
		android:title="@string/ambient_display_reach_title"
		android:summary="@string/ambient_display_reach_summary"
		app:keywords="@string/keywords_gesture"
		app:controller="com.android.settings.gestures.ReachGesturePreferenceController"
		app:allowDividerAbove="true" />

		</PreferenceScreen>
		No newline at end of file

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ import androidx.annotation.VisibleForTesting;

		public class PickupGesturePreferenceController extends GesturePreferenceController {

		private final int ON = 1;
		private final int OFF = 0;
		private static final int ON = 1;
		private static final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_pick_up_video";
		private final String mPickUpPrefKey;

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

0 → 100644

+96 −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 static android.provider.Settings.Secure.DOZE_REACH_GESTURE;

		import android.annotation.UserIdInt;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.text.TextUtils;

		import com.android.internal.hardware.AmbientDisplayConfiguration;

		public class ReachGesturePreferenceController extends GesturePreferenceController {

		private static final int ON = 1;
		private static final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_reach_video";
		private final String mReachUpPrefKey;

		private AmbientDisplayConfiguration mAmbientConfig;
		@UserIdInt
		private final int mUserId;

		public ReachGesturePreferenceController(Context context, String key) {
		super(context, key);
		mUserId = UserHandle.myUserId();
		mReachUpPrefKey = key;
		}

		public ReachGesturePreferenceController setConfig(AmbientDisplayConfiguration config) {
		mAmbientConfig = config;
		return this;
		}

		@Override
		public int getAvailabilityStatus() {
		// No hardware support for Reach Gesture
		if (!getAmbientConfig().reachGestureAvailable()) {
		return UNSUPPORTED_ON_DEVICE;
		}

		return AVAILABLE;
		}

		@Override
		public boolean isSliceable() {
		return TextUtils.equals(getPreferenceKey(), "gesture_reach");
		}

		@Override
		protected String getVideoPrefKey() {
		return PREF_KEY_VIDEO;
		}

		@Override
		public boolean isChecked() {
		return getAmbientConfig().reachGestureEnabled(mUserId);
		}

		@Override
		public String getPreferenceKey() {
		return mReachUpPrefKey;
		}

		@Override
		public boolean setChecked(boolean isChecked) {
		return Settings.Secure.putInt(mContext.getContentResolver(), DOZE_REACH_GESTURE,
		isChecked ? ON : OFF);
		}

		private AmbientDisplayConfiguration getAmbientConfig() {
		if (mAmbientConfig == null) {
		mAmbientConfig = new AmbientDisplayConfiguration(mContext);
		}

		return mAmbientConfig;
		}
		}

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

0 → 100644

+81 −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.hardware.AmbientDisplayConfiguration;
		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 com.android.settingslib.search.SearchIndexable;

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

		@SearchIndexable
		public class ReachGestureSettings extends DashboardFragment {

		private static final String TAG = "ReachGestureSettings";

		public static final String PREF_KEY_SUGGESTION_COMPLETE =
		"pref_reach_gesture_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();

		use(ReachGesturePreferenceController.class)
		.setConfig(new AmbientDisplayConfiguration(context));
		}

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

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

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

		}