Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e05d71b7 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

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

parents 855099c7 f35406c4

res/xml/app_locale_details.xml

+1 −0
Original line number Diff line number Diff line
@@ -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

+12 −0
Original line number Diff line number Diff line
@@ -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) {