diff --git a/res/drawable-nodpi/gesture_ambient_tap_screen b/res/drawable-nodpi/gesture_ambient_tap_screen new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/raw/gesture_ambient_tap_screen.mp4 b/res/raw/gesture_ambient_tap_screen.mp4 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/values/strings.xml b/res/values/strings.xml index 313521af130..1a4f6bff1b7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9730,6 +9730,16 @@ + + Tap to check phone + + Tap to check tablet + + Tap to check device + + + To check time, notifications, and other info, tap your screen. + Swipe fingerprint for notifications diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml index df862512793..4b17bd95e15 100644 --- a/res/xml/gestures.xml +++ b/res/xml/gestures.xml @@ -63,6 +63,12 @@ android:fragment="com.android.settings.gestures.SwipeUpGestureSettings" settings:controller="com.android.settings.gestures.SwipeUpPreferenceController" /> + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java new file mode 100644 index 00000000000..bbffc7cdab7 --- /dev/null +++ b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2019 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_TAP_SCREEN_GESTURE; + +import android.annotation.UserIdInt; +import android.content.Context; +import android.os.UserHandle; +import android.provider.Settings; +import android.text.TextUtils; + +import com.android.internal.hardware.AmbientDisplayConfiguration; + +public class TapScreenGesturePreferenceController extends GesturePreferenceController { + + private static final String PREF_KEY_VIDEO = "gesture_tap_screen_video"; + + private AmbientDisplayConfiguration mAmbientConfig; + @UserIdInt + private final int mUserId; + + public TapScreenGesturePreferenceController(Context context, String key) { + super(context, key); + mUserId = UserHandle.myUserId(); + } + + public TapScreenGesturePreferenceController setConfig(AmbientDisplayConfiguration config) { + mAmbientConfig = config; + return this; + } + + @Override + public int getAvailabilityStatus() { + // No hardware support for this Gesture + if (!getAmbientConfig().tapSensorAvailable()) { + return UNSUPPORTED_ON_DEVICE; + } + + return AVAILABLE; + } + + @Override + public boolean isSliceable() { + return true; + } + + @Override + protected String getVideoPrefKey() { + return PREF_KEY_VIDEO; + } + + @Override + public CharSequence getSummary() { + return super.getSummary(); + } + + @Override + public boolean isChecked() { + return getAmbientConfig().tapGestureEnabled(mUserId); + } + + @Override + public boolean setChecked(boolean isChecked) { + return Settings.Secure.putInt(mContext.getContentResolver(), DOZE_TAP_SCREEN_GESTURE, + isChecked ? 1 : 0); + } + + private AmbientDisplayConfiguration getAmbientConfig() { + if (mAmbientConfig == null) { + mAmbientConfig = new AmbientDisplayConfiguration(mContext); + } + return mAmbientConfig; + } +} \ No newline at end of file diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java new file mode 100644 index 00000000000..d80c03d8f78 --- /dev/null +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2019 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.settings.search.Indexable; +import com.android.settingslib.search.SearchIndexable; + +import java.util.Arrays; +import java.util.List; + +@SearchIndexable +public class TapScreenGestureSettings extends DashboardFragment { + private static final String TAG = "TapScreenGestureSettings"; + + public static final String PREF_KEY_SUGGESTION_COMPLETE = + "pref_tap_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(TapScreenGesturePreferenceController.class) + .setConfig(new AmbientDisplayConfiguration(context)); + } + + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.SETTINGS_GESTURE_TAP_SCREEN; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.tap_screen_gesture_settings; + } + + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.tap_screen_gesture_settings; + return Arrays.asList(sir); + } + }; +} diff --git a/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java new file mode 100644 index 00000000000..c09e4ebe011 --- /dev/null +++ b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2019 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.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.when; + +import android.content.Context; + +import com.android.internal.hardware.AmbientDisplayConfiguration; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class TapScreenGesturePreferenceControllerTest { + + private static final String KEY_WAKE_LOCK_SCREEN = "gesture_tap_screen"; + + @Mock + private Context mContext; + @Mock + private AmbientDisplayConfiguration mAmbientDisplayConfiguration; + + private TapScreenGesturePreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mController = new TapScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN); + mController.setConfig(mAmbientDisplayConfiguration); + } + + @Test + public void testIsChecked_configIsSet_shouldReturnTrue() { + // Set the setting to be enabled. + when(mAmbientDisplayConfiguration.tapGestureEnabled(anyInt())).thenReturn(true); + assertThat(mController.isChecked()).isTrue(); + } + + @Test + public void testIsChecked_configIsNotSet_shouldReturnFalse() { + // Set the setting to be disabled. + when(mAmbientDisplayConfiguration.tapGestureEnabled(anyInt())).thenReturn(false); + assertThat(mController.isChecked()).isFalse(); + } + + @Test + public void getAvailabilityStatus_gestureNotSupported_UNSUPPORTED_ON_DEVICE() { + when(mAmbientDisplayConfiguration.tapSensorAvailable()).thenReturn(false); + final int availabilityStatus = mController.getAvailabilityStatus(); + + assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailabilityStatus_gestureSupported_AVAILABLE() { + when(mAmbientDisplayConfiguration.tapSensorAvailable()).thenReturn(true); + final int availabilityStatus = mController.getAvailabilityStatus(); + + assertThat(availabilityStatus).isEqualTo(AVAILABLE); + } + + @Test + public void isSliceable() { + final TapScreenGesturePreferenceController controller = + new TapScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN); + assertThat(controller.isSliceable()).isTrue(); + } +}