From d4f420350ddb790473938450b511564ab60e9b41 Mon Sep 17 00:00:00 2001 From: hoffc Date: Tue, 7 Dec 2021 17:04:35 +0800 Subject: [PATCH 1/4] Settings: Extend the data role swap timeout value Switching USB data role from device to host, it takes more than 3s in some devices, so 3s timeout is not enough. Extend 3s timeout to 4s to be compatible with some devices with slow swap. Bug: 209541948 Change-Id: I172498d66c5b12166162f2c55d94f0d441c7459c --- src/com/android/settings/connecteddevice/usb/UsbBackend.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java index 244818fe163..7f3a5987d21 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -41,7 +41,10 @@ import java.util.List; */ public class UsbBackend { - static final int PD_ROLE_SWAP_TIMEOUT_MS = 3000; + // extend this value from 3s to 4s because of switching data role + // in USB driver side takes about 3s in some devices, plus the usb + // port change event dispatching time, 3s is not enough. + static final int PD_ROLE_SWAP_TIMEOUT_MS = 4000; static final int NONPD_ROLE_SWAP_TIMEOUT_MS = 15000; private final boolean mFileTransferRestricted; From 2c1fe3ca474c83dbbd0e8214c2205dde3613650d Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 14 Dec 2021 12:32:34 +0800 Subject: [PATCH 2/4] [Settings] Remove the legacy 2-pane registration Test: atest Bug: 209606859 Change-Id: Ia1788cdfd9a9e4c6bfeb25be1257f82900867114 --- .../network/MobileNetworkTwoPaneUtils.java | 29 ------------------- .../settings/sim/SimSelectNotification.java | 4 --- 2 files changed, 33 deletions(-) delete mode 100644 src/com/android/settings/network/MobileNetworkTwoPaneUtils.java diff --git a/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java b/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java deleted file mode 100644 index 8b3503e35f1..00000000000 --- a/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.android.settings.network; - -import android.annotation.Nullable; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import com.android.settings.activityembedding.ActivityEmbeddingRulesController; - -public class MobileNetworkTwoPaneUtils { - - private static final String TAG = "MobileNetworkTwoPaneUtils"; - - /** - * TODO: b/206061070, the problem of multi-instance should be fixed in Android T to apply the - * Settings' architecture and 2 panes mode instead of registering the rule. - * - * The launchMode of MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane. - */ - public static void registerTwoPaneForMobileNetwork(Context context, Intent intent, - @Nullable String secondaryIntentAction) { - Log.d(TAG, "registerTwoPaneForMobileNetwork"); - ActivityEmbeddingRulesController.registerTwoPanePairRuleForSettingsHome( - context, - intent.getComponent(), - secondaryIntentAction /* secondaryIntentAction */, - false /* clearTop */); - } -} diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 84b75231b98..6d157370671 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -52,7 +52,6 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.HelpTrampoline; import com.android.settings.R; -import com.android.settings.network.MobileNetworkTwoPaneUtils; import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.telephony.MobileNetworkActivity; @@ -264,9 +263,6 @@ public class SimSelectNotification extends BroadcastReceiver { Intent resultIntent = new Intent(Settings.ACTION_MMS_MESSAGE_SETTING); resultIntent.setClass(context, MobileNetworkActivity.class); resultIntent.putExtra(Settings.EXTRA_SUB_ID, subId); - // MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane. - MobileNetworkTwoPaneUtils.registerTwoPaneForMobileNetwork(context, resultIntent, - Settings.ACTION_MMS_MESSAGE_SETTING); PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); builder.setContentIntent(resultPendingIntent); From 8eb2aeafa46a60a550ef7a83fd47a7f5c7db148f Mon Sep 17 00:00:00 2001 From: Jason Hsu Date: Tue, 14 Dec 2021 09:39:01 +0000 Subject: [PATCH 3/4] Revert "Add new string to hint user of triple-tap shortcut delay" This reverts commit dc156e77b4d88e9b378df4b8f4d3dfaa3607fbaa. Reason for revert: New flow for magnification switch shortcut need to be fine-tuned again. Punt this flow to Android T, so revert the string. Change-Id: Ieb48b8e3e34b96130193cf8499ff8f49e5954b1f --- res/values/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index b566d982523..85d216e697c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5280,13 +5280,13 @@ Tap the switch button to move between both options - This may slow down your keyboard + Switch to accessibility button? - When using triple-tap to magnify part of your screen, you may notice issues over the keyboard.\n\nTo avoid this, you can change your magnification shortcut from triple-tap to another option.\nChange setting - - Continue anyway - - Cancel + Using triple-tap to magnify part of your screen causes typing and other delays.\n\nThe accessibility button floats on your screen over other apps. Tap it to magnify. + + Switch to accessibility button + + Use triple-tap Magnification settings From ad79a1819fe6d848a72e4c872c0c1fc770f64d2a Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 15 Dec 2021 16:13:14 +0800 Subject: [PATCH 4/4] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4 Test: atest NetworkDashboardFragmentTest Bug: 197066557 Change-Id: I9781af3a53fe7050b414f0574abb7618f8d71707 --- src/com/android/settings/Utils.java | 4 ---- .../settings/datausage/DataUsageList.java | 7 +------ .../network/NetworkDashboardFragment.java | 19 ++----------------- .../settings/wifi/ConfigureWifiSettings.java | 4 +--- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 68861540508..50f6003ce50 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1230,8 +1230,4 @@ public final class Utils extends com.android.settingslib.Utils { public static int getHomepageIconColorHighlight(Context context) { return getColorAttrDefaultColor(context, android.R.attr.textColorSecondaryInverse); } - - public static boolean isProviderModelEnabled(Context context) { - return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); - } } diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index f72a0067c31..cd033e3017c 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -142,12 +142,7 @@ public class DataUsageList extends DataUsageBaseFragment mChart = findPreference(KEY_CHART_DATA); mApps = findPreference(KEY_APPS_GROUP); - // TODO(b/167474581): This is a temporary solution to hide unnecessary warning - // preference, when the provider model is completed, the following code should be removed. - final Preference unnecessaryWarningPreference = - FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL) - ? findPreference("operator_warning") - : findPreference("non_carrier_data_usage_warning"); + final Preference unnecessaryWarningPreference = findPreference("operator_warning"); if (unnecessaryWarningPreference != null) { unnecessaryWarningPreference.setVisible(false); } diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index c7621977773..286e4e36e5b 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -118,9 +118,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements controllers.add(internetPreferenceController); } controllers.add(privateDnsPreferenceController); - if (Utils.isProviderModelEnabled(context)) { - controllers.add(new NetworkProviderCallsSmsController(context, lifecycle)); - } + controllers.add(new NetworkProviderCallsSmsController(context, lifecycle)); return controllers; } @@ -155,20 +153,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.network_and_internet) { - - @Override - // TODO(b/167474581): Should remove this method when Provider Model finished. - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - if (Utils.isProviderModelEnabled(context)) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.network_provider_internet; - return Arrays.asList(sir); - } - return super.getXmlResourcesToIndex(context, enabled); - } - + new BaseSearchIndexProvider(R.xml.network_provider_internet) { @Override public List createPreferenceControllers(Context context) { diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 68d47b55797..6bb4389bddb 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -58,9 +58,7 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { - getActivity().setTitle(R.string.network_and_internet_preferences_title); - } + getActivity().setTitle(R.string.network_and_internet_preferences_title); mCertinstallerPreference = findPreference(KEY_INSTALL_CREDENTIALS); if (mCertinstallerPreference != null) {