| commit | 46da9be5098b63543d67183837e797ed2068d18d | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Mon Jun 27 14:58:34 2016 -0700 |
| committer | Fan Zhang <zhfan@google.com> | Mon Jun 27 17:37:58 2016 -0700 |
| tree | c68cf9ec704acef7221b0cd712b44e2f1024880b | |
| parent | 2736ace057c043c3f24ef095c4d45095772d109a [diff] |
By default select current country in support phone list. Bug: 29105266 Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java index 901ea08..9d12ec0 100644 --- a/src/com/android/settings/dashboard/SupportItemAdapter.java +++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -83,6 +83,7 @@ // Optimistically assume we have Internet access. It will be updated later to correct value. mHasInternet = true; setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity)); + mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE); refreshData(); }
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java index 75f5269..c535622 100644 --- a/src/com/android/settings/overlay/SupportFeatureProvider.java +++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -63,6 +63,11 @@ boolean isOperatingNow(@SupportType int type); /** + * Returns the current country code if it has a operation config, otherwise returns null. + */ + String getCurrentCountryCodeIfHasConfig(@SupportType int type); + + /** * Returns localized string for operation hours in specified country. If country is null, use * current country to figure out operation hours. */