Merge "Add logging whenever preference leads to intent."
diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java
index 35c8c0c..1750e75 100644
--- a/src/com/android/settings/EncryptionAndCredential.java
+++ b/src/com/android/settings/EncryptionAndCredential.java
@@ -67,7 +67,7 @@
@Override
public int getMetricsCategory() {
- return MetricsEvent.SECURITY;
+ return MetricsEvent.ENCRYPTION_AND_CREDENTIAL;
}
@Override
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 37a77f9..a54ba4e 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.nfc.NfcAdapter;
import android.os.Bundle;
@@ -45,6 +46,9 @@
public class PaymentSettings extends SettingsPreferenceFragment implements Indexable {
public static final String TAG = "PaymentSettings";
+
+ static final String PAYMENT_KEY = "payment";
+
private PaymentBackend mPaymentBackend;
@Override
@@ -66,7 +70,7 @@
if (appInfos != null && appInfos.size() > 0) {
NfcPaymentPreference preference =
new NfcPaymentPreference(getPrefContext(), mPaymentBackend);
- preference.setKey("payment");
+ preference.setKey(PAYMENT_KEY);
screen.addPreference(preference);
NfcForegroundPreference foreground = new NfcForegroundPreference(getPrefContext(),
mPaymentBackend);
@@ -154,5 +158,14 @@
result.add(data);
return result;
}
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final PackageManager pm = context.getPackageManager();
+ if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null;
+ final List<String> nonVisibleKeys = new ArrayList<String>();
+ nonVisibleKeys.add(PAYMENT_KEY);
+ return nonVisibleKeys;
+ }
};
}
diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
new file mode 100644
index 0000000..9a5002e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2017 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;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EncryptionAndCredentialTest {
+
+ @Test
+ public void getMetricsCategory_shouldReturnEncryptionAndCredential() {
+ EncryptionAndCredential fragment = new EncryptionAndCredential();
+ assertThat(fragment.getMetricsCategory()).isEqualTo(MetricsEvent.ENCRYPTION_AND_CREDENTIAL);
+ }
+
+}