diff --git a/res/values/strings.xml b/res/values/strings.xml index 7fecac48a99..1669e769b3a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5298,13 +5298,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 diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 42a6068ad17..2988ddcaedb 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/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; 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/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/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/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); 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) {