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

Merge \"Request support rules to refresh when account changes.\" into nyc-mr1-dev

Browse Source 
am: 987eadbd4b

Change-Id: I7ff6ead262c69d18b8a5fc746e58c1a62a23e68a
This commit is contained in:
Fan Zhang
2016-07-13 01:25:45 +00:00
committed by android-build-merger
parent c5ce869127 987eadbd4b
commit 85a11e7f82
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/dashboard/SupportItemAdapter.java
View File

@@ -89,7 +89,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
} else { } else {
mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE); mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
} }
setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity)); mAccount = mSupportFeatureProvider.getSupportEligibleAccount(mActivity);
refreshData(); refreshData();
} }
@@ -155,6 +155,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
public void setAccount(Account account) { public void setAccount(Account account) {
if (!Objects.equals(mAccount, account)) { if (!Objects.equals(mAccount, account)) {
mAccount = account; mAccount = account;
mSupportFeatureProvider.refreshOperationRules();
refreshData(); refreshData();
} }
} }

5
src/com/android/settings/overlay/SupportFeatureProvider.java
View File

@@ -51,6 +51,11 @@ public interface SupportFeatureProvider {
*/ */
boolean isSupportTypeEnabled(Context context, @SupportType int type); boolean isSupportTypeEnabled(Context context, @SupportType int type);
/**
* Refreshes all operation rules.
*/
void refreshOperationRules();
/** /**
* Whether or not a support type is in operation 24/7. If country is null, use * Whether or not a support type is in operation 24/7. If country is null, use
* current country. * current country.