From 8eb2aeafa46a60a550ef7a83fd47a7f5c7db148f Mon Sep 17 00:00:00 2001 From: Jason Hsu Date: Tue, 14 Dec 2021 09:39:01 +0000 Subject: [PATCH 1/2] 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 2/2] [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) {