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

Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 am: 14594156b5

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

Change-Id: I5afa0971ae60ea78706c736e5fd5916ad436a1a4
This commit is contained in:
TreeHugger Robot
2021-06-11 01:56:13 +00:00
committed by Automerger Merge Worker
parent 8ca853a790 14594156b5
commit 7bba656513
3 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
View File

@@ -17,16 +17,19 @@
package com.android.settings.accounts;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.widget.FooterPreference;
public class EnterpriseDisclosurePreferenceController extends BasePreferenceController {
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
public EnterpriseDisclosurePreferenceController(Context context, String key) {
@@ -36,6 +39,16 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
.getEnterprisePrivacyFeatureProvider(mContext);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final CharSequence disclosure = getDisclosure();
if (disclosure == null) {
return;
}
updateFooterPreference(screen, disclosure);
}
@Override
public int getAvailabilityStatus() {
if (getDisclosure() == null) {
@@ -49,12 +62,18 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
return mFeatureProvider.getDeviceOwnerDisclosure();
}
@Override
public void updateState(Preference preference) {
final CharSequence disclosure = getDisclosure();
if (disclosure == null) {
return;
}
preference.setTitle(disclosure);
void updateFooterPreference(PreferenceScreen screen, CharSequence disclosure) {
final FooterPreference footerPreference = screen.findPreference(getPreferenceKey());
footerPreference.setTitle(disclosure);
footerPreference.setLearnMoreAction(view -> {
mContext.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS));
});
final String learnMoreContentDescription = mContext.getString(
R.string.footer_learn_more_content_description, getLabelName());
footerPreference.setLearnMoreContentDescription(learnMoreContentDescription);
}
private String getLabelName() {
return mContext.getString(R.string.header_add_an_account);
}
}

3
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -100,9 +100,6 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
} else {
disclosure.append(mResources.getString(R.string.do_disclosure_generic));
}
disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
disclosure.append(mResources.getString(R.string.learn_more),
new EnterprisePrivacySpan(mContext), 0);
return disclosure;
}