Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
diff --git a/res/layout/user_select_item.xml b/res/layout/user_select_item.xml
index fa0c91a..894f59a 100644
--- a/res/layout/user_select_item.xml
+++ b/res/layout/user_select_item.xml
@@ -15,9 +15,9 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/widget_frame"
android:layout_width="120dp"
- android:layout_height="112dp">
+ android:layout_height="112dp"
+ android:importantForAccessibility="no">
<FrameLayout
android:id="@+id/button"
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
- android:labelFor="@android:id/icon"
android:textSize="14sp"
+ android:importantForAccessibility="no"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"/>
</RelativeLayout>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 22e5ce6..e2a9606 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -509,7 +509,7 @@
<item msgid="2047166446768045816">"Käsitle mittemahupõhisena"</item>
</string-array>
<string-array name="wifi_privacy_entries">
- <item msgid="3485945604919292489">"Kasuta juhulikustatud MAC-aadr. (vaikeseade)"</item>
+ <item msgid="3485945604919292489">"Kasuta juhuslikustatud MAC-aadr. (vaikeseade)"</item>
<item msgid="741680937828608749">"Kasuta seadme MAC-aadressi"</item>
</string-array>
<string-array name="wifi_hidden_entries">
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 0923ab8..ecfd8c1 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -490,7 +490,7 @@
<item msgid="1219738214736244749">"បៃតង"</item>
<item msgid="6331809026622602308">"ពណ៍ស្វាយ"</item>
<item msgid="6390546163902724700">"ផ្កាឈូក"</item>
- <item msgid="6500473130620545980">"ទឹកក្រូច"</item>
+ <item msgid="6500473130620545980">"ពណ៌ទឹកក្រូច"</item>
</string-array>
<string-array name="automatic_storage_management_days">
<item msgid="8896644025110620477">"លើសពី 30 ថ្ងៃ"</item>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 1aa3054..f4705c9 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -471,7 +471,7 @@
<string-array name="proc_stats_process_states">
<item msgid="7389344075996860704">"ต่อเนื่อง"</item>
<item msgid="5777152116210127847">"กิจกรรมแรก"</item>
- <item msgid="1834030155560727324">"สำคัญ (พื้นหน้า)"</item>
+ <item msgid="1834030155560727324">"สำคัญ (เบื้องหน้า)"</item>
<item msgid="8494424742994426350">"สำคัญ (พื้นหลัง)"</item>
<item msgid="5099332663422156149">"การสำรองข้อมูล"</item>
<item msgid="7701089238529887617">"ใช้หน่วยความจำมาก"</item>
diff --git a/res/xml/app_locale_details.xml b/res/xml/app_locale_details.xml
index 8b1b370..e01db2f 100644
--- a/res/xml/app_locale_details.xml
+++ b/res/xml/app_locale_details.xml
@@ -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"/>
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 1c4fe91..eb9add1 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -58,14 +58,14 @@
android:title="@string/wifi_security"
android:selectable="false"/>
- <DropDownPreference
+ <ListPreference
android:key="metered"
android:icon="@drawable/ic_attach_money_black_24dp"
android:title="@string/wifi_metered_title"
android:entries="@array/wifi_metered_entries"
android:entryValues="@array/wifi_metered_values"/>
- <DropDownPreference
+ <ListPreference
android:key="privacy"
android:icon="@drawable/ic_wifi_privacy_24dp"
android:title="@string/wifi_privacy_settings"
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 9f9f832..914c4b2 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -22,6 +22,9 @@
import android.media.RingtoneManager;
import android.net.Uri;
import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
public class DefaultRingtonePreference extends RingtonePreference {
private static final String TAG = "DefaultRingtonePreference";
@@ -43,6 +46,24 @@
@Override
protected void onSaveRingtone(Uri ringtoneUri) {
+ String mimeType = getContext().getContentResolver().getType(ringtoneUri);
+ if (mimeType == null) {
+ Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri
+ + " ignored: failure to find mimeType (no access from this context?)");
+ return;
+ }
+
+ if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) {
+ Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri
+ + " ignored: associated mimeType:" + mimeType + " is not an audio type");
+ return;
+ }
+
+ setActualDefaultRingtoneUri(ringtoneUri);
+ }
+
+ @VisibleForTesting
+ void setActualDefaultRingtoneUri(Uri ringtoneUri) {
RingtoneManager.setActualDefaultRingtoneUri(mUserContext, getRingtoneType(), ringtoneUri);
}
diff --git a/src/com/android/settings/applications/AppLocaleUtil.java b/src/com/android/settings/applications/AppLocaleUtil.java
index 3cba27c..77fba89 100644
--- a/src/com/android/settings/applications/AppLocaleUtil.java
+++ b/src/com/android/settings/applications/AppLocaleUtil.java
@@ -18,11 +18,14 @@
import android.annotation.NonNull;
import android.app.ActivityManager;
+import android.app.LocaleConfig;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.os.LocaleList;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import com.android.settings.R;
@@ -46,12 +49,17 @@
boolean isDisallowedPackage = isDisallowedPackage(context, packageName);
boolean hasLauncherEntry = hasLauncherEntry(packageName, infos);
boolean isSignedWithPlatformKey = isSignedWithPlatformKey(context, packageName);
+ boolean isAppLocaleSupported = isAppLocaleSupported(context, packageName);
Log.i(TAG, "Can display preference - [" + packageName + "] :"
+ " isDisallowedPackage : " + isDisallowedPackage
+ " / isSignedWithPlatformKey : " + isSignedWithPlatformKey
- + " / hasLauncherEntry : " + hasLauncherEntry);
+ + " / hasLauncherEntry : " + hasLauncherEntry
+ + " / isAppLocaleSupported : " + isAppLocaleSupported);
- return !isDisallowedPackage && !isSignedWithPlatformKey && hasLauncherEntry;
+ return !isDisallowedPackage
+ && !isSignedWithPlatformKey
+ && hasLauncherEntry
+ && isAppLocaleSupported;
}
private static boolean isDisallowedPackage(Context context, String packageName) {
@@ -86,4 +94,61 @@
return infos.stream()
.anyMatch(info -> info.activityInfo.packageName.equals(packageName));
}
+
+ /**
+ * Check the function of per app language is supported by current application.
+ */
+ public static boolean isAppLocaleSupported(Context context, String packageName) {
+ if (getPackageLocales(context, packageName) != null) {
+ return true;
+ }
+
+ if (FeatureFlagUtils.isEnabled(
+ context, FeatureFlagUtils.SETTINGS_APP_LOCALE_OPT_IN_ENABLED)) {
+ return false;
+ }
+
+ return getAssetLocales(context, packageName).length > 0;
+ }
+
+ /**
+ * Get locales fron AssetManager.
+ */
+ public static String[] getAssetLocales(Context context, String packageName) {
+ try {
+ PackageManager packageManager = context.getPackageManager();
+ String[] locales = packageManager.getResourcesForApplication(
+ packageManager.getPackageInfo(packageName, PackageManager.MATCH_ALL)
+ .applicationInfo).getAssets().getNonSystemLocales();
+ if (locales == null) {
+ Log.i(TAG, "[" + packageName + "] locales are null.");
+ }
+ if (locales.length <= 0) {
+ Log.i(TAG, "[" + packageName + "] locales length is 0.");
+ return new String[0];
+ }
+ String locale = locales[0];
+ Log.i(TAG, "First asset locale - [" + packageName + "] " + locale);
+ return locales;
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Can not found the package name : " + packageName + " / " + e);
+ }
+ return new String[0];
+ }
+
+ /**
+ * Get locales from LocaleConfig.
+ */
+ public static LocaleList getPackageLocales(Context context, String packageName) {
+ try {
+ LocaleConfig localeConfig =
+ new LocaleConfig(context.createPackageContext(packageName, 0));
+ if (localeConfig.getStatus() == LocaleConfig.STATUS_SUCCESS) {
+ return localeConfig.getSupportedLocales();
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Can not found the package name : " + packageName + " / " + e);
+ }
+ return null;
+ }
}
diff --git a/src/com/android/settings/applications/AppStateBaseBridge.java b/src/com/android/settings/applications/AppStateBaseBridge.java
index 1a39483..d7f253b 100644
--- a/src/com/android/settings/applications/AppStateBaseBridge.java
+++ b/src/com/android/settings/applications/AppStateBaseBridge.java
@@ -36,6 +36,8 @@
protected final BackgroundHandler mHandler;
protected final MainHandler mMainHandler;
+ private boolean mForceLoadAllApps;
+
public AppStateBaseBridge(ApplicationsState appState, Callback callback) {
mAppState = appState;
mAppSession = mAppState != null ? mAppState.newSession(this) : null;
@@ -48,13 +50,22 @@
mMainHandler = new MainHandler(Looper.getMainLooper());
}
- public void resume() {
+ public void resume(boolean forceLoadAllApps) {
+ mForceLoadAllApps = forceLoadAllApps;
mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
- mAppSession.onResume();
+ if (mForceLoadAllApps) {
+ mAppSession.onResume();
+ } else {
+ mAppSession.activateSession();
+ }
}
public void pause() {
- mAppSession.onPause();
+ if (mForceLoadAllApps) {
+ mAppSession.onPause();
+ } else {
+ mAppSession.deactivateSession();
+ }
}
public void release() {
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 19b8f50..42f5930 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -74,7 +74,7 @@
@Override
public void onStart() {
- mDataUsageBridge.resume();
+ mDataUsageBridge.resume(true /* forceLoadAllApps */);
}
@Override
diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
index e6caafc..20cddec 100644
--- a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
+++ b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
@@ -18,7 +18,6 @@
import static com.android.settings.widget.EntityHeaderController.ActionType;
import android.app.Activity;
-import android.app.LocaleConfig;
import android.app.LocaleManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -31,6 +30,7 @@
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;
@@ -44,6 +44,7 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.AppLocaleUtil;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -62,10 +63,12 @@
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 @@
}
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 @@
}
}
+ 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) {
@@ -206,8 +218,8 @@
}
private int getAppDescription() {
- LocaleList packageLocaleList = getPackageLocales();
- String[] assetLocaleList = getAssetLocales();
+ LocaleList packageLocaleList = AppLocaleUtil.getPackageLocales(getContext(), mPackageName);
+ String[] assetLocaleList = AppLocaleUtil.getAssetLocales(getContext(), mPackageName);
// TODO add apended url string, "Learn more", to these both sentenses.
if ((packageLocaleList != null && packageLocaleList.isEmpty())
|| (packageLocaleList == null && assetLocaleList.length == 0)) {
@@ -216,41 +228,6 @@
return -1;
}
- private String[] getAssetLocales() {
- try {
- PackageManager packageManager = getContext().getPackageManager();
- String[] locales = packageManager.getResourcesForApplication(
- packageManager.getPackageInfo(mPackageName, PackageManager.MATCH_ALL)
- .applicationInfo).getAssets().getNonSystemLocales();
- if (locales == null) {
- Log.i(TAG, "[" + mPackageName + "] locales are null.");
- }
- if (locales.length <= 0) {
- Log.i(TAG, "[" + mPackageName + "] locales length is 0.");
- return new String[0];
- }
- String locale = locales[0];
- Log.i(TAG, "First asset locale - [" + mPackageName + "] " + locale);
- return locales;
- } catch (PackageManager.NameNotFoundException e) {
- Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e);
- }
- return new String[0];
- }
-
- private LocaleList getPackageLocales() {
- try {
- LocaleConfig localeConfig =
- new LocaleConfig(getContext().createPackageContext(mPackageName, 0));
- if (localeConfig.getStatus() == LocaleConfig.STATUS_SUCCESS) {
- return localeConfig.getSupportedLocales();
- }
- } catch (PackageManager.NameNotFoundException e) {
- Log.w(TAG, "Can not found the package name : " + mPackageName + " / " + e);
- }
- return null;
- }
-
/** Gets per app's default locale */
public static Locale getAppDefaultLocale(Context context, String packageName) {
LocaleManager localeManager = context.getSystemService(LocaleManager.class);
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index c081ef9..a6abd10 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -1185,7 +1185,7 @@
mSession.onResume();
mLastSortMode = sort;
if (mExtraInfoBridge != null) {
- mExtraInfoBridge.resume();
+ mExtraInfoBridge.resume(false /* forceLoadAllApps */);
}
rebuild();
} else {
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index dd16006..9403316 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -92,6 +92,7 @@
private PreferenceGroup mPreferenceGroup;
private FooterPreference mFooterPreference;
+ private boolean mFirstLaunch = true;
static {
FILTER.addAction(ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
@@ -121,6 +122,17 @@
}
@Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ if (mFirstLaunch) {
+ mFirstLaunch = false;
+ // When first launch, updateList() is already be called in displayPreference().
+ } else {
+ updateList();
+ }
+ }
+
+ @Override
public void onStart() {
mContext.registerReceiverAsUser(
mBroadcastReceiver, UserHandle.ALL, FILTER,
diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
index 3df19be..54ac63e 100644
--- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
@@ -74,7 +74,7 @@
@Override
public void onResume() {
super.onResume();
- mSmsBackend.resume();
+ mSmsBackend.resume(true /* forceLoadAllApps */);
}
@Override
diff --git a/src/com/android/settings/core/CategoryMixin.java b/src/com/android/settings/core/CategoryMixin.java
index 8d0a412..151ed7b 100644
--- a/src/com/android/settings/core/CategoryMixin.java
+++ b/src/com/android/settings/core/CategoryMixin.java
@@ -58,6 +58,7 @@
private final PackageReceiver mPackageReceiver = new PackageReceiver();
private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
private int mCategoriesUpdateTaskCount;
+ private boolean mFirstOnResume = true;
public CategoryMixin(Context context) {
mContext = context;
@@ -75,6 +76,12 @@
filter.addDataScheme(DATA_SCHEME_PKG);
mContext.registerReceiver(mPackageReceiver, filter);
+ if (mFirstOnResume) {
+ // Skip since all tiles have been refreshed in DashboardFragment.onCreatePreferences().
+ Log.d(TAG, "Skip categories update");
+ mFirstOnResume = false;
+ return;
+ }
updateCategories();
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 8ad66d2..2ae2057 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -235,13 +235,13 @@
public void onDataChanged() {
switch (method) {
case METHOD_GET_DYNAMIC_TITLE:
- refreshTitle(uri, pref);
+ refreshTitle(uri, pref, this);
break;
case METHOD_GET_DYNAMIC_SUMMARY:
- refreshSummary(uri, pref);
+ refreshSummary(uri, pref, this);
break;
case METHOD_IS_CHECKED:
- refreshSwitch(uri, pref);
+ refreshSwitch(uri, pref, this);
break;
}
}
@@ -262,19 +262,18 @@
final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_TITLE_URI,
METHOD_GET_DYNAMIC_TITLE);
- refreshTitle(uri, preference);
return createDynamicDataObserver(METHOD_GET_DYNAMIC_TITLE, uri, preference);
}
return null;
}
- private void refreshTitle(Uri uri, Preference preference) {
+ private void refreshTitle(Uri uri, Preference preference, DynamicDataObserver observer) {
ThreadUtils.postOnBackgroundThread(() -> {
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final String titleFromUri = TileUtils.getTextFromUri(
mContext, uri, providerMap, META_DATA_PREFERENCE_TITLE);
if (!TextUtils.equals(titleFromUri, preference.getTitle())) {
- ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+ observer.post(() -> preference.setTitle(titleFromUri));
}
});
}
@@ -291,19 +290,18 @@
final Uri uri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_SUMMARY_URI,
METHOD_GET_DYNAMIC_SUMMARY);
- refreshSummary(uri, preference);
return createDynamicDataObserver(METHOD_GET_DYNAMIC_SUMMARY, uri, preference);
}
return null;
}
- private void refreshSummary(Uri uri, Preference preference) {
+ private void refreshSummary(Uri uri, Preference preference, DynamicDataObserver observer) {
ThreadUtils.postOnBackgroundThread(() -> {
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final String summaryFromUri = TileUtils.getTextFromUri(
mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);
if (!TextUtils.equals(summaryFromUri, preference.getSummary())) {
- ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
+ observer.post(() -> preference.setSummary(summaryFromUri));
}
});
}
@@ -323,7 +321,6 @@
final Uri isCheckedUri = TileUtils.getCompleteUri(tile, META_DATA_PREFERENCE_SWITCH_URI,
METHOD_IS_CHECKED);
setSwitchEnabled(preference, false);
- refreshSwitch(isCheckedUri, preference);
return createDynamicDataObserver(METHOD_IS_CHECKED, isCheckedUri, preference);
}
@@ -350,12 +347,12 @@
});
}
- private void refreshSwitch(Uri uri, Preference preference) {
+ private void refreshSwitch(Uri uri, Preference preference, DynamicDataObserver observer) {
ThreadUtils.postOnBackgroundThread(() -> {
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final boolean checked = TileUtils.getBooleanFromUri(mContext, uri, providerMap,
EXTRA_SWITCH_CHECKED_STATE);
- ThreadUtils.postOnMainThread(() -> {
+ observer.post(() -> {
setSwitchChecked(preference, checked);
setSwitchEnabled(preference, true);
});
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 378d55e..fb0a09d 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -16,7 +16,6 @@
package com.android.settings.dashboard;
import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
@@ -57,6 +56,8 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* Base fragment for dashboard style UI containing a list of static and dynamic setting items.
@@ -66,6 +67,7 @@
BasePreferenceController.UiBlockListener {
public static final String CATEGORY = "category";
private static final String TAG = "DashboardFragment";
+ private static final long TIMEOUT_MILLIS = 50L;
@VisibleForTesting
final ArrayMap<String, List<DynamicDataObserver>> mDashboardTilePrefKeys = new ArrayMap<>();
@@ -461,8 +463,9 @@
// Create a list to track which tiles are to be removed.
final Map<String, List<DynamicDataObserver>> remove = new ArrayMap(mDashboardTilePrefKeys);
- // Install dashboard tiles.
+ // Install dashboard tiles and collect pending observers.
final boolean forceRoundedIcons = shouldForceRoundedIcon();
+ final List<DynamicDataObserver> pendingObservers = new ArrayList<>();
for (Tile tile : tiles) {
final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
if (TextUtils.isEmpty(key)) {
@@ -472,26 +475,30 @@
if (!displayTile(tile)) {
continue;
}
+ final List<DynamicDataObserver> observers;
if (mDashboardTilePrefKeys.containsKey(key)) {
// Have the key already, will rebind.
final Preference preference = screen.findPreference(key);
- mDashboardFeatureProvider.bindPreferenceToTileAndGetObservers(getActivity(), this,
- forceRoundedIcons, preference, tile, key,
+ observers = mDashboardFeatureProvider.bindPreferenceToTileAndGetObservers(
+ getActivity(), this, forceRoundedIcons, preference, tile, key,
mPlaceholderPreferenceController.getOrder());
} else {
// Don't have this key, add it.
final Preference pref = createPreference(tile);
- final List<DynamicDataObserver> observers =
- mDashboardFeatureProvider.bindPreferenceToTileAndGetObservers(getActivity(),
- this, forceRoundedIcons, pref, tile, key,
- mPlaceholderPreferenceController.getOrder());
+ observers = mDashboardFeatureProvider.bindPreferenceToTileAndGetObservers(
+ getActivity(), this, forceRoundedIcons, pref, tile, key,
+ mPlaceholderPreferenceController.getOrder());
screen.addPreference(pref);
registerDynamicDataObservers(observers);
mDashboardTilePrefKeys.put(key, observers);
}
+ if (observers != null) {
+ pendingObservers.addAll(observers);
+ }
remove.remove(key);
}
- // Finally remove tiles that are gone.
+
+ // Remove tiles that are gone.
for (Map.Entry<String, List<DynamicDataObserver>> entry : remove.entrySet()) {
final String key = entry.getKey();
mDashboardTilePrefKeys.remove(key);
@@ -501,6 +508,20 @@
}
unregisterDynamicDataObservers(entry.getValue());
}
+
+ // Wait for pending observers to update UI.
+ if (!pendingObservers.isEmpty()) {
+ final CountDownLatch mainLatch = new CountDownLatch(1);
+ new Thread(() -> {
+ pendingObservers.forEach(observer ->
+ awaitObserverLatch(observer.getCountDownLatch()));
+ mainLatch.countDown();
+ }).start();
+ Log.d(tag, "Start waiting observers");
+ awaitObserverLatch(mainLatch);
+ Log.d(tag, "Stop waiting observers");
+ pendingObservers.forEach(DynamicDataObserver::updateUi);
+ }
}
@Override
@@ -546,4 +567,12 @@
resolver.unregisterContentObserver(observer);
});
}
+
+ private void awaitObserverLatch(CountDownLatch latch) {
+ try {
+ latch.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ // Do nothing
+ }
+ }
}
diff --git a/src/com/android/settings/dashboard/DynamicDataObserver.java b/src/com/android/settings/dashboard/DynamicDataObserver.java
index f5299be..41bc563 100644
--- a/src/com/android/settings/dashboard/DynamicDataObserver.java
+++ b/src/com/android/settings/dashboard/DynamicDataObserver.java
@@ -20,13 +20,24 @@
import android.os.Handler;
import android.os.Looper;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.concurrent.CountDownLatch;
+
/**
* Observer for updating injected dynamic data.
*/
public abstract class DynamicDataObserver extends ContentObserver {
+ private Runnable mUpdateRunnable;
+ private CountDownLatch mCountDownLatch;
+ private boolean mUpdateDelegated;
+
protected DynamicDataObserver() {
super(new Handler(Looper.getMainLooper()));
+ mCountDownLatch = new CountDownLatch(1);
+ // Load data for the first time
+ onDataChanged();
}
/** Returns the uri of the callback. */
@@ -35,8 +46,30 @@
/** Called when data changes. */
public abstract void onDataChanged();
+ /** Calls the runnable to update UI */
+ public synchronized void updateUi() {
+ mUpdateDelegated = true;
+ if (mUpdateRunnable != null) {
+ mUpdateRunnable.run();
+ }
+ }
+
+ /** Returns the count-down latch */
+ public CountDownLatch getCountDownLatch() {
+ return mCountDownLatch;
+ }
+
@Override
public void onChange(boolean selfChange) {
onDataChanged();
}
+
+ protected synchronized void post(Runnable runnable) {
+ if (mUpdateDelegated) {
+ ThreadUtils.postOnMainThread(runnable);
+ } else {
+ mUpdateRunnable = runnable;
+ mCountDownLatch.countDown();
+ }
+ }
}
diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
index 2573d11..e88b9cb 100644
--- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java
+++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
@@ -120,7 +120,7 @@
private void bindViewHolder(ViewHolder holder, int position) {
UserDetails userDetails = getItem(position);
holder.getIconView().setImageDrawable(userDetails.mIcon);
- holder.getTitleView().setText(userDetails.mTitle);
+ holder.setTitle(userDetails.mTitle);
}
@Override
@@ -206,18 +206,19 @@
static class ViewHolder extends RecyclerView.ViewHolder {
private final ImageView mIconView;
private final TextView mTitleView;
+ private final View mButtonView;
private ViewHolder(View view) {
super(view);
mIconView = view.findViewById(android.R.id.icon);
mTitleView = view.findViewById(android.R.id.title);
+ mButtonView = view.findViewById(R.id.button);
}
private ViewHolder(View view, OnClickListener onClickListener) {
this(view);
- View button = view.findViewById(R.id.button);
- if (button != null) {
- button.setOnClickListener(v -> onClickListener.onClick(getAdapterPosition()));
+ if (mButtonView != null) {
+ mButtonView.setOnClickListener(v -> onClickListener.onClick(getAdapterPosition()));
}
}
@@ -225,8 +226,11 @@
return mIconView;
}
- private TextView getTitleView() {
- return mTitleView;
+ private void setTitle(CharSequence title) {
+ mTitleView.setText(title);
+ if (mButtonView != null) {
+ mButtonView.setContentDescription(title);
+ }
}
}
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 2e52e38..744f692 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -83,7 +83,7 @@
mDataSaverBackend.refreshAllowlist();
mDataSaverBackend.refreshDenylist();
mDataSaverBackend.addListener(this);
- mDataUsageBridge.resume();
+ mDataUsageBridge.resume(true /* forceLoadAllApps */);
}
@Override
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index ac088c0..06cf8ed 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -91,7 +91,7 @@
@Override
public void onStart() {
- mDataUsageBridge.resume();
+ mDataUsageBridge.resume(true /* forceLoadAllApps */);
}
@Override
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 518dc96..ef200a4 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -209,7 +209,8 @@
if (packages != null && packages.length == 1) {
mDefaultPackageName = packages[0];
} else {
- mDefaultPackageName = uidBatteryConsumer.getPackageWithHighestDrain();
+ mDefaultPackageName = isSystemUid(uid)
+ ? PACKAGE_SYSTEM : uidBatteryConsumer.getPackageWithHighestDrain();
}
}
if (mDefaultPackageName != null) {
@@ -352,13 +353,8 @@
}
final PackageManager pm = context.getPackageManager();
- final String[] packages;
- if (uid == Process.SYSTEM_UID) {
- packages = new String[] {PACKAGE_SYSTEM};
- } else {
- packages = pm.getPackagesForUid(uid);
- }
-
+ final String[] packages = isSystemUid(uid)
+ ? new String[] {PACKAGE_SYSTEM} : pm.getPackagesForUid(uid);
if (packages != null) {
final String[] packageLabels = new String[packages.length];
System.arraycopy(packages, 0, packageLabels, 0, packages.length);
@@ -615,4 +611,8 @@
}
return new NameAndIcon(name, null /* icon */, iconId);
}
+
+ private static boolean isSystemUid(int uid) {
+ return uid == Process.SYSTEM_UID;
+ }
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index 7e4730c..4e276c1 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -176,7 +176,7 @@
List<CachedBluetoothDevice> getPairedBluetoothDevices() {
final List<CachedBluetoothDevice> bluetoothDeviceList = new ArrayList<>();
- // If Bluetooth is disable, skip getting the Bluetooth devices.
+ // If Bluetooth is disabled, skip getting the Bluetooth devices.
if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
Log.i(TAG, "Cannot get Bluetooth devices, Bluetooth is disabled.");
return bluetoothDeviceList;
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 23e37ba..71b48f9 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -16,6 +16,8 @@
package com.android.settings.language;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_DICTIONARY_FOR_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.SPELL_CHECKER_FOR_WORK;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_KEYBOARDS_AND_TOOLS;
import android.app.Activity;
@@ -80,6 +82,12 @@
replaceEnterpriseStringTitle("language_and_input_for_work_category",
WORK_PROFILE_KEYBOARDS_AND_TOOLS,
R.string.language_and_input_for_work_category_title);
+ replaceEnterpriseStringTitle("spellcheckers_settings_for_work_pref",
+ SPELL_CHECKER_FOR_WORK,
+ R.string.spellcheckers_settings_for_work_title);
+ replaceEnterpriseStringTitle("user_dictionary_settings_for_work_pref",
+ PERSONAL_DICTIONARY_FOR_WORK,
+ R.string.user_dict_settings_for_work_title);
}
@Override
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index a7d9f68..dfe6df2 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -20,7 +20,6 @@
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME;
-import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_PACKAGE_TITLE;
import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID;
import android.Manifest;
@@ -30,10 +29,13 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.Slog;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
@@ -63,15 +65,38 @@
mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);
mUserId = getIntent().getIntExtra(EXTRA_USER_ID, UserHandle.USER_NULL);
- String pkgTitle = getIntent().getStringExtra(EXTRA_PACKAGE_TITLE);
+ CharSequence mAppLabel;
+
+ if (mComponentName == null || mComponentName.getPackageName() == null) {
+ finish();
+ return;
+ }
+
+ try {
+ ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
+ mComponentName.getPackageName(), 0);
+ mAppLabel = applicationInfo.loadSafeLabel(getPackageManager(),
+ PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
+ PackageItemInfo.SAFE_LABEL_FLAG_TRIM
+ | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);
+ } catch (PackageManager.NameNotFoundException e) {
+ Slog.e(LOG_TAG, "Couldn't find app with package name for " + mComponentName, e);
+ finish();
+ return;
+ }
+
+ if (TextUtils.isEmpty(mAppLabel)) {
+ finish();
+ return;
+ }
AlertController.AlertParams p = new AlertController.AlertParams(this);
p.mTitle = getString(
R.string.notification_listener_security_warning_title,
- pkgTitle);
+ mAppLabel);
p.mMessage = getString(
R.string.notification_listener_security_warning_summary,
- pkgTitle);
+ mAppLabel);
p.mPositiveButtonText = getString(R.string.allow);
p.mPositiveButtonListener = (a, b) -> onAllow();
p.mNegativeButtonText = getString(R.string.deny);
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 2ae91e2..5215a33 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -115,40 +115,27 @@
void recordCanBeBlocked(Context context, PackageManager pm, RoleManager rm, PackageInfo app,
AppRow row) {
- if (Settings.Secure.getIntForUser(context.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM) != 0) {
- try {
- row.systemApp = row.lockedImportance =
- sINM.isPermissionFixed(app.packageName, row.userId);
- } catch (RemoteException e) {
- Log.w(TAG, "Error calling NMS", e);
- }
- // The permission system cannot make role permissions 'fixed', so check for these
- // roles explicitly
- List<String> roles = rm.getHeldRolesFromController(app.packageName);
- if (roles.contains(RoleManager.ROLE_DIALER)
- || roles.contains(RoleManager.ROLE_EMERGENCY)) {
- row.systemApp = row.lockedImportance = true;
- }
- // if the app targets T but has not requested the permission, we cannot change the
- // permission state
- if (app.applicationInfo.targetSdkVersion > Build.VERSION_CODES.S_V2) {
- if (app.requestedPermissions == null || Arrays.stream(app.requestedPermissions)
- .noneMatch(p -> p.equals(android.Manifest.permission.POST_NOTIFICATIONS))) {
- row.lockedImportance = true;
- }
- }
- } else {
- row.systemApp = Utils.isSystemPackage(context.getResources(), pm, app);
- List<String> roles = rm.getHeldRolesFromController(app.packageName);
- if (roles.contains(RoleManager.ROLE_DIALER)
- || roles.contains(RoleManager.ROLE_EMERGENCY)) {
- row.systemApp = true;
+ try {
+ row.systemApp = row.lockedImportance =
+ sINM.isPermissionFixed(app.packageName, row.userId);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Error calling NMS", e);
+ }
+ // The permission system cannot make role permissions 'fixed', so check for these
+ // roles explicitly
+ List<String> roles = rm.getHeldRolesFromController(app.packageName);
+ if (roles.contains(RoleManager.ROLE_DIALER)
+ || roles.contains(RoleManager.ROLE_EMERGENCY)) {
+ row.systemApp = row.lockedImportance = true;
+ }
+ // if the app targets T but has not requested the permission, we cannot change the
+ // permission state
+ if (app.applicationInfo.targetSdkVersion > Build.VERSION_CODES.S_V2) {
+ if (app.requestedPermissions == null || Arrays.stream(app.requestedPermissions)
+ .noneMatch(p -> p.equals(android.Manifest.permission.POST_NOTIFICATIONS))) {
+ row.lockedImportance = true;
}
- final String[] nonBlockablePkgs = context.getResources().getStringArray(
- com.android.internal.R.array.config_nonBlockableNotificationPackages);
- markAppRowWithBlockables(nonBlockablePkgs, row, app.packageName);
}
}
diff --git a/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java b/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
index c9eaa65..8ae0493 100644
--- a/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
+++ b/src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
@@ -57,7 +57,7 @@
@Override
public CharSequence getSummary() {
boolean speakerOn = mSpatialAudioPreferenceController.isAvailable()
- && mSpatialAudioWiredHeadphonesController.isChecked();
+ && mSpatialAudioPreferenceController.isChecked();
boolean wiredHeadphonesOn = mSpatialAudioWiredHeadphonesController.isAvailable()
&& mSpatialAudioWiredHeadphonesController.isChecked();
if (speakerOn && wiredHeadphonesOn) {
diff --git a/src/com/android/settings/notification/app/NotificationPreferenceController.java b/src/com/android/settings/notification/app/NotificationPreferenceController.java
index 289f1ed..9d339f0 100644
--- a/src/com/android/settings/notification/app/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/app/NotificationPreferenceController.java
@@ -64,7 +64,6 @@
@Nullable
protected ShortcutInfo mConversationInfo;
protected List<String> mPreferenceFilter;
- boolean mMigratedPermission;
boolean overrideCanBlock;
boolean overrideCanConfigure;
@@ -78,8 +77,6 @@
mBackend = backend;
mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
mPm = mContext.getPackageManager();
- mMigratedPermission = Settings.Secure.getIntForUser(context.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM) != 0;
}
/**
@@ -155,9 +152,7 @@
return overrideCanConfigureValue;
}
if (channel != null && mAppRow != null) {
- boolean locked = mMigratedPermission ? mAppRow.lockedImportance
- : channel.isImportanceLockedByCriticalDeviceFunction()
- || channel.isImportanceLockedByOEM();
+ boolean locked = mAppRow.lockedImportance;
if (locked) {
return channel.isBlockable() || channel.getImportance() == IMPORTANCE_NONE;
}
@@ -186,8 +181,7 @@
return overrideCanConfigureValue;
}
if (channel != null && mAppRow != null) {
- boolean locked = mMigratedPermission ? mAppRow.lockedImportance
- : channel.isImportanceLockedByOEM();
+ boolean locked = mAppRow.lockedImportance;
return !locked || channel.isBlockable();
}
return false;
diff --git a/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
index c6d735c..ee6e828 100644
--- a/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
@@ -18,6 +18,7 @@
import android.app.AutomaticZenRule;
import android.content.Context;
+import android.util.ArrayMap;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -28,7 +29,6 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Map;
-import java.util.Objects;
public class ZenModeAutomaticRulesPreferenceController extends
AbstractZenModeAutomaticRulePreferenceController {
@@ -38,6 +38,10 @@
@VisibleForTesting
protected PreferenceCategory mPreferenceCategory;
+ // Map of rule key -> preference so that we can update each preference as needed
+ @VisibleForTesting
+ protected Map<String, ZenRulePreference> mZenRulePreferences = new ArrayMap<>();
+
public ZenModeAutomaticRulesPreferenceController(Context context, Fragment parent, Lifecycle
lifecycle) {
super(context, KEY, parent, lifecycle);
@@ -58,38 +62,73 @@
super.displayPreference(screen);
mPreferenceCategory = screen.findPreference(getPreferenceKey());
mPreferenceCategory.setPersistent(false);
+
+ // if mPreferenceCategory was un-set, make sure to clear out mZenRulePreferences too, just
+ // in case
+ if (mPreferenceCategory.getPreferenceCount() == 0) {
+ mZenRulePreferences.clear();
+ }
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
Map.Entry<String, AutomaticZenRule>[] sortedRules = getRules();
- final int currNumPreferences = mPreferenceCategory.getPreferenceCount();
- if (currNumPreferences == sortedRules.length) {
+
+ // refresh the whole preference category list if the total number of rules has changed, or
+ // if any individual rules have changed, so we can rebuild the list & keep things in sync
+ boolean refreshPrefs = false;
+ if (mPreferenceCategory.getPreferenceCount() != sortedRules.length) {
+ refreshPrefs = true;
+ } else {
+ // check whether any rules in sortedRules are not in mZenRulePreferences; that should
+ // be enough to see whether something has changed
for (int i = 0; i < sortedRules.length; i++) {
- ZenRulePreference pref = (ZenRulePreference) mPreferenceCategory.getPreference(i);
- // we are either:
- // 1. updating everything about the rule
- // 2. rule was added or deleted, so reload the entire list
- if (Objects.equals(pref.mId, sortedRules[i].getKey())) {
- AutomaticZenRule rule = sortedRules[i].getValue();
- pref.updatePreference(rule);
- } else {
- reloadAllRules(sortedRules);
+ if (!mZenRulePreferences.containsKey(sortedRules[i].getKey())) {
+ refreshPrefs = true;
break;
}
}
- } else {
- reloadAllRules(sortedRules);
}
- }
- @VisibleForTesting
- void reloadAllRules(Map.Entry<String, AutomaticZenRule>[] rules) {
- mPreferenceCategory.removeAll();
- for (Map.Entry<String, AutomaticZenRule> rule : rules) {
- ZenRulePreference pref = createZenRulePreference(rule);
- mPreferenceCategory.addPreference(pref);
+ // if we need to refresh the whole list, clear the preference category and also start a
+ // new map of preferences according to the preference category contents
+ // we need to not update the existing one yet, as we'll need to know what preferences
+ // previously existed in order to update and re-attach them to the preference category
+ Map<String, ZenRulePreference> newPrefs = new ArrayMap<>();
+ if (refreshPrefs) {
+ mPreferenceCategory.removeAll();
+ }
+
+ // Loop through each rule, either updating the existing rule or creating the rule's
+ // preference if needed (and, in the case where we need to rebuild the preference category
+ // list, do so as well)
+ for (int i = 0; i < sortedRules.length; i++) {
+ String key = sortedRules[i].getKey();
+ if (mZenRulePreferences.containsKey(key)) {
+ // existing rule; update its info if it's changed since the last display
+ AutomaticZenRule rule = sortedRules[i].getValue();
+ ZenRulePreference pref = mZenRulePreferences.get(key);
+ pref.updatePreference(rule);
+
+ // only add to preference category if the overall set of rules has changed so this
+ // needs to be rearranged
+ if (refreshPrefs) {
+ mPreferenceCategory.addPreference(pref);
+ newPrefs.put(key, pref);
+ }
+ } else {
+ // new rule; create a new ZenRulePreference & add it to the preference category
+ // and the map so we'll know about it later
+ ZenRulePreference pref = createZenRulePreference(sortedRules[i]);
+ mPreferenceCategory.addPreference(pref);
+ newPrefs.put(key, pref);
+ }
+ }
+
+ // If anything was new, then make sure we overwrite mZenRulePreferences with our new data
+ if (refreshPrefs) {
+ mZenRulePreferences = newPrefs;
}
}
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index e2b91c7..d3988fa 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -23,6 +23,7 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE;
@@ -347,7 +348,10 @@
// it's an update.
updateExistingLock = mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
if (updateExistingLock) {
- getActivity().setTitle(R.string.lock_settings_picker_update_profile_lock_title);
+ getActivity().setTitle(mDpm.getResources().getString(
+ LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE,
+ () -> getString(
+ R.string.lock_settings_picker_update_profile_lock_title)));
} else {
getActivity().setTitle(mDpm.getResources().getString(
LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE,
diff --git a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
index 52645aa..85dc2e4 100644
--- a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
@@ -21,7 +21,7 @@
import android.net.wifi.WifiConfiguration;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
+import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -30,13 +30,13 @@
import com.android.wifitrackerlib.WifiEntry;
/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not
+ * A controller that controls whether the Wi-Fi network is metered or not.
*/
public class WifiMeteredPreferenceController2 extends BasePreferenceController implements
Preference.OnPreferenceChangeListener, WifiDialog2.WifiDialog2Listener {
private static final String KEY_WIFI_METERED = "metered";
- private WifiEntry mWifiEntry;
+ private final WifiEntry mWifiEntry;
private Preference mPreference;
public WifiMeteredPreferenceController2(Context context, WifiEntry wifiEntry) {
@@ -46,11 +46,11 @@
@Override
public void updateState(Preference preference) {
- final DropDownPreference dropDownPreference = (DropDownPreference) preference;
+ final ListPreference listPreference = (ListPreference) preference;
final int meteredOverride = getMeteredOverride();
preference.setSelectable(mWifiEntry.canSetMeteredChoice());
- dropDownPreference.setValue(Integer.toString(meteredOverride));
- updateSummary(dropDownPreference, meteredOverride);
+ listPreference.setValue(Integer.toString(meteredOverride));
+ updateSummary(listPreference, meteredOverride);
}
@Override
@@ -66,7 +66,7 @@
// Stage the backup of the SettingsProvider package which backs this up
BackupManager.dataChanged("com.android.providers.settings");
- updateSummary((DropDownPreference) preference, getMeteredOverride());
+ updateSummary((ListPreference) preference, getMeteredOverride());
return true;
}
@@ -79,7 +79,7 @@
return WifiEntry.METERED_CHOICE_AUTO;
}
- private void updateSummary(DropDownPreference preference, int meteredOverride) {
+ private void updateSummary(ListPreference preference, int meteredOverride) {
preference.setSummary(preference.getEntries()[meteredOverride]);
}
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index c484922..632a562 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -21,7 +21,7 @@
import android.net.wifi.WifiManager;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
+import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -31,14 +31,13 @@
import com.android.wifitrackerlib.WifiEntry;
/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is mac randomized
- * or not
+ * A controller that controls whether the Wi-Fi network is mac randomized or not.
*/
public class WifiPrivacyPreferenceController2 extends BasePreferenceController implements
Preference.OnPreferenceChangeListener, WifiDialog2.WifiDialog2Listener {
private static final String KEY_WIFI_PRIVACY = "privacy";
- private WifiManager mWifiManager;
+ private final WifiManager mWifiManager;
private WifiEntry mWifiEntry;
private Preference mPreference;
@@ -66,16 +65,16 @@
@Override
public void updateState(Preference preference) {
- final DropDownPreference dropDownPreference = (DropDownPreference) preference;
+ final ListPreference listPreference = (ListPreference) preference;
final int randomizationLevel = getRandomizationValue();
final boolean isSelectable = mWifiEntry.canSetPrivacy();
preference.setSelectable(isSelectable);
- dropDownPreference.setValue(Integer.toString(randomizationLevel));
- updateSummary(dropDownPreference, randomizationLevel);
+ listPreference.setValue(Integer.toString(randomizationLevel));
+ updateSummary(listPreference, randomizationLevel);
// If the preference cannot be selectable, display a temporary network in the summary.
if (!isSelectable) {
- dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
+ listPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
}
}
@@ -90,7 +89,7 @@
mWifiEntry.disconnect(null /* callback */);
mWifiEntry.connect(null /* callback */);
}
- updateSummary((DropDownPreference) preference, privacy);
+ updateSummary((ListPreference) preference, privacy);
return true;
}
@@ -124,7 +123,7 @@
? WifiEntry.PRIVACY_RANDOMIZED_MAC : WifiEntry.PRIVACY_DEVICE_MAC;
}
- private void updateSummary(DropDownPreference preference, int macRandomized) {
+ private void updateSummary(ListPreference preference, int macRandomized) {
// Translates value here to set RANDOMIZATION_PERSISTENT as first item in UI for better UX.
final int prefMacRandomized = translateMacRandomizedValueToPrefValue(macRandomized);
preference.setSummary(preference.getEntries()[prefMacRandomized]);
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index e7c99c8..f2b0acd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -308,8 +308,12 @@
mActivity, mFragment, mForceRoundedIcon, preference, tile, null /* key */,
Preference.DEFAULT_ORDER);
- assertThat(preference.getSummary()).isEqualTo(ShadowTileUtils.MOCK_SUMMARY);
assertThat(observers.get(0).getUri().toString()).isEqualTo(uriString);
+ assertThat(preference.getSummary()).isNotEqualTo(ShadowTileUtils.MOCK_TEXT);
+
+ observers.get(0).updateUi();
+
+ assertThat(preference.getSummary()).isEqualTo(ShadowTileUtils.MOCK_TEXT);
}
@Test
@@ -324,8 +328,12 @@
mActivity, mFragment, mForceRoundedIcon, preference, tile, null /* key */,
Preference.DEFAULT_ORDER);
- assertThat(preference.getTitle()).isEqualTo(ShadowTileUtils.MOCK_SUMMARY);
assertThat(observers.get(0).getUri().toString()).isEqualTo(uriString);
+ assertThat(preference.getTitle()).isNotEqualTo(ShadowTileUtils.MOCK_TEXT);
+
+ observers.get(0).updateUi();
+
+ assertThat(preference.getTitle()).isEqualTo(ShadowTileUtils.MOCK_TEXT);
}
@Test
@@ -379,6 +387,7 @@
final List<DynamicDataObserver> observers = mImpl.bindPreferenceToTileAndGetObservers(
mActivity, mFragment, mForceRoundedIcon, preference, tile, null /* key */,
Preference.DEFAULT_ORDER);
+ observers.get(0).updateUi();
ShadowTileUtils.setProviderChecked(false);
observers.get(0).onDataChanged();
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index a7ddec3..5745aa0 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -16,9 +16,6 @@
package com.android.settings.notification;
-import static android.os.UserHandle.USER_SYSTEM;
-import static android.provider.Settings.*;
-
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertFalse;
@@ -37,11 +34,9 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.PermissionInfo;
import android.net.MacAddress;
import android.os.Build;
import android.os.Parcel;
-import android.provider.Settings;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -117,9 +112,6 @@
@Test
public void testMarkAppRow_fixedPermission_withRole() throws Exception {
- Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
PackageInfo pi = new PackageInfo();
pi.packageName = "test";
pi.applicationInfo = new ApplicationInfo();
@@ -141,9 +133,6 @@
@Test
public void testMarkAppRow_fixedPermission() throws Exception {
- Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
PackageInfo pi = new PackageInfo();
pi.packageName = "test";
pi.applicationInfo = new ApplicationInfo();
@@ -161,9 +150,6 @@
@Test
public void testMarkAppRow_notFixedPermission() throws Exception {
- Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
PackageInfo pi = new PackageInfo();
pi.packageName = "test";
pi.applicationInfo = new ApplicationInfo();
@@ -181,9 +167,6 @@
@Test
public void testMarkAppRow_targetsT_noPermissionRequest() throws Exception {
- Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
PackageInfo pi = new PackageInfo();
pi.packageName = "test";
pi.applicationInfo = new ApplicationInfo();
@@ -203,9 +186,6 @@
@Test
public void testMarkAppRow_targetsT_permissionRequest() throws Exception {
- Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
PackageInfo pi = new PackageInfo();
pi.packageName = "test";
pi.applicationInfo = new ApplicationInfo();
diff --git a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
index 8d31fe5..4ba5fe7 100644
--- a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
@@ -225,9 +225,6 @@
@Test
public void testIsChannelBlockable_postMigration_locked() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -240,9 +237,6 @@
@Test
public void testIsChannelBlockable_postMigration_locked_butChannelOff() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -255,9 +249,6 @@
@Test
public void testIsChannelBlockable_postMigration_locked_butChannelBlockable() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -271,9 +262,6 @@
@Test
public void testIsChannelGroupBlockable_postMigration_locked() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -285,9 +273,6 @@
@Test
public void testIsChannelGroupBlockable_postMigration_locked_butChannelGroupOff() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -300,9 +285,6 @@
@Test
public void testIsAppBlockable_postMigration_locked() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -314,9 +296,6 @@
@Test
public void testIsAppBlockable_postMigration_locked_butAppOff() {
- Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM);
-
mController = new TestPreferenceController(mContext, mBackend);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -327,32 +306,6 @@
}
@Test
- public void testIsBlockable_oemAllowlist() {
- NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
- NotificationChannel channel = mock(NotificationChannel.class);
- when(channel.isImportanceLockedByOEM()).thenReturn(true);
- when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
-
- mController.onResume(appRow, channel, null, null, null, null, null);
- assertFalse(mController.isChannelBlockable());
-
- when(channel.isImportanceLockedByOEM()).thenReturn(false);
- mController.onResume(appRow, channel, null, null, null, null, null);
- assertTrue(mController.isChannelBlockable());
- }
-
- @Test
- public void testIsBlockable_defaultApp() {
- NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
- NotificationChannel channel = mock(NotificationChannel.class);
- when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
- when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
-
- mController.onResume(appRow, channel, null, null, null, null, null);
- assertFalse(mController.isChannelBlockable());
- }
-
- @Test
public void testIsChannelBlockable_nonSystemAppsBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false;
@@ -410,30 +363,6 @@
}
@Test
- public void testIsChannelBlockable_oemLocked() {
- NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
- appRow.systemApp = false;
- NotificationChannel channel = mock(NotificationChannel.class);
- when(channel.isImportanceLockedByOEM()).thenReturn(true);
- when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
-
- mController.onResume(appRow, channel, null, null, null, null, null);
- assertFalse(mController.isChannelBlockable());
- }
-
- @Test
- public void testIsChannelBlockable_criticalDeviceFunction() {
- NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
- appRow.systemApp = false;
- NotificationChannel channel = mock(NotificationChannel.class);
- when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
- when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
-
- mController.onResume(appRow, channel, null, null, null, null, null);
- assertFalse(mController.isChannelBlockable());
- }
-
- @Test
public void testIsChannelGroupBlockable_SystemNotBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
index b2a54ca..1660955 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -16,6 +16,8 @@
package com.android.settings.notification.zen;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -33,10 +35,7 @@
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-
-import com.android.settings.notification.zen.ZenModeAutomaticRulesPreferenceController;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenRulePreference;
+import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.mockito.internal.util.reflection.FieldSetter;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
import java.util.HashMap;
@@ -68,7 +66,7 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = ApplicationProvider.getApplicationContext();
mController = spy(new ZenModeAutomaticRulesPreferenceController(mContext, mock(Fragment.class),
null));
ReflectionHelpers.setField(mController, "mBackend", mBackend);
@@ -79,6 +77,16 @@
}
@Test
+ public void testDisplayPreference_resetsPreferencesWhenCategoryEmpty() {
+ // when the PreferenceCategory is empty (no preferences), make sure we clear out any
+ // stale state in the cached set of zen rule preferences
+ mController.mZenRulePreferences.put("test1_id", mZenRulePreference);
+ when(mockPref.getPreferenceCount()).thenReturn(0);
+ mController.displayPreference(mPreferenceScreen);
+ assertTrue(mController.mZenRulePreferences.isEmpty());
+ }
+
+ @Test
public void testUpdateState_clearsPreferencesWhenAddingNewPreferences() {
final int NUM_RULES = 3;
Map<String, AutomaticZenRule> rMap = new HashMap<>();
@@ -103,6 +111,7 @@
mController.updateState(mockPref);
verify(mockPref, times(1)).removeAll();
verify(mockPref, times(NUM_RULES)).addPreference(any());
+ assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
}
@Test
@@ -121,12 +130,49 @@
rMap.put(ruleId1, autoRule1);
rMap.put(ruleId2, autoRule2);
+ // Add three preferences to the set of previously-known-about ZenRulePreferences; in this
+ // case, test3_id is "deleted"
+ mController.mZenRulePreferences.put("test1_id", mZenRulePreference);
+ mController.mZenRulePreferences.put("test2_id", mZenRulePreference);
+ mController.mZenRulePreferences.put("test3_id", mZenRulePreference);
+
// update state should re-add all preferences since a preference was deleted
- when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES + 2);
+ when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES + 1);
mockGetAutomaticZenRules(NUM_RULES, rMap);
mController.updateState(mockPref);
verify(mockPref, times(1)).removeAll();
verify(mockPref, times(NUM_RULES)).addPreference(any());
+ assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
+ }
+
+ @Test
+ public void testUpdateState_clearsPreferencesWhenSameNumberButDifferentPrefs() {
+ final int NUM_RULES = 2;
+ Map<String, AutomaticZenRule> rMap = new HashMap<>();
+
+ String ruleId1 = "test1_id";
+ String ruleId2 = "test2_id";
+
+ AutomaticZenRule autoRule1 = new AutomaticZenRule("test_rule_1", null, null,
+ null, null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10);
+ AutomaticZenRule autoRule2 = new AutomaticZenRule("test_rule_2", null, null,
+ null, null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20);
+
+ rMap.put(ruleId1, autoRule1);
+ rMap.put(ruleId2, autoRule2);
+
+ // Add two preferences to the set of previously-known-about ZenRulePreferences; in this
+ // case, test3_id is "deleted" but test2_id is "added"
+ mController.mZenRulePreferences.put("test1_id", mZenRulePreference);
+ mController.mZenRulePreferences.put("test3_id", mZenRulePreference);
+
+ // update state should re-add all preferences since a preference was deleted
+ when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES);
+ mockGetAutomaticZenRules(NUM_RULES, rMap);
+ mController.updateState(mockPref);
+ verify(mockPref, times(1)).removeAll();
+ verify(mockPref, times(NUM_RULES)).addPreference(any());
+ assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
}
@Test
@@ -140,6 +186,7 @@
when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES);
when(mockPref.getPreference(anyInt())).thenReturn(mZenRulePreference);
+ mController.mZenRulePreferences.put("test1_id", mZenRulePreference);
// update state should NOT re-add all the preferences, should only update enable state
rule.setEnabled(false);
@@ -148,7 +195,8 @@
FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId);
mController.updateState(mockPref);
verify(mZenRulePreference, times(1)).updatePreference(any());
- verify(mController, never()).reloadAllRules(any());
+ verify(mockPref, never()).removeAll();
+ assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
}
private void mockGetAutomaticZenRules(int numRules, Map<String, AutomaticZenRule> rules) {
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
index 45a9dd6..d164cb9 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
@@ -34,7 +34,7 @@
@Implements(TileUtils.class)
public class ShadowTileUtils {
- public static final String MOCK_SUMMARY = "summary";
+ public static final String MOCK_TEXT = "text";
private static boolean sChecked;
private static Bundle sResult;
@@ -42,13 +42,14 @@
@Implementation
protected static String getTextFromUri(Context context, Uri uri,
Map<String, IContentProvider> providerMap, String key) {
- return MOCK_SUMMARY;
+ return MOCK_TEXT;
}
@Implementation
protected static Pair<String, Integer> getIconFromUri(Context context, String packageName,
Uri uri, Map<String, IContentProvider> providerMap) {
- return Pair.create(RuntimeEnvironment.application.getPackageName(), R.drawable.ic_settings_accent);
+ return Pair.create(RuntimeEnvironment.application.getPackageName(),
+ R.drawable.ic_settings_accent);
}
@Implementation
diff --git a/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java b/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java
new file mode 100644
index 0000000..b9dea01
--- /dev/null
+++ b/tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.RingtoneManager;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/** Unittest for DefaultRingtonePreference. */
+@RunWith(AndroidJUnit4.class)
+public class DefaultRingtonePreferenceTest {
+
+ private DefaultRingtonePreference mDefaultRingtonePreference;
+
+ @Mock
+ private ContentResolver mContentResolver;
+ @Mock
+ private Uri mRingtoneUri;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ Context context = spy(ApplicationProvider.getApplicationContext());
+ doReturn(mContentResolver).when(context).getContentResolver();
+
+ mDefaultRingtonePreference = spy(new DefaultRingtonePreference(context, null /* attrs */));
+ doReturn(context).when(mDefaultRingtonePreference).getContext();
+ when(mDefaultRingtonePreference.getRingtoneType())
+ .thenReturn(RingtoneManager.TYPE_RINGTONE);
+ mDefaultRingtonePreference.setUserId(1);
+ }
+
+ @Test
+ public void onSaveRingtone_nullMimeType_shouldNotSetRingtone() {
+ when(mContentResolver.getType(mRingtoneUri)).thenReturn(null);
+
+ mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);
+
+ verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);
+ }
+
+ @Test
+ public void onSaveRingtone_notAudioMimeType_shouldNotSetRingtone() {
+ when(mContentResolver.getType(mRingtoneUri)).thenReturn("text/plain");
+
+ mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);
+
+ verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);
+ }
+}
diff --git a/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java b/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java
index 9bc3ef5..8350bc7 100644
--- a/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java
+++ b/tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java
@@ -37,6 +37,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -71,6 +72,7 @@
}
@Test
+ @Ignore("b/231904717")
public void canDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/ false);
setActivityInfo(mAllowedPackage);
@@ -79,6 +81,7 @@
}
@Test
+ @Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_hasPlatformKey()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*has platform key*/ true);
@@ -88,6 +91,7 @@
}
@Test
+ @Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_noLauncherEntry()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/false);
@@ -97,6 +101,7 @@
}
@Test
+ @Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/false);
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
index 066cf6b..b5020db 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
@@ -46,6 +46,7 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -230,6 +231,7 @@
assertTrue(TextUtils.equals(mController.getSummary(SUB_ID_1, DISPLAY_NAME_1), summary));
}
+ @Ignore
@Test
@UiThreadTest
public void getAvailablePhysicalSubscription_withTwoPhysicalSims_returnTwo() {
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index 8687e5a..436d37f 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -56,6 +56,7 @@
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -165,6 +166,7 @@
assertThat(testItem).isNull();
}
+ @Ignore
@Test
public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1";
@@ -181,6 +183,7 @@
assertThat(testRowBuild.getSubtitle()).isEqualTo(expectedSubtitle);
}
+ @Ignore
@Test
public void createCarrierRow_wifiOnhasDdsAndActiveNetworkIsCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1";
@@ -201,6 +204,7 @@
assertThat(testRowBuild.getSubtitle()).isEqualTo(expectedSubtitle);
}
+ @Ignore
@Test
public void createCarrierRow_noNetworkAvailable_verifyTitleAndSummary() {
String expectDisplayName = "Name1";
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
index b0d6365..43a32b5 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -69,6 +69,7 @@
when(mTelMgr.getUiccSlotsInfo()).thenReturn(null);
}
+ @Ignore
@Test
public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(null);
@@ -90,6 +91,7 @@
assertThat(subs).hasSize(1);
}
+ @Ignore
@Test
public void getAvailableSubscriptions_twoSubscriptions_twoResults() {
final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
@@ -138,6 +140,7 @@
assertThat(subs).hasSize(2);
}
+ @Ignore
@Test
public void getUniqueDisplayNames_uniqueCarriers_originalUsed() {
// Each subscription's default display name is unique.
@@ -228,6 +231,7 @@
assertEquals(CARRIER_1 + " 4444", idNames.get(SUBID_2));
}
+ @Ignore
@Test
public void getUniqueDisplayNames_phoneNumberBlocked_subscriptoinIdFallback() {
// Both subscriptoins have the same display name.
@@ -295,6 +299,7 @@
assertEquals(CARRIER_1 + " 3", idNames.get(SUBID_3));
}
+ @Ignore
@Test
public void getUniqueDisplayName_onlyOneSubscription_correctNameReturned() {
// Each subscription's default display name is unique.
@@ -394,6 +399,7 @@
assertTrue(TextUtils.isEmpty(name));
}
+ @Ignore
@Test
public void getUniqueDisplayName_fullSubscriptionInfo_correctNameReturned() {
// Each subscription's default display name is unique.
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index ac07fae..3bcfcb4 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -200,7 +200,7 @@
}
@Test
- public void isAvailable_airplaneModeOnWifiOffWithCarrierNetwork_availableTrue() {
+ public void isAvailable_airplaneModeOnWifiOffWithCarrierNetwork_availableFalse() {
setupMockSubscriptions(1);
when(mWifiManager.isWifiEnabled()).thenReturn(false);
@@ -212,7 +212,7 @@
}
@Test
- public void isAvailable_airplaneModeOff_availableFalse() {
+ public void isAvailable_airplaneModeOff_availableTrue() {
setupMockSubscriptions(2);
assertThat(mController.isAvailable()).isTrue();
@@ -235,12 +235,11 @@
mController.displayPreference(mPreferenceScreen);
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
}
@Test
@UiThreadTest
- public void displayPreference_providerAndHasMultiSim_showDataSubPreference() {
+ public void displayPreference_providerAndHasMultiSim_showOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
@@ -249,7 +248,6 @@
mController.displayPreference(mPreferenceScreen);
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
}
@Test
@@ -437,7 +435,7 @@
@Test
@UiThreadTest
- public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId1Preference() {
+ public void dataSubscriptionChanged_providerAndHasMultiSim_showOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
@@ -449,12 +447,11 @@
assertThat(mController.isAvailable()).isTrue();
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
}
@Test
@UiThreadTest
- public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId2Preference() {
+ public void dataSubscriptionChanged_providerAndHasMultiSim_showOnlyOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
final int subId = sub.get(0).getSubscriptionId();
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
@@ -464,17 +461,12 @@
mController.onResume();
mController.displayPreference(mPreferenceScreen);
- assertThat(mController.isAvailable()).isTrue();
- assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
-
doReturn(sub.get(1)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
mController.mConnectionChangeReceiver.onReceive(mContext, intent);
assertThat(mController.isAvailable()).isTrue();
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
}
@Test
diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
index c48941f..57e38d3 100644
--- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
@@ -44,6 +44,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -111,6 +112,7 @@
assertThat(mController.getLabelFromCallingAccount(null)).isEqualTo("");
}
+ @Ignore
@Test
public void displayPreference_twoSubscriptionsSub1Default_correctListPreferenceValues() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
@@ -141,6 +143,7 @@
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
+ @Ignore
@Test
public void displayPreference_twoSubscriptionsSub2Default_correctListPreferenceValues() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
@@ -171,6 +174,7 @@
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
+ @Ignore
@Test
public void displayPreference_threeSubsOneIsOpportunistic_correctListPreferenceValues() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
@@ -254,6 +258,7 @@
assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222);
}
+ @Ignore
@Test
public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
@@ -314,6 +319,7 @@
assertThat(mListPreference.isEnabled()).isTrue();
}
+ @Ignore
@Test
public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");