From 44895c41c5b8bab8e03188cfdecfebb02a41cd19 Mon Sep 17 00:00:00 2001 From: "eric_kuang.rs" Date: Thu, 12 Oct 2023 16:48:24 +0800 Subject: Fix Learn more link placement is wrong problem - Use the new style of the FooterPreference. Test: Manual test CTS Verifier: com.android.cts.verifier.managedprovisioning.EnterprisePrivacyTestListActivity#Add account disclosure Bug: 271956998 Change-Id: Id1721c53ece12d4dea71a675ebf4860328a3d8c7 --- .../src/com/android/tv/settings/accounts/AccountsFragment.java | 10 +++++++++- .../enterprise/EnterprisePrivacyFeatureProviderImpl.java | 3 --- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java index 391970550..e3c0c11eb 100644 --- a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java +++ b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java @@ -31,6 +31,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.provider.Settings; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -40,6 +41,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settingslib.accounts.AuthenticatorHelper; +import com.android.settingslib.widget.FooterPreference; import com.android.tv.settings.R; import com.android.tv.settings.SettingsPreferenceFragment; import com.android.tv.settings.overlay.FlavorUtils; @@ -175,13 +177,19 @@ public class AccountsFragment extends SettingsPreferenceFragment { } // Show device managed footer information if DO active - final Preference footerPref = findPreference(KEY_DEVICE_OWNER_FOOTER); + final FooterPreference footerPref = findPreference(KEY_DEVICE_OWNER_FOOTER); if (footerPref != null) { final CharSequence deviceOwnerDisclosure = FlavorUtils.getFeatureFactory( getContext()).getEnterprisePrivacyFeatureProvider( getContext()).getDeviceOwnerDisclosure(); footerPref.setTitle(deviceOwnerDisclosure); footerPref.setOrder(ORDER_FOOTER); + final Context context = getContext(); + footerPref.setLearnMoreAction(view -> + context.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)) + ); + final String learnMoreText = context.getString(R.string.learn_more); + footerPref.setLearnMoreText(learnMoreText); footerPref.setVisible(deviceOwnerDisclosure != null); } } diff --git a/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index 3c25e8612..7d01415b7 100644 --- a/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -98,9 +98,6 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe } else { disclosure.append(ResourcesUtil.getString(mContext, "do_disclosure_generic")); } - disclosure.append(ResourcesUtil.getString(mContext, "do_disclosure_learn_more_separator")); - disclosure.append(ResourcesUtil.getString(mContext, "learn_more"), - new EnterprisePrivacySpan(mContext), 0); return disclosure; } -- cgit v1.2.3