PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I509db9fd641d6fae51491d9b805605bf633dda6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-05-09 17:37:05 +00:00
committed by Automerger Merge Worker
parent d0a8b7a9e8 e05d71b702
commit 1ec36569da
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/app_locale_details.xml
View File

@@ -20,6 +20,7 @@
android:title="@string/app_locale_picker_title"> android:title="@string/app_locale_picker_title">
<com.android.settingslib.widget.TopIntroPreference <com.android.settingslib.widget.TopIntroPreference
android:key="app_locale_disclaimer"
android:title="@string/desc_app_locale_disclaimer" android:title="@string/desc_app_locale_disclaimer"
android:order="1"/> android:order="1"/>

12
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -30,6 +30,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.LocaleList; import android.os.LocaleList;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; 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_APP_DESCRIPTION = "app_locale_description";
private static final String KEY_WARNINGS = "key_warnings"; private static final String KEY_WARNINGS = "key_warnings";
private static final String KEY_APP_DISCLAIMER = "app_locale_disclaimer";
private boolean mCreated = false; private boolean mCreated = false;
private String mPackageName; private String mPackageName;
private LayoutPreference mPrefOfDescription; private LayoutPreference mPrefOfDescription;
private Preference mPrefOfDisclaimer;
private ApplicationInfo mApplicationInfo; private ApplicationInfo mApplicationInfo;
/** /**
@@ -91,8 +94,10 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
} }
addPreferencesFromResource(R.xml.app_locale_details); addPreferencesFromResource(R.xml.app_locale_details);
mPrefOfDescription = getPreferenceScreen().findPreference(KEY_APP_DESCRIPTION); mPrefOfDescription = getPreferenceScreen().findPreference(KEY_APP_DESCRIPTION);
mPrefOfDisclaimer = getPreferenceScreen().findPreference(KEY_APP_DISCLAIMER);
mApplicationInfo = getApplicationInfo(mPackageName, getContext().getUserId()); mApplicationInfo = getApplicationInfo(mPackageName, getContext().getUserId());
setWarningMessage(); setWarningMessage();
setDisclaimerPreference();
} }
// Override here so we don't have an empty screen // 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() { private void setDescription() {
int res = getAppDescription(); int res = getAppDescription();
if (res != -1) { if (res != -1) {