diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ca1628dc21..489bfd7c3cb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6364,6 +6364,7 @@ slide to unlock, password, pattern, PIN work challenge, work, profile work profile, managed profile, unify, unification, work, profile + gesture pay, tap, payments backup, back up @@ -8412,7 +8413,7 @@ Free up space now - Gestures + Gesture shortcuts Quick gestures to control your phone diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml index 0dbf9c788dd..e79d8862378 100644 --- a/res/xml/assist_gesture_settings.xml +++ b/res/xml/assist_gesture_settings.xml @@ -27,7 +27,8 @@ + android:summary="@string/assist_gesture_summary" + app:keywords="@string/keywords_gesture"/> + android:summary="@string/camera_lift_trigger_summary" + app:keywords="@string/keywords_gesture"/> diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml index 54854a85b88..4d89de6da9a 100644 --- a/res/xml/double_tap_power_settings.xml +++ b/res/xml/double_tap_power_settings.xml @@ -22,11 +22,12 @@ + app:preview="@drawable/gesture_double_tap" /> + android:summary="@string/double_tap_power_for_camera_summary" + app:keywords="@string/keywords_gesture" /> \ No newline at end of file diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml index f7fe853958c..1601aaefbca 100644 --- a/res/xml/double_tap_screen_settings.xml +++ b/res/xml/double_tap_screen_settings.xml @@ -27,6 +27,7 @@ + android:summary="@string/ambient_display_summary" + app:keywords="@string/keywords_gesture"/> \ No newline at end of file diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml index f77d7788afa..94d97825eb1 100644 --- a/res/xml/double_twist_gesture_settings.xml +++ b/res/xml/double_twist_gesture_settings.xml @@ -27,6 +27,7 @@ + android:summary="@string/double_twist_for_camera_mode_summary" + app:keywords="@string/keywords_gesture"/> \ No newline at end of file diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml index 8c83767dc84..d88cd110024 100644 --- a/res/xml/language_and_input.xml +++ b/res/xml/language_and_input.xml @@ -63,42 +63,43 @@ + android:title="@string/gesture_preference_title" + settings:keywords="@string/keywords_gesture"> + android:fragment="com.android.settings.gestures.AssistGestureSettings" /> + android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" /> + android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" /> + android:fragment="com.android.settings.gestures.PickupGestureSettings" /> + android:fragment="com.android.settings.gestures.CameraLiftTriggerSettings" /> + android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" /> + android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" /> diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml index 78122aa4a70..0b4a1de367c 100644 --- a/res/xml/pick_up_gesture_settings.xml +++ b/res/xml/pick_up_gesture_settings.xml @@ -23,11 +23,12 @@ + app:preview="@drawable/gesture_ambient_lift" /> + android:summary="@string/ambient_display_pickup_summary" + app:keywords="@string/keywords_gesture" /> \ No newline at end of file diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml index b26af385c2e..6269bdc4177 100644 --- a/res/xml/swipe_to_notification_settings.xml +++ b/res/xml/swipe_to_notification_settings.xml @@ -27,6 +27,7 @@ + android:summary="@string/fingerprint_swipe_for_notifications_summary" + app:keywords="@string/keywords_gesture"/> \ No newline at end of file diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java index 1750e75036d..f6f17cfacc6 100644 --- a/src/com/android/settings/EncryptionAndCredential.java +++ b/src/com/android/settings/EncryptionAndCredential.java @@ -253,7 +253,7 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen @Override public List getNonIndexableKeys(Context context) { - final List keys = new ArrayList(); + final List keys = super.getNonIndexableKeys(context); final UserManager um = UserManager.get(context); diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index f8bab3d3c70..3fe740eaa7d 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -110,7 +110,7 @@ public class BackupSettingsActivity extends Activity implements Indexable { @Override public List getNonIndexableKeys(Context context) { - final List keys = new ArrayList(); + final List keys = super.getNonIndexableKeys(context); // For non-primary user, no backup is available, so don't show it in search // TODO: http://b/22388012 diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 27492ce812f..254d5e29156 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -131,9 +131,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @Override public List getNonIndexableKeys(Context context) { + final List keys = super.getNonIndexableKeys(context); PackageManager pm = context.getPackageManager(); - final List keys = new ArrayList(); - if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) { keys.add(NfcPreferenceController.KEY_TOGGLE_NFC); keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS); diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java index ce2bc8d00b0..c2a18e9c938 100644 --- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java +++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java @@ -226,7 +226,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme @Override public List getNonIndexableKeys(Context context) { - final ArrayList result = new ArrayList(); + final List result = super.getNonIndexableKeys(context); if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) { result.add("mobile"); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 512dc179fa3..9eb10c87b4d 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -870,7 +870,7 @@ public class PowerUsageSummary extends PowerUsageBase implements @Override public List getNonIndexableKeys(Context context) { - List niks = new ArrayList<>(); + List niks = super.getNonIndexableKeys(context); // Duplicates in display niks.add(KEY_AUTO_BRIGHTNESS); niks.add(KEY_SCREEN_TIMEOUT); diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 869cef9e3d0..a39305644ae 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -207,7 +207,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements @Override public List getNonIndexableKeys(Context context) { - List keys = new ArrayList<>(); + List keys = super.getNonIndexableKeys(context); // Remove master switch as a result keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); return keys; diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 47de1a55a32..64161d15c15 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -33,14 +33,13 @@ import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; +import com.android.settings.search.SearchIndexableRaw; -import java.util.Arrays; import java.util.ArrayList; import java.util.List; @@ -162,11 +161,13 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index @Override public List getNonIndexableKeys(Context context) { + final List nonVisibleKeys = super.getNonIndexableKeys(context); final PackageManager pm = context.getPackageManager(); - if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null; - final List nonVisibleKeys = new ArrayList(); + if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) { + return nonVisibleKeys; + } nonVisibleKeys.add(PAYMENT_KEY); return nonVisibleKeys; } - }; + }; } diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 232666a636e..cd328d9bb7c 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -198,7 +198,7 @@ public class WifiP2pSettings extends DashboardFragment if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DIALOG_PEER)) { WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER); - mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device); + mSelectedWifiPeer = new WifiP2pPeer(getPrefContext(), device); } if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) { mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME); @@ -533,7 +533,7 @@ public class WifiP2pSettings extends DashboardFragment if (DBG) Log.d(TAG, "List of available peers"); for (WifiP2pDevice peer: mPeers.getDeviceList()) { if (DBG) Log.d(TAG, "-> " + peer); - mPeerCategoryController.addChild(new WifiP2pPeer(getActivity(), peer)); + mPeerCategoryController.addChild(new WifiP2pPeer(getPrefContext(), peer)); if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++; } if (DBG) Log.d(TAG, " mConnectedDevices " + mConnectedDevices); diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 7e898fbe9db..b54125ebdbc 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,11 +18,11 @@ package com.android.settings.nfc; import android.content.Context; - import android.content.pm.PackageManager; -import android.content.pm.PackageParser; + import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,7 +33,6 @@ import org.robolectric.annotation.Config; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @@ -67,6 +66,6 @@ public class PaymentSettingsTest { when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true); List niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); - assertThat(niks).isNull(); + assertThat(niks).isEmpty(); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index 85ad49543cd..ab8891b2c69 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -369,6 +369,7 @@ public class DatabaseIndexingManagerTest { mContext.getString(R.string.fingerprint_swipe_for_notifications_title); final String prefSummary = mContext.getString(R.string.fingerprint_swipe_for_notifications_summary); + final String keywords = mContext.getString(R.string.keywords_gesture); Cursor cursor = mDb.rawQuery( "SELECT * FROM prefs_index where data_title='" + prefTitle + "'", null); cursor.moveToFirst(); @@ -392,7 +393,7 @@ public class DatabaseIndexingManagerTest { // Entries - only on for list preferences assertThat(cursor.getString(8)).isNull(); // Keywords - assertThat(cursor.getString(9)).isEmpty(); + assertThat(cursor.getString(9)).isEqualTo(keywords); // Screen Title assertThat(cursor.getString(10)).isEqualTo( mContext.getString(R.string.fingerprint_swipe_for_notifications_title)); diff --git a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java index 35486ef59f5..69c2589730e 100644 --- a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java +++ b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java @@ -19,12 +19,12 @@ package com.android.settings.search; import android.content.Context; import android.provider.SearchIndexableResource; + import com.android.settings.core.PreferenceController; -import java.util.ArrayList; import java.util.List; -public class FakeIndexProvider implements Indexable { +public class FakeIndexProvider implements Indexable { public static final String KEY = "TestKey"; @@ -38,7 +38,7 @@ public class FakeIndexProvider implements Indexable { @Override public List getNonIndexableKeys(Context context) { - ArrayList result = new ArrayList<>(); + List result = super.getNonIndexableKeys(context); result.add(KEY); return result; }