commit e05d71b702f55f59e7d4ea02edde2d2db9d586ab
author Tom Hsu <tomhsu@google.com> Mon May 09 10:32:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 09 10:32:58 2022 +0000
tree 5424d319b0701733c20e27e7a7d8c675d79a2833
parent 855099c7047b103cd7405019ef6121831b1e7422
parent f35406c4b2bfa844695893ec2cec4099135b35b2

Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev

res/xml/app_locale_details.xml

diff --git a/res/xml/app_locale_details.xml b/res/xml/app_locale_details.xml
index 8b1b370..e01db2f 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">
 
     <com.android.settingslib.widget.TopIntroPreference
+        android:key="app_locale_disclaimer"
         android:title="@string/desc_app_locale_disclaimer"
         android:order="1"/>
 

src/com/android/settings/applications/appinfo/AppLocaleDetails.java

diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
index 53b2b30..20cddec 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.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 @@
 
     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 @@
         }
         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 @@
         }
     }
 
+    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) {