Merge "Refactor Settings for injection v2 inline toggle"
diff --git a/res/layout-land/nfc_payment_empty.xml b/res/layout-land/nfc_payment_empty.xml
new file mode 100644
index 0000000..842792c
--- /dev/null
+++ b/res/layout-land/nfc_payment_empty.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="horizontal">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical|right"
+ android:src="@drawable/tapandpay_emptystate"/>
+ <TextView
+ android:layout_width="264dp"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="36dp"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/nfc_payment_no_apps"/>
+</LinearLayout>
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index 2878c3e..a72352d 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -28,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:minWidth="48dip"
+ android:minHeight="48dp"
android:layout_gravity="center_vertical"
android:focusable="true"
android:focusableInTouchMode="true"
@@ -36,7 +37,7 @@
<Spinner
android:id="@+id/size_spinner"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:entries="@array/bytes_picker_sizes" />
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 29d7b53..7fdcd8d 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -86,13 +86,16 @@
android:orientation="horizontal"
android:gravity="center_vertical">
- <ImageView android:id="@+id/add_msg_expander"
+ <ImageView
+ android:id="@+id/add_msg_expander"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:importantForAccessibility="no"
android:gravity="center_vertical"
android:contentDescription="@null" />
- <TextView android:id="@+id/add_msg"
+ <TextView
+ android:id="@+id/add_msg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
diff --git a/res/layout/trusted_credential_list_container.xml b/res/layout/trusted_credential_list_container.xml
index aca0bc8..42dbfd9 100644
--- a/res/layout/trusted_credential_list_container.xml
+++ b/res/layout/trusted_credential_list_container.xml
@@ -16,6 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:clipToPadding="true"
+ android:clipChildren="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/header_view"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 45b9274..c9460dd 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1252,6 +1252,17 @@
<item>LTE/TDSCDMA/GSM/WCDMA</item>
<item>TDSCDMA/CDMA/EVDO/GSM/WCDMA </item>
<item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>
+ <item>NR only</item>
+ <item>NR/LTE</item>
+ <item>NR/LTE/CDME/EvDo</item>
+ <item>NR/LTE/GSM/WCDMA</item>
+ <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+ <item>NR/LTE/WCDMA</item>
+ <item>NR/LTE/TDSCDMA</item>
+ <item>NR/LTE/TDSCDMA/GSM</item>
+ <item>NR/LTE/TDSCDMA/WCDMA</item>
+ <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
+ <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
</string-array>
<!-- The preferred network modes RIL constants, in order of the modes above,
e.g. the choice "GSM/WCDMA preferred" has the corresponding value "0" -->
@@ -1279,6 +1290,17 @@
<item>"20"</item>
<item>"21"</item>
<item>"22"</item>
+ <item>"23"</item>
+ <item>"24"</item>
+ <item>"25"</item>
+ <item>"26"</item>
+ <item>"27"</item>
+ <item>"28"</item>
+ <item>"29"</item>
+ <item>"30"</item>
+ <item>"31"</item>
+ <item>"32"</item>
+ <item>"33"</item>
</string-array>
<!-- Choices for CDMA subscription-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 53f96a0..0c7825f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4048,14 +4048,6 @@
<!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
<string name="settings_safetylegal_activity_loading">Loading\u2026</string>
- <!-- ConfirmDeviceCredential settings-->
- <!-- Button text shown on BiometricPrompt (system dialog that asks for biometric authentication) giving the user the option to use an alternate form of authentication (Pin) [CHAR LIMIT=30] -->
- <string name="confirm_device_credential_pin">Use PIN</string>
- <!-- Button text shown on BiometricPrompt (system dialog that asks for biometric authentication) giving the user the option to use an alternate form of authentication (Pattern) [CHAR LIMIT=30] -->
- <string name="confirm_device_credential_pattern">Use pattern</string>
- <!-- Button text shown on BiometricPrompt (system dialog that asks for biometric authentication) giving the user the option to use an alternate form of authentication (Pass) [CHAR LIMIT=30] -->
- <string name="confirm_device_credential_password">Use password</string>
-
<!-- Lock Pattern settings -->
<!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=40] -->
<string name="lockpassword_choose_your_screen_lock_header">Set screen lock</string>
@@ -10862,6 +10854,8 @@
<string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
<!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>
+ <!-- LTE/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/CDMA/EvDo/GSM/WCDMA</string>
<!-- Global [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>
<!-- LTE / WCDMA [CHAR LIMIT=NONE] -->
@@ -10890,7 +10884,37 @@
<string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
<!-- LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- NR only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_only_summary">Preferred network mode: NR only</string>
+ <!-- NR / LTE [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_summary">Preferred network mode: NR / LTE</string>
+ <!-- NR/LTE/CDME/EvDo [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_cdma_evdo_summary">Preferred network mode: NR/LTE/CDME/EvDo</string>
+ <!-- NR/LTE/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_gsm_wcdma_summary">Preferred network mode: NR/LTE/GSM/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- NR/LTE/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_wcdma_summary">Preferred network mode: NR/LTE/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_summary">Preferred network mode: NR/LTE/TDSCDMA</string>
+ <!-- NR/LTE/TDSCDMA/GSM [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_gsm_summary">Preferred network mode: NR/LTE/TDSCDMA/GSM</string>
+ <!-- NR/LTE/TDSCDMA/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_gsm_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/GSM/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- Text for Network mode recommended [CHAR LIMIT=NONE] -->
+ <string name="network_recommended">\u0020(recommended)</string>
+ <!-- Text for Network 5g [CHAR LIMIT=NONE] -->
+ <string name="network_5G" translatable="false">5G</string>
+ <!-- Text for Network lte [CHAR LIMIT=NONE] -->
+ <string name="network_lte_pure" translatable="false">LTE</string>
+ <!-- Text for Network 4g [CHAR LIMIT=NONE] -->
+ <string name="network_4G_pure" translatable="false">4G</string>
<!-- Text for Network lte [CHAR LIMIT=NONE] -->
<string name="network_lte">LTE (recommended)</string>
<!-- Text for Network 4g [CHAR LIMIT=NONE] -->
diff --git a/res/xml/firmware_version.xml b/res/xml/firmware_version.xml
index f55ee11..443ae35 100644
--- a/res/xml/firmware_version.xml
+++ b/res/xml/firmware_version.xml
@@ -27,6 +27,7 @@
android:key="os_firmware_version"
android:title="@string/firmware_version"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDetailPreferenceController"/>
@@ -42,6 +43,7 @@
android:key="module_version"
android:title="@string/module_version"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreferenceController"/>
@@ -50,6 +52,7 @@
android:key="base_band"
android:title="@string/baseband_version"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.BasebandVersionPreferenceController"/>
@@ -58,6 +61,7 @@
android:key="kernel_version"
android:title="@string/kernel_version"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.KernelVersionPreferenceController"/>
@@ -66,7 +70,8 @@
android:key="os_build_number"
android:title="@string/build_number"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.SimpleBuildNumberPreferenceController"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ffb035a..054e6cf 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -101,28 +101,40 @@
private static final String TAG = "RadioInfo";
private static final String[] mPreferredNetworkLabels = {
- "WCDMA preferred",
+ "GSM/WCDMA preferred",
"GSM only",
"WCDMA only",
- "GSM auto (PRL)",
- "CDMA auto (PRL)",
+ "GSM/WCDMA auto (PRL)",
+ "CDMA/EvDo auto (PRL)",
"CDMA only",
"EvDo only",
- "Global auto (PRL)",
- "LTE/CDMA auto (PRL)",
- "LTE/UMTS auto (PRL)",
- "LTE/CDMA/UMTS auto (PRL)",
+ "CDMA/EvDo/GSM/WCDMA (PRL)",
+ "CDMA + LTE/EvDo (PRL)",
+ "GSM/WCDMA/LTE (PRL)",
+ "LTE/CDMA/EvDo/GSM/WCDMA (PRL)",
"LTE only",
"LTE/WCDMA",
- "TD-SCDMA only",
- "TD-SCDMA/WCDMA",
- "LTE/TD-SCDMA",
- "TD-SCDMA/GSM",
- "TD-SCDMA/UMTS",
- "LTE/TD-SCDMA/WCDMA",
- "LTE/TD-SCDMA/UMTS",
- "TD-SCDMA/CDMA/UMTS",
- "Global/TD-SCDMA",
+ "TDSCDMA only",
+ "TDSCDMA/WCDMA",
+ "LTE/TDSCDMA",
+ "TDSCDMA/GSM",
+ "LTE/TDSCDMA/GSM",
+ "TDSCDMA/GSM/WCDMA",
+ "LTE/TDSCDMA/WCDMA",
+ "LTE/TDSCDMA/GSM/WCDMA",
+ "TDSCDMA/CDMA/EvDo/GSM/WCDMA ",
+ "LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",
+ "NR only",
+ "NR/LTE",
+ "NR/LTE/CDME/EvDo",
+ "NR/LTE/GSM/WCDMA",
+ "NR/LTE/CDMA/EvDo/GSM/WCDMA",
+ "NR/LTE/WCDMA",
+ "NR/LTE/TDSCDMA",
+ "NR/LTE/TDSCDMA/GSM",
+ "NR/LTE/TDSCDMA/WCDMA",
+ "NR/LTE/TDSCDMA/GSM/WCDMA",
+ "NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",
"Unknown"
};
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 8b06975..3e534b3 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -347,7 +347,6 @@
}
};
mAddMsgExpander.setOnClickListener(onClickListener);
- mAddMsg.setOnClickListener(onClickListener);
// Determine whether the message can be collapsed - getLineCount() gives the correct
// number of lines only after a layout pass.
@@ -360,7 +359,6 @@
boolean hideMsgExpander = mAddMsg.getLineCount() <= maxLines;
mAddMsgExpander.setVisibility(hideMsgExpander ? View.GONE : View.VISIBLE);
if (hideMsgExpander) {
- mAddMsg.setOnClickListener(null);
((View)mAddMsgExpander.getParent()).invalidate();
}
mAddMsg.getViewTreeObserver().removeOnGlobalLayoutListener(this);
diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
index 695a714..e557847 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
@@ -57,26 +57,24 @@
if (UsbManager.ACTION_USB_STATE.equals(intent.getAction())) {
mConnected = intent.getExtras().getBoolean(UsbManager.USB_CONNECTED)
|| intent.getExtras().getBoolean(UsbManager.USB_HOST_CONNECTED);
- if (mConnected) {
- long functions = UsbManager.FUNCTION_NONE;
- if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_MTP)
- && intent.getExtras().getBoolean(UsbManager.USB_DATA_UNLOCKED, false)) {
- functions |= UsbManager.FUNCTION_MTP;
- }
- if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_PTP)
- && intent.getExtras().getBoolean(UsbManager.USB_DATA_UNLOCKED, false)) {
- functions |= UsbManager.FUNCTION_PTP;
- }
- if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_MIDI)) {
- functions |= UsbManager.FUNCTION_MIDI;
- }
- if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_RNDIS)) {
- functions |= UsbManager.FUNCTION_RNDIS;
- }
- mFunctions = functions;
- mDataRole = mUsbBackend.getDataRole();
- mPowerRole = mUsbBackend.getPowerRole();
+ long functions = UsbManager.FUNCTION_NONE;
+ if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_MTP)
+ && intent.getExtras().getBoolean(UsbManager.USB_DATA_UNLOCKED, false)) {
+ functions |= UsbManager.FUNCTION_MTP;
}
+ if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_PTP)
+ && intent.getExtras().getBoolean(UsbManager.USB_DATA_UNLOCKED, false)) {
+ functions |= UsbManager.FUNCTION_PTP;
+ }
+ if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_MIDI)) {
+ functions |= UsbManager.FUNCTION_MIDI;
+ }
+ if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_RNDIS)) {
+ functions |= UsbManager.FUNCTION_RNDIS;
+ }
+ mFunctions = functions;
+ mDataRole = mUsbBackend.getDataRole();
+ mPowerRole = mUsbBackend.getPowerRole();
} else if (UsbManager.ACTION_USB_PORT_CHANGED.equals(intent.getAction())) {
UsbPortStatus portStatus = intent.getExtras()
.getParcelable(UsbManager.EXTRA_PORT_STATUS);
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index d4f1283..12e978f 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -26,12 +26,14 @@
import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
import com.google.android.collect.Lists;
@@ -49,12 +51,31 @@
OnStartTetheringCallback mOnStartTetheringCallback = new OnStartTetheringCallback();
@VisibleForTesting
long mPreviousFunctions;
+ @VisibleForTesting
+ long mCurrentFunctions;
+ @VisibleForTesting
+ boolean mIsStartTethering = false;
+
+ private UsbConnectionBroadcastReceiver mUsbReceiver;
+
+ @VisibleForTesting
+ UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener =
+ (connected, functions, powerRole, dataRole) -> {
+ if (mIsStartTethering) {
+ mCurrentFunctions = functions;
+ refresh(functions);
+ }
+ };
@Override
public void onAttach(Context context) {
super.onAttach(context);
mUsbBackend = new UsbBackend(context);
mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+ mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener,
+ mUsbBackend);
+ getSettingsLifecycle().addObserver(mUsbReceiver);
+ mCurrentFunctions = mUsbBackend.getDefaultUsbFunctions();
}
@Override
@@ -118,9 +139,12 @@
if (functions == UsbManager.FUNCTION_RNDIS) {
// We need to have entitlement check for usb tethering, so use API in
// ConnectivityManager.
+ mIsStartTethering = true;
mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
mOnStartTetheringCallback);
} else {
+ mIsStartTethering = false;
+ mCurrentFunctions = functions;
mUsbBackend.setDefaultUsbFunctions(functions);
}
@@ -128,6 +152,12 @@
return true;
}
+ @Override
+ public void onPause() {
+ super.onPause();
+ mUsbBackend.setDefaultUsbFunctions(mCurrentFunctions);
+ }
+
@VisibleForTesting
final class OnStartTetheringCallback extends
ConnectivityManager.OnStartTetheringCallback {
@@ -136,6 +166,7 @@
public void onTetheringStarted() {
super.onTetheringStarted();
// Set default usb functions again to make internal data persistent
+ mCurrentFunctions = UsbManager.FUNCTION_RNDIS;
mUsbBackend.setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
}
@@ -146,4 +177,19 @@
updateCandidates();
}
}
+
+ private void refresh(long functions) {
+ final PreferenceScreen screen = getPreferenceScreen();
+ for (long option : UsbDetailsFunctionsController.FUNCTIONS_MAP.keySet()) {
+ final RadioButtonPreference pref =
+ screen.findPreference(UsbBackend.usbFunctionsToString(option));
+ if (pref != null) {
+ final boolean isSupported = mUsbBackend.areFunctionsSupported(option);
+ pref.setEnabled(isSupported);
+ if (isSupported) {
+ pref.setChecked(functions == option);
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 7d53e22..3abb36a 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -26,9 +26,12 @@
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
+import android.telephony.RadioAccessFamily;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
@@ -42,6 +45,9 @@
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.R;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Preference controller for "Enabled network mode"
*/
@@ -49,6 +55,7 @@
TelephonyBasePreferenceController implements
ListPreference.OnPreferenceChangeListener, LifecycleObserver {
+ private static final String LOG_TAG = "EnabledNetworkMode";
private CarrierConfigManager mCarrierConfigManager;
private ContentObserver mPreferredNetworkModeObserver;
private TelephonyManager mTelephonyManager;
@@ -56,6 +63,8 @@
@VisibleForTesting
boolean mShow4GForLTE;
private Preference mPreference;
+ @VisibleForTesting
+ boolean mDisplay5gList = false;
public EnabledNetworkModePreferenceController(Context context, String key) {
super(context, key);
@@ -149,6 +158,11 @@
? carrierConfig.getBoolean(
CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL)
: false;
+
+ final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
+ mDisplay5gList = checkSupportedRadioBitmask(
+ supportedRadioBitmask, mTelephonyManager.NETWORK_TYPE_BITMASK_NR);
+
lifecycle.addObserver(this);
}
@@ -249,6 +263,139 @@
preference.setEntryValues(
R.array.preferred_network_mode_values_world_mode);
}
+
+ if (mDisplay5gList) {
+ add5gListItem(preference);
+ }
+ }
+
+ @VisibleForTesting
+ boolean checkSupportedRadioBitmask(long supportedRadioBitmask, long targetBitmask) {
+ Log.d(LOG_TAG, "supportedRadioBitmask: " + supportedRadioBitmask);
+ if ((targetBitmask & supportedRadioBitmask) > 0) {
+ return true;
+ }
+ return false;
+ }
+
+ /***
+ * Preferred network list add 5G item.
+ *
+ * @string/enabled_networks_cdma_choices
+ * Before | After
+ * @string/network_lte , 8 |@string/network_5G + @string/network_recommended , 25
+ * @string/network_3G , 4 |@string/network_lte_pure, 8
+ * @string/network_1x , 5 |@string/network_3G , 4
+ * @string/network_global, 10|@string/network_1x , 5
+ * |@string/network_global , 27
+ *
+ * @string/enabled_networks_cdma_only_lte_choices
+ * Before | After
+ * @string/network_lte , 8 |@string/network_5G + @string/network_recommended , 25
+ * @string/network_global, 10|@string/network_lte_pure, 8
+ * |@string/network_global , 27
+ *
+ * @string/enabled_networks_tdscdma_choices
+ * Before | After
+ * @string/network_lte, 22|@string/network_5G + @string/network_recommended , 33
+ * @string/network_3G , 18|@string/network_lte_pure, 22
+ * @string/network_2G , 1 |@string/network_3G , 18
+ * |@string/network_2G , 1
+ *
+ * @string/enabled_networks_except_gsm_4g_choices
+ * Before | After
+ * @string/network_4G , 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_4G_pure , 9
+ * |@string/network_3G , 0
+ *
+ * @string/enabled_networks_except_gsm_choices
+ * Before | After
+ * @string/network_lte, 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_lte_pure, 9
+ * |@string/network_3G , 0
+ *
+ * @string/enabled_networks_4g_choices
+ * Before | After
+ * @string/network_4G , 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_4G_pure , 9
+ * @string/network_2G , 1 |@string/network_3G , 0
+ * |@string/network_2G , 1
+ *
+ * @string/enabled_networks_choices
+ * Before | After
+ * @string/network_lte, 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_lte_pure, 9
+ * @string/network_2G , 1 |@string/network_3G , 0
+ * |@string/network_2G , 1
+ *
+ * @string/preferred_network_mode_choices_world_mode
+ * Before | After
+ * "Global" , 10|@string/network_global , 27
+ * "LTE / CDMA" , 8 |"LTE / CDMA" , 8
+ * "LTE / GSM / UMTS" , 9 |"LTE / GSM / UMTS" , 9
+ */
+ @VisibleForTesting
+ void add5gListItem(ListPreference preference) {
+ final CharSequence[] oldEntries = preference.getEntries();
+ final CharSequence[] oldEntryValues = preference.getEntryValues();
+ List<CharSequence> newEntries = new ArrayList<>();
+ List<CharSequence> newEntryValues = new ArrayList<>();
+
+ CharSequence oldEntry;
+ CharSequence oldEntryValue;
+ CharSequence new5gEntry;
+ CharSequence new5gEntryValue;
+
+ for (int i = 0; i < oldEntries.length; i++) {
+ oldEntry = oldEntries[i];
+ oldEntryValue = oldEntryValues[i];
+ new5gEntry = "";
+ new5gEntryValue = "";
+
+ if (mContext.getString(R.string.network_lte).equals(oldEntry)) {
+ oldEntry = mContext.getString(R.string.network_lte_pure);
+ new5gEntry = mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended);
+ new5gEntryValue = transformLteEntryValueTo5gEntryValue(oldEntryValue);
+ } else if (mContext.getString(R.string.network_4G).equals(oldEntry)) {
+ oldEntry = mContext.getString(R.string.network_4G_pure);
+ new5gEntry = mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended);
+ new5gEntryValue = transformLteEntryValueTo5gEntryValue(oldEntryValue);
+ } else if (mContext.getString(R.string.network_global).equals(oldEntry)) {
+ //oldEntry: network_global
+ //oldEntryValue: TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA
+ oldEntryValue = Integer.toString(
+ TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
+ }
+
+ if (!TextUtils.isEmpty(new5gEntry)) {
+ newEntries.add(new5gEntry);
+ newEntryValues.add(new5gEntryValue);
+ }
+ newEntries.add(oldEntry);
+ newEntryValues.add(oldEntryValue);
+ }
+
+ preference.setEntries(newEntries.toArray(new CharSequence[newEntries.size()]));
+ preference.setEntryValues(newEntryValues.toArray(new CharSequence[newEntryValues.size()]));
+ }
+
+ /**
+ * LTE network mode transform to 5G network mode.
+ *
+ * @param networkMode this is LTE network mode.
+ * @return 5G network mode.
+ */
+ private CharSequence transformLteEntryValueTo5gEntryValue(CharSequence networkMode) {
+ int networkModeInt = Integer.valueOf(networkMode.toString());
+ return Integer.toString(addNrToNetworkType(networkModeInt));
+ }
+
+ private int addNrToNetworkType(int networkType) {
+ long networkTypeBitmasks = RadioAccessFamily.getRafFromNetworkType(networkType);
+ networkTypeBitmasks |= mTelephonyManager.NETWORK_TYPE_BITMASK_NR;
+ return RadioAccessFamily.getNetworkTypeFromRaf((int) networkTypeBitmasks);
}
private void updatePreferenceValueAndSummary(ListPreference preference, int networkMode) {
@@ -312,7 +459,8 @@
} else {
preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO));
- preference.setSummary(R.string.network_lte);
+ preference.setSummary(
+ mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte);
}
break;
case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
@@ -347,7 +495,8 @@
preference.setValue(
Integer.toString(TelephonyManager
.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
- preference.setSummary(R.string.network_lte);
+ preference.setSummary(
+ mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte);
} else {
preference.setValue(
Integer.toString(TelephonyManager
@@ -357,11 +506,34 @@
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
preference.setSummary(R.string.network_global);
} else {
- preference.setSummary(mShow4GForLTE
- ? R.string.network_4G : R.string.network_lte);
+ if (mDisplay5gList) {
+ preference.setSummary(mShow4GForLTE
+ ? R.string.network_4G_pure : R.string.network_lte_pure);
+ } else {
+ preference.setSummary(mShow4GForLTE
+ ? R.string.network_4G : R.string.network_lte);
+ }
}
}
break;
+ case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO:
+ case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+ preference.setValue(Integer.toString(networkMode));
+ preference.setSummary(mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended));
+ break;
+ case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA));
+ if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+ || mIsGlobalCdma
+ || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ preference.setSummary(R.string.network_global);
+ } else {
+ preference.setSummary(mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended));
+ }
+ break;
default:
preference.setSummary(
mContext.getString(R.string.mobile_network_mode_error, networkMode));
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 560ddbf..bbe5f29 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -30,6 +30,10 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -70,10 +74,11 @@
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
-
- View emptyView = getActivity().getLayoutInflater().inflate(
- R.layout.nfc_payment_empty, null, false);
- ((ViewGroup) view.findViewById(android.R.id.list_container)).addView(emptyView);
+ if (isShowEmptyImage(getPreferenceScreen())) {
+ View emptyView = getActivity().getLayoutInflater().inflate(
+ R.layout.nfc_payment_empty, null, false);
+ ((ViewGroup) view.findViewById(android.R.id.list_container)).addView(emptyView);
+ }
}
@Override
@@ -97,6 +102,17 @@
menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
}
+ @VisibleForTesting
+ boolean isShowEmptyImage(PreferenceScreen screen) {
+ for (int i = 0; i < screen.getPreferenceCount(); i++) {
+ final Preference preference = screen.getPreference(i);
+ if(preference.isVisible()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.nfc_payment_settings) {
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 66b665b..9898719 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -24,7 +24,6 @@
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
-import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
@@ -91,20 +90,6 @@
}
};
- // TODO(b/123378871): Remove when moved.
- private final IBiometricConfirmDeviceCredentialCallback mCancelCallback
- = new IBiometricConfirmDeviceCredentialCallback.Stub() {
- @Override
- public void cancel() {
- final Activity activity = getActivity();
- if (activity != null) {
- activity.finish();
- } else {
- Log.e(TAG, "Activity null!");
- }
- }
- };
-
/**
* @param bundle Bundle passed from {@link BiometricPrompt.Builder#buildIntent()}
* @return
@@ -150,46 +135,19 @@
final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(getContext())
.setTitle(mBundle.getString(BiometricPrompt.KEY_TITLE))
.setUseDefaultTitle() // use default title if title is null/empty
- .setFromConfirmDeviceCredential()
+ .setDeviceCredentialAllowed(true)
.setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
.setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
.setConfirmationRequired(
mBundle.getBoolean(BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true));
- final LockPatternUtils lockPatternUtils = FeatureFactory.getFactory(
- getContext())
- .getSecurityFeatureProvider()
- .getLockPatternUtils(getContext());
-
- switch (lockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
- case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
- builder.setNegativeButton(getResources().getString(
- R.string.confirm_device_credential_pattern),
- mClientExecutor, mNegativeButtonListener);
- break;
- case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
- case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
- builder.setNegativeButton(getResources().getString(
- R.string.confirm_device_credential_pin),
- mClientExecutor, mNegativeButtonListener);
- break;
- case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
- case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
- case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
- case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
- builder.setNegativeButton(getResources().getString(
- R.string.confirm_device_credential_password),
- mClientExecutor, mNegativeButtonListener);
- break;
- }
-
mBiometricPrompt = builder.build();
mCancellationSignal = new CancellationSignal();
// TODO: CC doesn't use crypto for now
mAuthenticating = true;
mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
- mAuthenticationCallback, mUserId, mCancelCallback);
+ mAuthenticationCallback, mUserId);
}
@Override
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 4e2e90d..f86292b 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -725,30 +725,6 @@
}
/**
- * Keeps track of the biometric removal status. When all biometrics (including managed
- * profiles) are removed, finishes the activity. Otherwise, it's possible the UI still
- * shows enrolled biometrics due to the async remove.
- */
- private class RemovalTracker {
- boolean mFingerprintDone;
- boolean mFaceDone;
-
- void onFingerprintDone() {
- mFingerprintDone = true;
- if (mFingerprintDone && mFaceDone) {
- finish();
- }
- }
-
- void onFaceDone() {
- mFaceDone = true;
- if (mFingerprintDone && mFaceDone) {
- finish();
- }
- }
- }
-
- /**
* Invokes an activity to change the user's pattern, password or PIN based on given quality
* and minimum quality specified by DevicePolicyManager. If quality is
* {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, password is cleared.
@@ -781,21 +757,15 @@
}
if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+ // Clearing of user biometrics when screen lock is cleared is done at
+ // LockSettingsService.removeBiometricsForUser().
mChooseLockSettingsHelper.utils().clearLock(mUserPassword, mUserId);
mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
getActivity().setResult(Activity.RESULT_OK);
- removeAllBiometricsForUserAndFinish(mUserId);
- } else {
- removeAllBiometricsForUserAndFinish(mUserId);
+ finish();
}
}
- private void removeAllBiometricsForUserAndFinish(final int userId) {
- final RemovalTracker tracker = new RemovalTracker();
- removeAllFingerprintForUserAndFinish(userId, tracker);
- removeAllFaceForUserAndFinish(userId, tracker);
- }
-
private Intent getIntentForUnlockMethod(int quality) {
Intent intent = null;
if (quality >= DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
@@ -808,128 +778,6 @@
return intent;
}
- private void removeAllFingerprintForUserAndFinish(final int userId,
- RemovalTracker tracker) {
- if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
- if (mFingerprintManager.hasEnrolledFingerprints(userId)) {
- mFingerprintManager.setActiveUser(userId);
- // For the purposes of M and N, groupId is the same as userId.
- final int groupId = userId;
- Fingerprint finger = new Fingerprint(null, groupId, 0, 0);
- mFingerprintManager.remove(finger, userId,
- new RemovalCallback() {
- @Override
- public void onRemovalError(Fingerprint fp, int errMsgId,
- CharSequence errString) {
- Log.e(TAG, String.format(
- "Can't remove fingerprint %d in group %d. Reason: %s",
- fp.getBiometricId(), fp.getGroupId(), errString));
- // TODO: need to proceed with the removal of managed profile
- // fingerprints and finish() gracefully.
- }
-
- @Override
- public void onRemovalSucceeded(Fingerprint fp, int remaining) {
- if (remaining == 0) {
- removeManagedProfileFingerprintsAndFinishIfNecessary(userId,
- tracker);
- }
- }
- });
- } else {
- // No fingerprints in this user, we may also want to delete managed profile
- // fingerprints
- removeManagedProfileFingerprintsAndFinishIfNecessary(userId, tracker);
- }
- } else {
- // The removal callback will call finish, once all fingerprints are removed.
- // We need to wait for that to occur, otherwise, the UI will still show that
- // fingerprints exist even though they are (about to) be removed depending on
- // the race condition.
- tracker.onFingerprintDone();
- }
- }
-
- private void removeManagedProfileFingerprintsAndFinishIfNecessary(final int parentUserId,
- RemovalTracker tracker) {
- if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
- mFingerprintManager.setActiveUser(UserHandle.myUserId());
- }
- boolean hasChildProfile = false;
- if (!mUserManager.getUserInfo(parentUserId).isManagedProfile()) {
- // Current user is primary profile, remove work profile fingerprints if necessary
- final List<UserInfo> profiles = mUserManager.getProfiles(parentUserId);
- final int profilesSize = profiles.size();
- for (int i = 0; i < profilesSize; i++) {
- final UserInfo userInfo = profiles.get(i);
- if (userInfo.isManagedProfile() && !mLockPatternUtils
- .isSeparateProfileChallengeEnabled(userInfo.id)) {
- removeAllFingerprintForUserAndFinish(userInfo.id, tracker);
- hasChildProfile = true;
- break;
- }
- }
- }
- if (!hasChildProfile) {
- tracker.onFingerprintDone();
- }
- }
-
- // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness
- private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) {
- if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
- if (mFaceManager.hasEnrolledTemplates(userId)) {
- mFaceManager.setActiveUser(userId);
- Face face = new Face(null, 0, 0);
- mFaceManager.remove(face, userId,
- new FaceManager.RemovalCallback() {
- @Override
- public void onRemovalError(Face face, int errMsgId, CharSequence err) {
- Log.e(TAG, String.format("Can't remove face %d. Reason: %s",
- face.getBiometricId(), err));
- }
- @Override
- public void onRemovalSucceeded(Face face, int remaining) {
- if (remaining == 0) {
- removeManagedProfileFacesAndFinishIfNecessary(userId, tracker);
- }
- }
- });
- } else {
- // No faces in this user, we may also want to delete managed profile faces
- removeManagedProfileFacesAndFinishIfNecessary(userId, tracker);
- }
- } else {
- tracker.onFaceDone();
- }
- }
-
- // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness
- private void removeManagedProfileFacesAndFinishIfNecessary(final int parentUserId,
- RemovalTracker tracker) {
- if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
- mFaceManager.setActiveUser(UserHandle.myUserId());
- }
- boolean hasChildProfile = false;
- if (!mUserManager.getUserInfo(parentUserId).isManagedProfile()) {
- // Current user is primary profile, remove work profile faces if necessary
- final List<UserInfo> profiles = mUserManager.getProfiles(parentUserId);
- final int profilesSize = profiles.size();
- for (int i = 0; i < profilesSize; i++) {
- final UserInfo userInfo = profiles.get(i);
- if (userInfo.isManagedProfile() && !mLockPatternUtils
- .isSeparateProfileChallengeEnabled(userInfo.id)) {
- removeAllFaceForUserAndFinish(userInfo.id, tracker);
- hasChildProfile = true;
- break;
- }
- }
- }
- if (!hasChildProfile) {
- tracker.onFaceDone();
- }
- }
-
@Override
public void onDestroy() {
super.onDestroy();
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 8476f92..1da2a63 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -90,8 +90,6 @@
private TrustManager mTrustManager;
private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private Handler mHandler = new Handler(Looper.getMainLooper());
- private boolean mIsFallback; // BiometricPrompt fallback
- private boolean mCCLaunched;
private String mTitle;
private String mDetails;
@@ -108,10 +106,6 @@
if (!mGoingToBackground) {
if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED
|| errorCode == BiometricPrompt.BIOMETRIC_ERROR_CANCELED) {
- if (mIsFallback) {
- mBiometricManager.onConfirmDeviceCredentialError(
- errorCode, getStringForError(errorCode));
- }
finish();
} else {
// All other errors go to some version of CC
@@ -128,10 +122,6 @@
ConfirmDeviceCredentialUtils.checkForPendingIntent(
ConfirmDeviceCredentialActivity.this);
- if (mIsFallback) {
- mBiometricManager.onConfirmDeviceCredentialSuccess();
- }
-
setResult(Activity.RESULT_OK);
finish();
}
@@ -183,17 +173,11 @@
mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
final LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
- Bundle bpBundle =
- intent.getBundleExtra(KeyguardManager.EXTRA_BIOMETRIC_PROMPT_BUNDLE);
- if (bpBundle != null) {
- mIsFallback = true;
- mTitle = bpBundle.getString(BiometricPrompt.KEY_TITLE);
- mDetails = bpBundle.getString(BiometricPrompt.KEY_SUBTITLE);
- } else {
- bpBundle = new Bundle();
- bpBundle.putString(BiometricPrompt.KEY_TITLE, mTitle);
- bpBundle.putString(BiometricPrompt.KEY_DESCRIPTION, mDetails);
- }
+ final Bundle bpBundle = new Bundle();
+ mTitle = bpBundle.getString(BiometricPrompt.KEY_TITLE);
+ mDetails = bpBundle.getString(BiometricPrompt.KEY_SUBTITLE);
+ bpBundle.putString(BiometricPrompt.KEY_TITLE, mTitle);
+ bpBundle.putString(BiometricPrompt.KEY_DESCRIPTION, mDetails);
boolean launchedBiometric = false;
boolean launchedCDC = false;
@@ -257,12 +241,6 @@
}
}
- if (mIsFallback && !mCCLaunched) {
- mBiometricManager.onConfirmDeviceCredentialError(
- BiometricConstants.BIOMETRIC_ERROR_CANCELED,
- getString(com.android.internal.R.string.biometric_error_user_canceled));
- }
-
finish();
} else {
mGoingToBackground = false;
@@ -314,7 +292,6 @@
* Shows ConfirmDeviceCredentials for normal apps.
*/
private void showConfirmCredentials() {
- mCCLaunched = true;
boolean launched = false;
// The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
// CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 5407776..a30d2e1 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -17,15 +17,12 @@
package com.android.settings.password;
import android.app.KeyguardManager;
-import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricManager;
-import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback;
import android.os.Bundle;
import android.os.UserManager;
import android.util.Log;
import android.view.MenuItem;
import android.view.WindowManager;
-import android.widget.LinearLayout;
import androidx.fragment.app.Fragment;
@@ -50,16 +47,6 @@
private boolean mFirstTimeVisible = true;
private boolean mIsKeyguardLocked = false;
private ConfirmCredentialTheme mConfirmCredentialTheme;
- private BiometricManager mBiometricManager;
-
- // TODO(b/123378871): Remove when moved.
- private final IBiometricConfirmDeviceCredentialCallback mCancelCallback
- = new IBiometricConfirmDeviceCredentialCallback.Stub() {
- @Override
- public void cancel() {
- finish();
- }
- };
private boolean isInternalActivity() {
return (this instanceof ConfirmLockPassword.InternalActivity)
@@ -90,9 +77,6 @@
}
super.onCreate(savedState);
- mBiometricManager = getSystemService(BiometricManager.class);
- mBiometricManager.registerCancellationCallback(mCancelCallback);
-
if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {
// Prevent the content parent from consuming the window insets because GlifLayout uses
// it to show the status bar background.
@@ -167,15 +151,10 @@
@Override
public void onStop() {
super.onStop();
- // TODO(b/123378871): Remove when moved.
- if (!isChangingConfigurations()) {
- mBiometricManager.onConfirmDeviceCredentialError(
- BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED,
- getString(com.android.internal.R.string.biometric_error_user_canceled));
- if (getIntent().getBooleanExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_FOREGROUND_ONLY, false)) {
- finish();
- }
+ final boolean foregroundOnly = getIntent().getBooleanExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_FOREGROUND_ONLY, false);
+ if (!isChangingConfigurations() && foregroundOnly) {
+ finish();
}
}
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 12b2724..5c891cd 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -446,7 +446,6 @@
ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils,
mUserManager, mEffectiveUserId);
}
- mBiometricManager.onConfirmDeviceCredentialSuccess();
startDisappearAnimation(intent);
ConfirmDeviceCredentialUtils.checkForPendingIntent(getActivity());
} else {
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index f43ee7f..b1d8e60 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -490,7 +490,6 @@
ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils,
mUserManager, mEffectiveUserId);
}
- mBiometricManager.onConfirmDeviceCredentialSuccess();
startDisappearAnimation(intent);
ConfirmDeviceCredentialUtils.checkForPendingIntent(getActivity());
} else {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index d8663fc..4afe22a 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -16,12 +16,15 @@
package com.android.settings.connecteddevice.usb;
+import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
+import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
import static android.net.ConnectivityManager.TETHERING_USB;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +32,8 @@
import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
@@ -52,7 +57,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFragment = new UsbDefaultFragment();
+ mFragment = new TestFragment();
mFragment.mUsbBackend = mUsbBackend;
mFragment.mConnectivityManager = mConnectivityManager;
}
@@ -156,4 +161,77 @@
verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
}
+
+ @Test
+ public void onPause_receivedRndis_shouldSetRndis() {
+ mFragment.mIsStartTethering = true;
+ mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+ UsbManager.FUNCTION_RNDIS, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+ mFragment.onPause();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
+ assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_RNDIS);
+ }
+
+ @Test
+ public void onPause_receivedNone_shouldSetNone() {
+ mFragment.mIsStartTethering = true;
+ mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+ UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+ mFragment.onPause();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_NONE);
+ assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_NONE);
+ }
+
+ @Test
+ public void onPause_receivedMtp_shouldSetMtp() {
+ mFragment.mIsStartTethering = true;
+ mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+ UsbManager.FUNCTION_MTP, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+ mFragment.onPause();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_MTP);
+ assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_MTP);
+ }
+
+ @Test
+ public void onPause_receivedPtp_shouldSetPtp() {
+ mFragment.mIsStartTethering = true;
+ mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+ UsbManager.FUNCTION_PTP, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+ mFragment.onPause();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_PTP);
+ assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_PTP);
+ }
+
+ @Test
+ public void onPause_receivedMidi_shouldSetMidi() {
+ mFragment.mIsStartTethering = true;
+ mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+ UsbManager.FUNCTION_MIDI, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+ mFragment.onPause();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_MIDI);
+ assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_MIDI);
+ }
+
+ public static class TestFragment extends UsbDefaultFragment {
+ public final PreferenceScreen mScreen;
+
+ public TestFragment() {
+ mScreen = mock(PreferenceScreen.class);
+ }
+
+ @Override
+ public PreferenceScreen getPreferenceScreen() {
+ return mScreen;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index a4d708e..773041d 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -148,6 +148,26 @@
}
@Test
+ public void init_initDisplay5gList_returnTrue() {
+ long testBitmask = TelephonyManager.NETWORK_TYPE_BITMASK_NR
+ | TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
+ doReturn(testBitmask).when(mTelephonyManager).getSupportedRadioAccessFamily();
+
+ mController.init(mLifecycle, SUB_ID);
+
+ assertThat(mController.mDisplay5gList).isTrue();
+ }
+
+ @Test
+ public void checkSupportedRadioBitmask_nrBitmask_returnTrue() {
+ long testBitmask = TelephonyManager.NETWORK_TYPE_BITMASK_NR
+ | TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
+
+ assertThat(mController.checkSupportedRadioBitmask(testBitmask,
+ TelephonyManager.NETWORK_TYPE_BITMASK_NR)).isTrue();
+ }
+
+ @Test
public void updateState_updateByNetworkMode() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
@@ -172,6 +192,203 @@
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
}
+ /**
+ * @string/enabled_networks_cdma_choices
+ * Before | After
+ * @string/network_lte , 8 |@string/network_5G + @string/network_recommended , 25
+ * @string/network_3G , 4 |@string/network_lte_pure, 8
+ * @string/network_1x , 5 |@string/network_3G , 4
+ * @string/network_global, 10|@string/network_1x , 5
+ * |@string/network_global , 27
+ *
+ * @string/enabled_networks_cdma_only_lte_choices
+ * Before | After
+ * @string/network_lte , 8 |@string/network_5G + @string/network_recommended , 25
+ * @string/network_global, 10|@string/network_lte_pure, 8
+ * |@string/network_global , 27
+ */
+ @Test
+ public void add5gListItem_lteCdma_5gLteCdma() {
+ //case#1
+ mPreference.setEntries(R.array.enabled_networks_cdma_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_cdma_values);
+ CharSequence[] testEntries = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_lte_pure)
+ , mContext.getString(R.string.network_3G)
+ , mContext.getString(R.string.network_1x)
+ , mContext.getString(R.string.network_global)};
+ CharSequence[] testEntryValues = {"25", "8", "4", "5", "27"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues);
+
+ //case#2
+ mPreference.setEntries(R.array.enabled_networks_cdma_only_lte_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_cdma_only_lte_values);
+ CharSequence[] testEntries1 = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_lte_pure)
+ , mContext.getString(R.string.network_global)};
+ CharSequence[] testEntryValues1 = {"25", "8", "27"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries1);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues1);
+ }
+
+ /**
+ * @string/enabled_networks_except_gsm_4g_choices
+ * Before | After
+ * @string/network_4G , 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_4G_pure , 9
+ * |@string/network_3G , 0
+ *
+ * @string/enabled_networks_except_gsm_choices
+ * Before | After
+ * @string/network_lte, 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_lte_pure, 9
+ * |@string/network_3G , 0
+ *
+ * @string/enabled_networks_4g_choices
+ * Before | After
+ * @string/network_4G , 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_4G_pure , 9
+ * @string/network_2G , 1 |@string/network_3G , 0
+ * |@string/network_2G , 1
+ *
+ * @string/enabled_networks_choices
+ * Before | After
+ * @string/network_lte, 9 |@string/network_5G + @string/network_recommended , 26
+ * @string/network_3G , 0 |@string/network_lte_pure, 9
+ * @string/network_2G , 1 |@string/network_3G , 0
+ * |@string/network_2G , 1
+ */
+ @Test
+ public void add5gListItem_lteGsm_5gLteGsm() {
+ //csae#1
+ mPreference.setEntries(R.array.enabled_networks_except_gsm_4g_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_except_gsm_values);
+ CharSequence[] testEntries = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_4G_pure)
+ , mContext.getString(R.string.network_3G)};
+ CharSequence[] testEntryValues = {"26", "9", "0"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues);
+
+ //case#2
+ mPreference.setEntries(R.array.enabled_networks_except_gsm_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_except_gsm_values);
+ CharSequence[] testEntries1 = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_lte_pure)
+ , mContext.getString(R.string.network_3G)};
+ CharSequence[] testEntryValues1 = {"26", "9", "0"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries1);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues1);
+
+ //case#3
+ mPreference.setEntries(R.array.enabled_networks_4g_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_values);
+ CharSequence[] testEntries2 = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_4G_pure)
+ , mContext.getString(R.string.network_3G)
+ , mContext.getString(R.string.network_2G)};
+ CharSequence[] testEntryValues2 = {"26", "9", "0", "1"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries2);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues2);
+
+ //case#4
+ mPreference.setEntries(R.array.enabled_networks_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_values);
+ CharSequence[] testEntries3 = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_lte_pure)
+ , mContext.getString(R.string.network_3G)
+ , mContext.getString(R.string.network_2G)};
+ CharSequence[] testEntryValues3 = {"26", "9", "0", "1"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries3);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues3);
+ }
+
+ /**
+ * @string/preferred_network_mode_choices_world_mode
+ * Before | After
+ * "Global" , 10|@string/network_global , 27
+ * "LTE / CDMA" , 8 |"LTE / CDMA" , 8
+ * "LTE / GSM / UMTS" , 9 |"LTE / GSM / UMTS" , 9
+ */
+ @Test
+ public void add5gListItem_worldPhone_Global() {
+ mPreference.setEntries(R.array.preferred_network_mode_choices_world_mode);
+ mPreference.setEntryValues(R.array.preferred_network_mode_values_world_mode);
+ CharSequence[] testEntries = {mContext.getString(R.string.network_global)
+ , "LTE / CDMA"
+ , "LTE / GSM / UMTS"};
+ CharSequence[] testEntryValues = {"27", "8", "9"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues);
+ }
+
+ /**
+ * @string/enabled_networks_tdscdma_choices
+ * Before | After
+ * @string/network_lte, 22|@string/network_5G + @string/network_recommended , 33
+ * @string/network_3G , 18|@string/network_lte_pure, 22
+ * @string/network_2G , 1 |@string/network_3G , 18
+ * |@string/network_2G , 1
+ */
+ @Test
+ public void add5gListItem_td_5gTd() {
+ mPreference.setEntries(R.array.enabled_networks_tdscdma_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_tdscdma_values);
+ CharSequence[] testEntries = {mContext.getString(R.string.network_5G)
+ + mContext.getString(R.string.network_recommended)
+ , mContext.getString(R.string.network_lte_pure)
+ , mContext.getString(R.string.network_3G)
+ , mContext.getString(R.string.network_2G)};
+ CharSequence[] testEntryValues = {"33", "22", "18", "1"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues);
+ }
+
+ @Test
+ public void add5gListItem_noLte_no5g() {
+ mPreference.setEntries(R.array.enabled_networks_except_lte_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_except_lte_values);
+ CharSequence[] testEntries = {mContext.getString(R.string.network_3G)
+ , mContext.getString(R.string.network_2G)};
+ CharSequence[] testEntryValues = {"0", "1"};
+
+ mController.add5gListItem(mPreference);
+
+ assertThat(mPreference.getEntries()).isEqualTo(testEntries);
+ assertThat(mPreference.getEntryValues()).isEqualTo(testEntryValues);
+ }
+
@Test
public void onPreferenceChange_updateSuccess() {
doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 1293ee4..513da65 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -29,6 +29,10 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -113,6 +117,34 @@
assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY, PAYMENT_SCREEN_KEY);
}
+ @Test
+ public void isShowEmptyImage_hasVisiblePreference_returnFalse() {
+ final PaymentSettings paymentSettings = new PaymentSettings();
+ final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+ final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
+ final Preference preference1 = new Preference(mContext);
+ screen.addPreference(preference1);
+ final Preference preference2 = new Preference(mContext);
+ screen.addPreference(preference2);
+
+ assertThat(paymentSettings.isShowEmptyImage(screen)).isFalse();
+ }
+
+ @Test
+ public void isShowEmptyImage_hasNoVisiblePreference_returnTrue() {
+ final PaymentSettings paymentSettings = new PaymentSettings();
+ final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+ final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
+ final Preference preference1 = new Preference(mContext);
+ preference1.setVisible(false);
+ screen.addPreference(preference1);
+ final Preference preference2 = new Preference(mContext);
+ screen.addPreference(preference2);
+ preference2.setVisible(false);
+
+ assertThat(paymentSettings.isShowEmptyImage(screen)).isTrue();
+ }
+
@Implements(PaymentBackend.class)
public static class ShadowPaymentBackend {
private ArrayList<PaymentBackend.PaymentAppInfo> mAppInfos;