From f35406c4b2bfa844695893ec2cec4099135b35b2 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Mon, 9 May 2022 14:37:59 +0800 Subject: [PATCH] [Panlingual] Invisible TopIntroPreference under opt-out mode. Bug: b/231889115 Test: local see b/231889115#2 Change-Id: I44c30f62caf10ab7c57e8ec7d0b2b06148c3fe5c --- res/xml/app_locale_details.xml | 1 + .../applications/appinfo/AppLocaleDetails.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/res/xml/app_locale_details.xml b/res/xml/app_locale_details.xml index 8b1b3705336..e01db2f9389 100644 --- a/res/xml/app_locale_details.xml +++ b/res/xml/app_locale_details.xml @@ -20,6 +20,7 @@ android:title="@string/app_locale_picker_title"> diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java index 53b2b30143e..20cddeca629 100644 --- a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java +++ b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java @@ -30,6 +30,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.LocaleList; import android.os.UserHandle; +import android.util.FeatureFlagUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -62,10 +63,12 @@ public class AppLocaleDetails extends SettingsPreferenceFragment { private static final String KEY_APP_DESCRIPTION = "app_locale_description"; private static final String KEY_WARNINGS = "key_warnings"; + private static final String KEY_APP_DISCLAIMER = "app_locale_disclaimer"; private boolean mCreated = false; private String mPackageName; private LayoutPreference mPrefOfDescription; + private Preference mPrefOfDisclaimer; private ApplicationInfo mApplicationInfo; /** @@ -91,8 +94,10 @@ public class AppLocaleDetails extends SettingsPreferenceFragment { } addPreferencesFromResource(R.xml.app_locale_details); mPrefOfDescription = getPreferenceScreen().findPreference(KEY_APP_DESCRIPTION); + mPrefOfDisclaimer = getPreferenceScreen().findPreference(KEY_APP_DISCLAIMER); mApplicationInfo = getApplicationInfo(mPackageName, getContext().getUserId()); setWarningMessage(); + setDisclaimerPreference(); } // Override here so we don't have an empty screen @@ -171,6 +176,13 @@ public class AppLocaleDetails extends SettingsPreferenceFragment { } } + private void setDisclaimerPreference() { + if (FeatureFlagUtils.isEnabled( + getContext(), FeatureFlagUtils.SETTINGS_APP_LOCALE_OPT_IN_ENABLED)) { + mPrefOfDisclaimer.setVisible(false); + } + } + private void setDescription() { int res = getAppDescription(); if (res != -1) {