Merge "[Wi-Fi] Wrong MAC address shown in Settings."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f9dc83b..e236177 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -592,14 +592,8 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter>
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.system" />
- <meta-data android:name="com.android.settings.order" android:value="-240"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.DateTimeSettings" />
+ android:value="com.android.settings.datetime.DateTimeSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -640,12 +634,6 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter>
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.order" android:value="-260"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.system"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.language.LanguageAndInputSettings"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2115,12 +2103,6 @@
<action android:name="android.settings.CAST_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter>
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.order" android:value="-6"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.wfd.WifiDisplaySettings" />
</activity>
@@ -2344,9 +2326,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter>
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.datausage.DataUsageSummary" />
</activity>
@@ -2390,11 +2369,13 @@
</intent-filter>
<meta-data android:name="com.android.settings.order" android:value="-45"/>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.system" />
+ android:value="com.android.settings.category.ia.system" />
+ <meta-data android:name="com.android.settings.summary_uri"
+ android:value="content://com.android.settings.dashboard.SummaryProvider/user" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.users.UserSettings" />
+ android:value="com.android.settings.users.UserSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
+ android:value="true" />
</activity>
<activity
@@ -2537,14 +2518,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter>
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.order" android:value="-440"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.apps"/>
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/summary_empty"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.notification.ConfigureNotificationSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2910,9 +2883,8 @@
</activity-alias>
<provider
- android:name=".backup.BackupSettingsContentProvider"
- android:authorities="com.android.settings.backup.BackupSettingsContentProvider"
- android:exported="true">
+ android:name=".dashboard.SummaryProvider"
+ android:authorities="com.android.settings.dashboard.SummaryProvider">
</provider>
<activity android:name=".backup.UserBackupSettingsActivity"
@@ -2931,7 +2903,7 @@
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.summary_uri"
- android:value="content://com.android.settings.backup.BackupSettingsContentProvider/summary" />
+ android:value="content://com.android.settings.dashboard.SummaryProvider/backup" />
<meta-data android:name="com.android.settings.order" android:value="-60"/>
</activity>
diff --git a/res/layout/notif_importance_preference.xml b/res/layout/notif_importance_preference.xml
index 44c135b..edc2bb1 100644
--- a/res/layout/notif_importance_preference.xml
+++ b/res/layout/notif_importance_preference.xml
@@ -67,7 +67,7 @@
android:visibility="gone" />
</com.android.settings.notification.NotificationButtonRelativeLayout>
- <RelativeLayout
+ <com.android.settings.notification.NotificationButtonRelativeLayout
android:id="@+id/silence"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -109,6 +109,6 @@
android:layout_below="@id/silence_icon"
android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
android:visibility="gone" />
- </RelativeLayout>
+ </com.android.settings.notification.NotificationButtonRelativeLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index e205157..7d55e7b 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -257,6 +257,18 @@
android:prompt="@string/wifi_eap_user_cert" />
</LinearLayout>
+ <LinearLayout android:id="@+id/no_user_cert_warning"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ style="@style/wifi_item" >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_warning"
+ android:text="@string/wifi_no_user_cert_warning" />
+ </LinearLayout>
+
<LinearLayout android:id="@+id/l_identity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b505086..53f96a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -909,6 +909,8 @@
<string name="security_settings_face_enroll_introduction_no_thanks">No thanks</string>
<!-- Button text to start enrollment [CHAR LIMIT=30] -->
<string name="security_settings_face_enroll_introduction_agree">Agree</string>
+ <!-- Button text to scroll to the end of a scrollview. [CHAR LIMIT=30] -->
+ <string name="security_settings_face_enroll_introduction_more">More</string>
<!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->
<string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>
<!-- Introduction title shown in face enrollment to introduce the face unlock feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
@@ -2272,6 +2274,10 @@
<!-- Warning message displayed if user does not specify a domain for the CA certificate.
Only displayed if the user also chooses to use system certificates. -->
<string name="wifi_no_domain_warning">Must specify a domain.</string>
+ <!-- Warning message displayed if user does not specify a user certification for
+ WPA3-Enterprise 192-bit. Only displayed if the user does not specify user certificate
+ for WPA3-Enterprise 192-bit [CHAR LIMIT=80]-->
+ <string name="wifi_no_user_cert_warning">This option requires a user certificate.</string>
<!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
string is listed first [CHAR LIMIT=20]-->
<string name="wifi_wps_available_first_item">WPS available</string>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index eccb0d1..f75bd86 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -46,6 +46,13 @@
android:layout="@layout/preference_category_no_label"
android:order="-997"/>
+ <Preference
+ android:key="configure_notification_settings"
+ android:title="@string/configure_notification_settings"
+ android:order="-440"
+ android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+ settings:controller="com.android.settings.notification.ConfigureNotificationPreferenceController"/>
+
<!-- Notifications (appears before manage_perms), default apps (appears after) -->
<PreferenceCategory
android:key="dashboard_tile_placeholder"
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index d8dabdc..0d2d282 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -25,6 +25,7 @@
android:key="caption_preview"
android:title="@string/summary_placeholder"
android:layout="@layout/captioning_preview"
+ android:selectable="false"
settings:searchable="false"/>
<PreferenceCategory
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index ab8967d..7c50bcc 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -36,14 +36,6 @@
settings:controller="com.android.settings.nfc.NfcPreferenceController"
android:order="-7"/>
- <com.android.settingslib.RestrictedPreference
- android:fragment="com.android.settings.nfc.AndroidBeam"
- android:key="android_beam_settings"
- android:title="@string/android_beam_settings_title"
- settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
- android:icon="@drawable/ic_android"
- android:order="-6"/>
-
<SwitchPreference
android:key="nfc_secure_settings"
android:title="@string/nfc_secure_settings_title"
@@ -52,6 +44,23 @@
android:summary="@string/nfc_secure_toggle_summary"
android:order="-7"/>
+ <Preference
+ android:fragment="com.android.settings.wfd.WifiDisplaySettings"
+ android:key="wifi_display_settings"
+ android:title="@string/wifi_display_settings_title"
+ android:icon="@drawable/ic_cast_24dp"
+ android:order="-6"
+ settings:searchable="false"
+ settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"/>
+
+ <com.android.settingslib.RestrictedPreference
+ android:fragment="com.android.settings.nfc.AndroidBeam"
+ android:key="android_beam_settings"
+ android:title="@string/android_beam_settings_title"
+ settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
+ android:icon="@drawable/ic_android"
+ android:order="-5"/>
+
<com.android.settingslib.RestrictedPreference
android:key="connected_device_printing"
android:title="@string/print_settings"
diff --git a/res/xml/hardware_info.xml b/res/xml/hardware_info.xml
index 2fd58ff..4ed914d 100644
--- a/res/xml/hardware_info.xml
+++ b/res/xml/hardware_info.xml
@@ -27,6 +27,7 @@
android:key="hardware_info_device_model"
android:title="@string/model_info"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:controller="com.android.settings.deviceinfo.hardwareinfo.DeviceModelPreferenceController"
settings:enableCopying="true"/>
@@ -35,6 +36,7 @@
android:key="hardware_info_device_serial"
android:title="@string/status_serial_number"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:controller="com.android.settings.deviceinfo.hardwareinfo.SerialNumberPreferenceController"
settings:enableCopying="true"/>
@@ -43,7 +45,8 @@
android:key="hardware_info_device_revision"
android:title="@string/hardware_revision"
android:summary="@string/summary_placeholder"
+ android:selectable="false"
settings:controller="com.android.settings.deviceinfo.hardwareinfo.HardwareRevisionPreferenceController"
settings:enableCopying="true"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 6a753f2..88b8d2f 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -22,6 +22,14 @@
settings:initialExpandedChildrenCount="4">
<Preference
+ android:key="language_input_settings"
+ android:title="@string/language_settings"
+ android:icon="@drawable/ic_settings_language"
+ android:order="-260"
+ android:fragment="com.android.settings.language.LanguageAndInputSettings"
+ settings:controller="com.android.settings.language.LanguageAndInputPreferenceController"/>
+
+ <Preference
android:key="gesture_settings"
android:title="@string/gesture_preference_title"
android:icon="@drawable/ic_settings_gestures"
@@ -30,6 +38,14 @@
settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>
<Preference
+ android:key="date_time_settings"
+ android:title="@string/date_and_time"
+ android:icon="@drawable/ic_settings_date_time"
+ android:order="-240"
+ android:fragment="com.android.settings.datetime.DateTimeSettings"
+ settings:controller="com.android.settings.datetime.DateTimePreferenceController"/>
+
+ <Preference
android:key="reset_dashboard"
android:title="@string/reset_dashboard_title"
android:summary="@string/reset_dashboard_summary"
@@ -47,7 +63,7 @@
android:order="-30"
settings:keywords="@string/keywords_system_update_settings"
settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
- <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+ <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
</Preference>
<Preference
@@ -57,7 +73,7 @@
settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="@string/additional_system_update"
- android:targetClass="@string/additional_system_update_menu" />
+ android:targetClass="@string/additional_system_update_menu"/>
</Preference>
</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 071cbcb..9270a5a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -52,7 +52,6 @@
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.backup.UserBackupSettingsActivity;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.core.SubSettingLauncher;
@@ -644,10 +643,6 @@
|| somethingChanged;
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
- UserBackupSettingsActivity.class.getName()), true, isAdmin)
- || somethingChanged;
-
- somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
Settings.WifiDisplaySettingsActivity.class.getName()),
WifiDisplaySettings.isAvailable(this), isAdmin)
|| somethingChanged;
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index e576065..a9f4ade 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -15,7 +15,6 @@
*/
package com.android.settings.applications;
-import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
@@ -30,7 +29,6 @@
import com.android.settings.Utils;
import com.android.settings.applications.ProcStatsData.MemInfo;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
@@ -127,40 +125,4 @@
}
return false;
}
-
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- ProcStatsData statsManager = new ProcStatsData(mContext, false);
- statsManager.setDuration(sDurations[0]);
- MemInfo memInfo = statsManager.getMemInfo();
- String usedResult = Formatter.formatShortFileSize(mContext,
- (long) memInfo.realUsedRam);
- String totalResult = Formatter.formatShortFileSize(mContext,
- (long) memInfo.realTotalRam);
- mSummaryLoader.setSummary(this, mContext.getString(R.string.memory_summary,
- usedResult, totalResult));
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
-
}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 734552e..90ab71a 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -92,7 +92,6 @@
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.applications.AppStateWriteSettingsBridge;
import com.android.settings.applications.AppStorageSettings;
-import com.android.settings.applications.InstalledAppCounter;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
@@ -100,7 +99,6 @@
import com.android.settings.applications.appinfo.WriteSettingsDetails;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.fuelgauge.HighPowerDetail;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.ConfigureNotificationSettings;
@@ -1518,38 +1516,4 @@
}
}
}
-
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mLoader;
-
- private SummaryProvider(Context context, SummaryLoader loader) {
- mContext = context;
- mLoader = loader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
- mContext.getPackageManager()) {
- @Override
- protected void onCountComplete(int num) {
- mLoader.setSummary(SummaryProvider.this,
- mContext.getString(R.string.apps_summary, num));
- }
- }.execute();
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
}
diff --git a/src/com/android/settings/backup/BackupSettingsContentProvider.java b/src/com/android/settings/backup/BackupSettingsContentProvider.java
deleted file mode 100644
index 5c888ab..0000000
--- a/src/com/android/settings/backup/BackupSettingsContentProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2019 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.backup;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-
-import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
-
-/** Provider stores and manages user interaction feedback for homepage contextual cards. */
-public class BackupSettingsContentProvider extends ContentProvider {
- private static final String AUTHORITY =
- "com.android.settings.backup.BackupSettingsContentProvider";
- private static final String SUMMARY = "summary";
- private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
- static {
- URI_MATCHER.addURI(AUTHORITY, SUMMARY, 1);
- }
-
- @Override
- public Bundle call(String method, String uri, Bundle extras) {
- if (!SUMMARY.equals(method)) {
- return null;
- }
- Bundle bundle = new Bundle();
- bundle.putString(META_DATA_PREFERENCE_SUMMARY,
- new BackupSettingsHelper(getContext()).getSummary());
- return bundle;
- }
-
- @Override
- public boolean onCreate() {
- return true;
- }
-
- @Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getType(Uri uri) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Uri insert(Uri uri, ContentValues values) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
index 1d3455b..1483714 100644
--- a/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -54,7 +54,7 @@
* If there is only one profile, show whether the backup is on or off.
* Otherwise, show nothing.
*/
- String getSummary() {
+ public String getSummary() {
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (userManager.getUserProfiles().size() == 1) {
try {
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index f4433f0..5f164d6 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -81,7 +81,7 @@
final RequireScrollMixin requireScrollMixin = getLayout().getMixin(
RequireScrollMixin.class);
requireScrollMixin.requireScrollWithButton(this, agreeButton,
- R.string.wifi_more,
+ R.string.security_settings_face_enroll_introduction_more,
button -> {
onNextButtonClick(button);
});
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 945ac5c..aa96a02 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -16,7 +16,6 @@
package com.android.settings.core.gateway;
-import com.android.settings.DateTimeSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.IccLockSettings;
import com.android.settings.MasterClear;
@@ -63,6 +62,7 @@
import com.android.settings.datausage.DataSaverSummary;
import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.datetime.DateTimeSettings;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
import com.android.settings.deviceinfo.PrivateVolumeForget;
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 0e6476c..01a2b14 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -37,12 +37,12 @@
import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.search.Indexable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -56,7 +56,7 @@
*/
public abstract class DashboardFragment extends SettingsPreferenceFragment
implements SettingsBaseActivity.CategoryListener, Indexable,
- SummaryLoader.SummaryConsumer, PreferenceGroup.OnExpandButtonClickListener,
+ PreferenceGroup.OnExpandButtonClickListener,
BasePreferenceController.UiBlockListener {
private static final String TAG = "DashboardFragment";
@@ -68,7 +68,6 @@
private DashboardFeatureProvider mDashboardFeatureProvider;
private DashboardTilePlaceholderPreferenceController mPlaceholderPreferenceController;
private boolean mListeningToCategoryChange;
- private SummaryLoader mSummaryLoader;
private List<String> mSuppressInjectedTileKeys;
@VisibleForTesting
UiBlockerController mBlockerController;
@@ -128,7 +127,7 @@
if (!keys.isEmpty()) {
mBlockerController = new UiBlockerController(keys);
- mBlockerController.start(()->updatePreferenceVisibility(mPreferenceControllers));
+ mBlockerController.start(() -> updatePreferenceVisibility(mPreferenceControllers));
}
}
@@ -169,10 +168,6 @@
if (category == null) {
return;
}
- if (mSummaryLoader != null) {
- // SummaryLoader can be null when there is no dynamic tiles.
- mSummaryLoader.setListening(true);
- }
final Activity activity = getActivity();
if (activity instanceof SettingsBaseActivity) {
mListeningToCategoryChange = true;
@@ -181,19 +176,6 @@
}
@Override
- public void notifySummaryChanged(Tile tile) {
- final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
- final Preference pref = getPreferenceScreen().findPreference(key);
- if (pref == null) {
- Log.d(getLogTag(), String.format(
- "Can't find pref by key %s, skipping update summary %s",
- key, tile.getDescription()));
- return;
- }
- pref.setSummary(tile.getSummary(pref.getContext()));
- }
-
- @Override
public void onResume() {
super.onResume();
updatePreferenceStates();
@@ -220,10 +202,6 @@
@Override
public void onStop() {
super.onStop();
- if (mSummaryLoader != null) {
- // SummaryLoader can be null when there is no dynamic tiles.
- mSummaryLoader.setListening(false);
- }
if (mListeningToCategoryChange) {
final Activity activity = getActivity();
if (activity instanceof SettingsBaseActivity) {
@@ -413,13 +391,6 @@
// Create a list to track which tiles are to be removed.
final List<String> remove = new ArrayList<>(mDashboardTilePrefKeys);
- // There are dashboard tiles, so we need to install SummaryLoader.
- if (mSummaryLoader != null) {
- mSummaryLoader.release();
- }
- final Context context = getContext();
- mSummaryLoader = new SummaryLoader(getActivity(), getCategoryKey());
- mSummaryLoader.setSummaryConsumer(this);
// Install dashboard tiles.
final boolean forceRoundedIcons = shouldForceRoundedIcon();
for (Tile tile : tiles) {
@@ -456,7 +427,6 @@
screen.removePreference(preference);
}
}
- mSummaryLoader.setListening(true);
}
@Override
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
deleted file mode 100644
index a1833f8..0000000
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2015 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.dashboard;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Process;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
-public class SummaryLoader {
- private static final boolean DEBUG = false;
- private static final String TAG = "SummaryLoader";
-
- public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
-
- private final Activity mActivity;
- private final ArrayMap<SummaryProvider, ComponentName> mSummaryProviderMap = new ArrayMap<>();
- private final ArrayMap<String, CharSequence> mSummaryTextMap = new ArrayMap<>();
- private final DashboardFeatureProvider mDashboardFeatureProvider;
- private final String mCategoryKey;
-
- private final Worker mWorker;
- private final HandlerThread mWorkerThread;
-
- private SummaryConsumer mSummaryConsumer;
- private boolean mListening;
- private boolean mWorkerListening;
- private ArraySet<BroadcastReceiver> mReceivers = new ArraySet<>();
-
- public SummaryLoader(Activity activity, String categoryKey) {
- mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
- .getDashboardFeatureProvider(activity);
- mCategoryKey = categoryKey;
- mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
- mWorkerThread.start();
- mWorker = new Worker(mWorkerThread.getLooper());
- mActivity = activity;
- }
-
- public void release() {
- mWorkerThread.quitSafely();
- // Make sure we aren't listening.
- setListeningW(false);
- }
-
- public void setSummaryConsumer(SummaryConsumer summaryConsumer) {
- mSummaryConsumer = summaryConsumer;
- }
-
- public void setSummary(SummaryProvider provider, final CharSequence summary) {
- final ComponentName component = mSummaryProviderMap.get(provider);
- ThreadUtils.postOnMainThread(() -> {
-
- final Tile tile = getTileFromCategory(
- mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
-
- if (tile == null) {
- if (DEBUG) {
- Log.d(TAG, "Can't find tile for " + component);
- }
- return;
- }
- if (DEBUG) {
- Log.d(TAG, "setSummary " + tile.getDescription() + " - " + summary);
- }
-
- updateSummaryIfNeeded(mActivity.getApplicationContext(), tile, summary);
- });
- }
-
- @VisibleForTesting
- void updateSummaryIfNeeded(Context context, Tile tile, CharSequence summary) {
- if (TextUtils.equals(tile.getSummary(context), summary)) {
- if (DEBUG) {
- Log.d(TAG, "Summary doesn't change, skipping summary update for "
- + tile.getDescription());
- }
- return;
- }
- mSummaryTextMap.put(mDashboardFeatureProvider.getDashboardKeyForTile(tile), summary);
- tile.overrideSummary(summary);
- if (mSummaryConsumer != null) {
- mSummaryConsumer.notifySummaryChanged(tile);
- } else {
- if (DEBUG) {
- Log.d(TAG, "SummaryConsumer is null, skipping summary update for "
- + tile.getDescription());
- }
- }
- }
-
- /**
- * Only call from the main thread.
- */
- public void setListening(boolean listening) {
- if (mListening == listening) {
- return;
- }
- mListening = listening;
- // Unregister listeners immediately.
- for (int i = 0; i < mReceivers.size(); i++) {
- mActivity.unregisterReceiver(mReceivers.valueAt(i));
- }
- mReceivers.clear();
-
- mWorker.removeMessages(Worker.MSG_SET_LISTENING);
- if (!listening) {
- // Stop listen
- mWorker.obtainMessage(Worker.MSG_SET_LISTENING, 0 /* listening */).sendToTarget();
- } else {
- // Start listen
- if (mSummaryProviderMap.isEmpty()) {
- // Category not initialized yet, init before starting to listen
- if (!mWorker.hasMessages(Worker.MSG_GET_CATEGORY_TILES_AND_SET_LISTENING)) {
- mWorker.sendEmptyMessage(Worker.MSG_GET_CATEGORY_TILES_AND_SET_LISTENING);
- }
- } else {
- // Category already initialized, start listening immediately
- mWorker.obtainMessage(Worker.MSG_SET_LISTENING, 1 /* listening */).sendToTarget();
- }
- }
- }
-
- private SummaryProvider getSummaryProvider(Tile tile) {
- if (!mActivity.getPackageName().equals(tile.getPackageName())) {
- // Not within Settings, can't load Summary directly.
- // TODO: Load summary indirectly.
- return null;
- }
- final Bundle metaData = tile.getMetaData();
- final Intent intent = tile.getIntent();
- if (metaData == null) {
- Log.d(TAG, "No metadata specified for " + intent.getComponent());
- return null;
- }
- final String clsName = metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
- if (clsName == null) {
- Log.d(TAG, "No fragment specified for " + intent.getComponent());
- return null;
- }
- try {
- Class<?> cls = Class.forName(clsName);
- Field field = cls.getField(SUMMARY_PROVIDER_FACTORY);
- SummaryProviderFactory factory = (SummaryProviderFactory) field.get(null);
- return factory.createSummaryProvider(mActivity, this);
- } catch (ClassNotFoundException e) {
- if (DEBUG) Log.d(TAG, "Couldn't find " + clsName, e);
- } catch (NoSuchFieldException e) {
- if (DEBUG) Log.d(TAG, "Couldn't find " + SUMMARY_PROVIDER_FACTORY, e);
- } catch (ClassCastException e) {
- if (DEBUG) Log.d(TAG, "Couldn't cast " + SUMMARY_PROVIDER_FACTORY, e);
- } catch (IllegalAccessException e) {
- if (DEBUG) Log.d(TAG, "Couldn't get " + SUMMARY_PROVIDER_FACTORY, e);
- }
- return null;
- }
-
- /**
- * Registers a receiver and automatically unregisters it when the activity is stopping.
- * This ensures that the receivers are unregistered immediately, since most summary loader
- * operations are asynchronous.
- */
- public void registerReceiver(final BroadcastReceiver receiver, final IntentFilter filter) {
- mActivity.runOnUiThread(() -> {
- if (!mListening) {
- return;
- }
- mReceivers.add(receiver);
- mActivity.registerReceiver(receiver, filter);
- });
- }
-
- private synchronized void setListeningW(boolean listening) {
- if (mWorkerListening == listening) {
- return;
- }
- mWorkerListening = listening;
- if (DEBUG) {
- Log.d(TAG, "Listening " + listening);
- }
- for (SummaryProvider p : mSummaryProviderMap.keySet()) {
- try {
- p.setListening(listening);
- } catch (Exception e) {
- Log.d(TAG, "Problem in setListening", e);
- }
- }
- }
-
- private synchronized void makeProviderW(Tile tile) {
- SummaryProvider provider = getSummaryProvider(tile);
- if (provider != null) {
- if (DEBUG) Log.d(TAG, "Creating " + tile);
- mSummaryProviderMap.put(provider, tile.getIntent().getComponent());
- }
- }
-
- private Tile getTileFromCategory(DashboardCategory category, ComponentName component) {
- if (category == null || category.getTilesCount() == 0) {
- return null;
- }
- final List<Tile> tiles = category.getTiles();
- final int tileCount = tiles.size();
- for (int j = 0; j < tileCount; j++) {
- final Tile tile = tiles.get(j);
- if (component.equals(tile.getIntent().getComponent())) {
- return tile;
- }
- }
- return null;
- }
-
-
- public interface SummaryProvider {
- void setListening(boolean listening);
- }
-
- public interface SummaryConsumer {
- void notifySummaryChanged(Tile tile);
- }
-
- public interface SummaryProviderFactory {
- SummaryProvider createSummaryProvider(Activity activity, SummaryLoader summaryLoader);
- }
-
- private class Worker extends Handler {
- private static final int MSG_GET_CATEGORY_TILES_AND_SET_LISTENING = 1;
- private static final int MSG_GET_PROVIDER = 2;
- private static final int MSG_SET_LISTENING = 3;
-
- public Worker(Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_GET_CATEGORY_TILES_AND_SET_LISTENING:
- final DashboardCategory category =
- mDashboardFeatureProvider.getTilesForCategory(mCategoryKey);
- if (category == null || category.getTilesCount() == 0) {
- return;
- }
- final List<Tile> tiles = category.getTiles();
- for (Tile tile : tiles) {
- makeProviderW(tile);
- }
- setListeningW(true);
- break;
- case MSG_GET_PROVIDER:
- Tile tile = (Tile) msg.obj;
- makeProviderW(tile);
- break;
- case MSG_SET_LISTENING:
- boolean listening = msg.obj != null && msg.obj.equals(1);
- setListeningW(listening);
- break;
- }
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/SummaryProvider.java b/src/com/android/settings/dashboard/SummaryProvider.java
new file mode 100644
index 0000000..6acc663
--- /dev/null
+++ b/src/com/android/settings/dashboard/SummaryProvider.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2019 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.dashboard;
+
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.R;
+import com.android.settings.backup.BackupSettingsHelper;
+
+/** Provide preference summary for injected items. */
+public class SummaryProvider extends ContentProvider {
+ private static final String BACKUP = "backup";
+ private static final String USER = "user";
+
+ @Override
+ public Bundle call(String method, String uri, Bundle extras) {
+ final Bundle bundle = new Bundle();
+ switch (method) {
+ case BACKUP:
+ bundle.putString(META_DATA_PREFERENCE_SUMMARY,
+ new BackupSettingsHelper(getContext()).getSummary());
+ break;
+ case USER:
+ final Context context = getContext();
+ final UserInfo info = context.getSystemService(UserManager.class).getUserInfo(
+ UserHandle.myUserId());
+ bundle.putString(META_DATA_PREFERENCE_SUMMARY,
+ context.getString(R.string.users_summary,
+ info.name));
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Uri format: " + uri);
+ }
+ return bundle;
+ }
+
+ @Override
+ public boolean onCreate() {
+ return true;
+ }
+
+ @Override
+ public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ String sortOrder) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Uri insert(Uri uri, ContentValues values) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 6597ecb..d26fc30 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -21,7 +21,6 @@
import android.os.Bundle;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionPlan;
import android.text.BidiFormatter;
import android.text.Spannable;
import android.text.SpannableString;
@@ -34,11 +33,8 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.net.DataUsageController;
import java.util.ArrayList;
import java.util.List;
@@ -250,77 +246,4 @@
updateState();
mSummaryController.updateState(mSummaryPreference);
}
-
- private static class SummaryProvider
- implements SummaryLoader.SummaryProvider {
-
- private final Activity mActivity;
- private final SummaryLoader mSummaryLoader;
- private final DataUsageController mDataController;
-
- public SummaryProvider(Activity activity, SummaryLoader summaryLoader) {
- mActivity = activity;
- mSummaryLoader = summaryLoader;
- mDataController = new DataUsageController(activity);
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- if (DataUsageUtils.hasSim(mActivity)) {
- mSummaryLoader.setSummary(this,
- mActivity.getString(R.string.data_usage_summary_format,
- formatUsedData()));
- } else {
- final DataUsageController.DataUsageInfo info =
- mDataController.getWifiDataUsageInfo();
-
- if (info == null) {
- mSummaryLoader.setSummary(this, null);
- } else {
- final CharSequence wifiFormat = mActivity
- .getText(R.string.data_usage_wifi_format);
- final CharSequence sizeText =
- DataUsageUtils.formatDataUsage(mActivity, info.usageLevel);
- mSummaryLoader.setSummary(this,
- TextUtils.expandTemplate(wifiFormat, sizeText));
- }
- }
- }
- }
-
- private CharSequence formatUsedData() {
- SubscriptionManager subscriptionManager = (SubscriptionManager) mActivity
- .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
- int defaultSubId = subscriptionManager.getDefaultSubscriptionId();
- if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- return formatFallbackData();
- }
- SubscriptionPlan dfltPlan = DataUsageSummaryPreferenceController
- .getPrimaryPlan(subscriptionManager, defaultSubId);
- if (dfltPlan == null) {
- return formatFallbackData();
- }
- if (DataUsageSummaryPreferenceController.unlimited(dfltPlan.getDataLimitBytes())) {
- return DataUsageUtils.formatDataUsage(mActivity, dfltPlan.getDataUsageBytes());
- } else {
- return Utils.formatPercentage(dfltPlan.getDataUsageBytes(),
- dfltPlan.getDataLimitBytes());
- }
- }
-
- private CharSequence formatFallbackData() {
- DataUsageController.DataUsageInfo info = mDataController.getDataUsageInfo();
- if (info == null) {
- return DataUsageUtils.formatDataUsage(mActivity, 0);
- } else if (info.limitLevel <= 0) {
- return DataUsageUtils.formatDataUsage(mActivity, info.usageLevel);
- } else {
- return Utils.formatPercentage(info.usageLevel, info.limitLevel);
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = SummaryProvider::new;
}
diff --git a/src/com/android/settings/datetime/DateTimePreferenceController.java b/src/com/android/settings/datetime/DateTimePreferenceController.java
new file mode 100644
index 0000000..c2b2b00
--- /dev/null
+++ b/src/com/android/settings/datetime/DateTimePreferenceController.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 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.datetime;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.datetime.ZoneGetter;
+
+import java.util.Calendar;
+
+public class DateTimePreferenceController extends BasePreferenceController {
+
+ public DateTimePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final Calendar now = Calendar.getInstance();
+ return ZoneGetter.getTimeZoneOffsetAndName(mContext,
+ now.getTimeZone(), now.getTime());
+ }
+}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/datetime/DateTimeSettings.java
similarity index 73%
rename from src/com/android/settings/DateTimeSettings.java
rename to src/com/android/settings/datetime/DateTimeSettings.java
index dd489da..469a4c7 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/datetime/DateTimeSettings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -11,10 +11,10 @@
* 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.
+ * limitations under the License
*/
-package com.android.settings;
+package com.android.settings.datetime;
import android.app.Activity;
import android.app.Dialog;
@@ -22,23 +22,13 @@
import android.content.Context;
import android.content.Intent;
+import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.datetime.AutoTimeFormatPreferenceController;
-import com.android.settings.datetime.AutoTimePreferenceController;
-import com.android.settings.datetime.AutoTimeZonePreferenceController;
-import com.android.settings.datetime.DatePreferenceController;
-import com.android.settings.datetime.TimeChangeListenerMixin;
-import com.android.settings.datetime.TimeFormatPreferenceController;
-import com.android.settings.datetime.TimePreferenceController;
-import com.android.settings.datetime.TimeZonePreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.datetime.ZoneGetter;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.List;
@SearchIndexable
@@ -144,36 +134,6 @@
showDialog(DatePreferenceController.DIALOG_DATEPICKER);
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- final Calendar now = Calendar.getInstance();
- mSummaryLoader.setSummary(this, ZoneGetter.getTimeZoneOffsetAndName(mContext,
- now.getTimeZone(), now.getTime()));
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
-
-
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.date_time_prefs);
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index 9d1b883..45be727 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -43,6 +43,7 @@
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.Map;
import java.util.Set;
@@ -104,7 +105,15 @@
LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri);
if (sliceLiveData == null) {
- sliceLiveData = SliceLiveData.fromUri(mContext, uri);
+ sliceLiveData = SliceLiveData.fromUri(mContext, uri,
+ (int type, Throwable source) -> {
+ // onSliceError doesn't handle error Slices.
+ Log.w(TAG, "Slice may be null. uri = " + uri + ", error = " + type);
+ ThreadUtils.postOnMainThread(
+ () -> mSliceLiveDataMap.get(uri).removeObservers(mLifecycleOwner));
+ mContext.getContentResolver()
+ .notifyChange(CardContentProvider.REFRESH_CARD_URI, null);
+ });
mSliceLiveDataMap.put(uri, sliceLiveData);
}
@@ -115,13 +124,6 @@
swipeBackground.setVisibility(View.GONE);
}
sliceLiveData.observe(mLifecycleOwner, slice -> {
- if (slice == null) {
- Log.w(TAG, "Slice is null");
- mContext.getContentResolver().notifyChange(CardContentProvider.REFRESH_CARD_URI,
- null);
- return;
- }
-
if (slice.hasHint(HINT_ERROR)) {
Log.w(TAG, "Slice has HINT_ERROR, skipping rendering. uri=" + slice.getUri());
mSliceLiveDataMap.get(slice.getUri()).removeObservers(mLifecycleOwner);
diff --git a/src/com/android/settings/language/LanguageAndInputPreferenceController.java b/src/com/android/settings/language/LanguageAndInputPreferenceController.java
new file mode 100644
index 0000000..04bf622
--- /dev/null
+++ b/src/com/android/settings/language/LanguageAndInputPreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2019 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.language;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
+public class LanguageAndInputPreferenceController extends BasePreferenceController {
+
+ private PackageManager mPackageManager;
+ private InputMethodManager mInputMethodManager;
+
+ public LanguageAndInputPreferenceController(Context context, String key) {
+ super(context, key);
+ mPackageManager = mContext.getPackageManager();
+ mInputMethodManager = mContext.getSystemService(InputMethodManager.class);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final String flattenComponent = Settings.Secure.getString(
+ mContext.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+ if (!TextUtils.isEmpty(flattenComponent)) {
+ final String pkg = ComponentName.unflattenFromString(flattenComponent)
+ .getPackageName();
+ final List<InputMethodInfo> imis = mInputMethodManager.getInputMethodList();
+ for (InputMethodInfo imi : imis) {
+ if (TextUtils.equals(imi.getPackageName(), pkg)) {
+ return imi.loadLabel(mPackageManager);
+ }
+ }
+ }
+ return "";
+ }
+}
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 4f45890..c896629 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -18,21 +18,13 @@
import android.app.Activity;
import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
import com.android.settings.inputmethod.SpellCheckerPreferenceController;
import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
@@ -122,44 +114,6 @@
return controllers;
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- final ContentResolver contentResolver = mContext.getContentResolver();
- if (listening) {
- final String flattenComponent = Settings.Secure.getString(
- contentResolver, Settings.Secure.DEFAULT_INPUT_METHOD);
- if (!TextUtils.isEmpty(flattenComponent)) {
- final PackageManager packageManage = mContext.getPackageManager();
- final String pkg = ComponentName.unflattenFromString(flattenComponent)
- .getPackageName();
- final InputMethodManager imm = (InputMethodManager)
- mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
- final List<InputMethodInfo> imis = imm.getInputMethodList();
- for (InputMethodInfo imi : imis) {
- if (TextUtils.equals(imi.getPackageName(), pkg)) {
- mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
- return;
- }
- }
- }
- mSummaryLoader.setSummary(this, "");
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
-
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.language_and_input) {
diff --git a/src/com/android/settings/network/TetherProvisioningActivity.java b/src/com/android/settings/network/TetherProvisioningActivity.java
index 53a86cb..230cfe0 100644
--- a/src/com/android/settings/network/TetherProvisioningActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningActivity.java
@@ -32,7 +32,7 @@
/**
* Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
* restrictions. Specifically, the provisioning apps require
- * {@link android.permission.CONNECTIVITY_INTERNAL}, while this activity can be started by a caller
+ * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
* with {@link android.permission.TETHER_PRIVILEGED}.
*/
public class TetherProvisioningActivity extends Activity {
diff --git a/src/com/android/settings/notification/ConfigureNotificationPreferenceController.java b/src/com/android/settings/notification/ConfigureNotificationPreferenceController.java
new file mode 100644
index 0000000..3aa1008
--- /dev/null
+++ b/src/com/android/settings/notification/ConfigureNotificationPreferenceController.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019 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.notification;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class ConfigureNotificationPreferenceController extends BasePreferenceController {
+
+ private NotificationBackend mBackend;
+
+ public ConfigureNotificationPreferenceController(Context context, String key) {
+ super(context, key);
+ mBackend = new NotificationBackend();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final int blockedAppCount = mBackend.getBlockedAppCount();
+ if (blockedAppCount == 0) {
+ return mContext.getText(R.string.app_notification_listing_summary_zero);
+ }
+ return mContext.getResources().getQuantityString(
+ R.plurals.app_notification_listing_summary_others,
+ blockedAppCount, blockedAppCount);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index ff8e94a..abbd9a7 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -40,7 +40,6 @@
import com.android.settings.RingtonePreference;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -163,54 +162,6 @@
}
/**
- * For summary
- */
- static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
- private NotificationBackend mBackend;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mBackend = new NotificationBackend();
- }
-
- @VisibleForTesting
- protected void setBackend(NotificationBackend backend) {
- mBackend = backend;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (!listening) {
- return;
- }
- int blockedAppCount = mBackend.getBlockedAppCount();
- if (blockedAppCount == 0) {
- mSummaryLoader.setSummary(this,
- mContext.getText(R.string.app_notification_listing_summary_zero));
- } else {
- mSummaryLoader.setSummary(this,
- mContext.getResources().getQuantityString(
- R.plurals.app_notification_listing_summary_others,
- blockedAppCount, blockedAppCount));
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
- new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new ConfigureNotificationSettings.SummaryProvider(
- activity, summaryLoader);
- }
- };
-
- /**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/slices/SlicePreference.java b/src/com/android/settings/slices/SlicePreference.java
index acf45ef..a2a7fe1 100644
--- a/src/com/android/settings/slices/SlicePreference.java
+++ b/src/com/android/settings/slices/SlicePreference.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.view.View;
import androidx.slice.Slice;
import androidx.slice.widget.SliceView;
@@ -48,6 +49,11 @@
}
public void onSliceUpdated(Slice slice) {
+ if (slice == null) {
+ mSliceView.setVisibility(View.GONE);
+ } else {
+ mSliceView.setVisibility(View.VISIBLE);
+ }
mSliceView.onChanged(slice);
notifyChanged();
}
diff --git a/src/com/android/settings/slices/SlicePreferenceController.java b/src/com/android/settings/slices/SlicePreferenceController.java
index 2432c99..8f3d0fb 100644
--- a/src/com/android/settings/slices/SlicePreferenceController.java
+++ b/src/com/android/settings/slices/SlicePreferenceController.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.net.Uri;
+import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LiveData;
@@ -38,6 +39,7 @@
*/
public class SlicePreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop, Observer<Slice> {
+ private static final String TAG = "SlicePreferenceController";
@VisibleForTesting
LiveData<Slice> mLiveData;
@VisibleForTesting
@@ -61,7 +63,10 @@
public void setSliceUri(Uri uri) {
mUri = uri;
- mLiveData = SliceLiveData.fromUri(mContext, mUri);
+ mLiveData = SliceLiveData.fromUri(mContext, mUri, (int type, Throwable source) -> {
+ Log.w(TAG, "Slice may be null. uri = " + uri + ", error = " + type);
+ onChanged(null);
+ });
//TODO(b/120803703): figure out why we need to remove observer first
mLiveData.removeObserver(this);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 2463295..5ad68fe 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -63,7 +63,6 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SwitchBar;
@@ -1195,30 +1194,6 @@
}
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
- UserHandle.myUserId());
- mSummaryLoader.setSummary(this, mContext.getString(R.string.users_summary,
- info.name));
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
- (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
-
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.user_settings) {
diff --git a/src/com/android/settings/wfd/WifiDisplayPreferenceController.java b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
new file mode 100644
index 0000000..3227387
--- /dev/null
+++ b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2019 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.wfd;
+
+import android.content.Context;
+import android.media.MediaRouter;
+import android.media.MediaRouter.RouteInfo;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class WifiDisplayPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ private final MediaRouter mRouter;
+ private Preference mPreference;
+ private final MediaRouter.Callback mRouterCallback = new MediaRouter.SimpleCallback() {
+ @Override
+ public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
+ refreshSummary(mPreference);
+ }
+
+ @Override
+ public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
+ refreshSummary(mPreference);
+ }
+
+ @Override
+ public void onRouteAdded(MediaRouter router, RouteInfo info) {
+ refreshSummary(mPreference);
+ }
+
+ @Override
+ public void onRouteRemoved(MediaRouter router, RouteInfo info) {
+ refreshSummary(mPreference);
+ }
+
+ @Override
+ public void onRouteChanged(MediaRouter router, RouteInfo info) {
+ refreshSummary(mPreference);
+ }
+ };
+
+ public WifiDisplayPreferenceController(Context context, String key) {
+ super(context, key);
+ mRouter = context.getSystemService(MediaRouter.class);
+ mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return WifiDisplaySettings.isAvailable(mContext) ? AVAILABLE_UNSEARCHABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ CharSequence summary = mContext.getString(R.string.disconnected);
+
+ final int routeCount = mRouter.getRouteCount();
+ for (int i = 0; i < routeCount; i++) {
+ final MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
+ if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)
+ && route.isSelected() && !route.isConnecting()) {
+ summary = mContext.getString(R.string.wifi_display_status_connected);
+ break;
+ }
+ }
+ return summary;
+ }
+
+ @Override
+ public void onStart() {
+ mRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mRouterCallback);
+ }
+
+ @Override
+ public void onStop() {
+ mRouter.removeCallback(mRouterCallback);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 0953ef7..4022809 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -37,7 +37,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.util.Slog;
import android.util.TypedValue;
@@ -64,15 +63,11 @@
import com.android.internal.app.MediaRouteDialogPresenter;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* The Settings screen for WifiDisplay configuration and connection management.
*
@@ -767,74 +762,6 @@
}
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
- private final MediaRouter mRouter;
- private final MediaRouter.Callback mRouterCallback = new MediaRouter.SimpleCallback() {
- @Override
- public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
- updateSummary();
- }
-
- @Override
- public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
- updateSummary();
- }
-
- @Override
- public void onRouteAdded(MediaRouter router, RouteInfo info) {
- updateSummary();
- }
-
- @Override
- public void onRouteRemoved(MediaRouter router, RouteInfo info) {
- updateSummary();
- }
-
- @Override
- public void onRouteChanged(MediaRouter router, RouteInfo info) {
- updateSummary();
- }
- };
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
- mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- mRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mRouterCallback);
- updateSummary();
- } else {
- mRouter.removeCallback(mRouterCallback);
- }
- }
-
- private void updateSummary() {
- String summary = mContext.getString(R.string.disconnected);
-
- final int routeCount = mRouter.getRouteCount();
- for (int i = 0; i < routeCount; i++) {
- final MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
- if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)
- && route.isSelected() && !route.isConnecting()) {
- summary = mContext.getString(R.string.wifi_display_status_connected);
- break;
- }
- }
- mSummaryLoader.setSummary(this, summary);
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
-
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.wifi_display_settings);
}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8bb023d..c31b857 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -555,6 +555,7 @@
void showWarningMessagesIfAppropriate() {
mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
+ mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
@@ -582,6 +583,14 @@
mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
}
}
+
+ if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B &&
+ mEapMethodSpinner.getSelectedItemPosition() == WIFI_EAP_METHOD_TLS) {
+ String userCertSelection = (String) mEapUserCertSpinner.getSelectedItem();
+ if (userCertSelection.equals(mUnspecifiedCertString)) {
+ mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.VISIBLE);
+ }
+ }
}
/**
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ec799de..2741139 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -60,12 +60,10 @@
import com.android.settings.SettingsActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.ScanningSettings;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -1228,42 +1226,6 @@
}
};
- private static class SummaryProvider
- implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- @VisibleForTesting
- WifiSummaryUpdater mSummaryHelper;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mSummaryHelper = new WifiSummaryUpdater(mContext, this);
- }
-
-
- @Override
- public void setListening(boolean listening) {
- mSummaryHelper.register(listening);
- }
-
- @Override
- public void onSummaryChanged(String summary) {
- mSummaryLoader.setSummary(this, summary);
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
-
private void handleConfigNetworkSubmitEvent(Intent data) {
final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
ConfigureAccessPointFragment.NETWORK_CONFIG_KEY);
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index ed697ed..58745e8 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -54,12 +54,10 @@
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.ScanningSettings;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settings.widget.SwitchBarController;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
@@ -676,40 +674,4 @@
return result;
}
};
-
- private static class SummaryProvider
- implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- @VisibleForTesting
- WifiSummaryUpdater mSummaryHelper;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mSummaryHelper = new WifiSummaryUpdater(mContext, this);
- }
-
-
- @Override
- public void setListening(boolean listening) {
- mSummaryHelper.register(listening);
- }
-
- @Override
- public void onSummaryChanged(String summary) {
- mSummaryLoader.setSummary(this, summary);
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(activity, summaryLoader);
- }
- };
}
diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java
index 058bba7..e01a246 100644
--- a/src/com/android/settings/wifi/tether/TetherService.java
+++ b/src/com/android/settings/wifi/tether/TetherService.java
@@ -88,7 +88,7 @@
String provisionResponse = getResourceForActiveDataSubId().getString(
com.android.internal.R.string.config_mobile_hotspot_provision_response);
registerReceiver(mReceiver, new IntentFilter(provisionResponse),
- android.Manifest.permission.CONNECTIVITY_INTERNAL, null);
+ android.Manifest.permission.TETHER_PRIVILEGED, null);
SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
mCurrentTethers = stringToTethers(prefs.getString(KEY_TETHERS, ""));
mCurrentTypeIndex = 0;
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
deleted file mode 100644
index 236b18a..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 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.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SummaryLoaderTest {
-
- private static final String SUMMARY_1 = "summary1";
- private static final String SUMMARY_2 = "summary2";
-
- private Context mContext;
- private SummaryLoader mSummaryLoader;
- private boolean mCallbackInvoked;
- private Tile mTile;
- private FakeFeatureFactory mFeatureFactory;
-
- @Before
- public void SetUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- final ActivityInfo activityInfo = new ActivityInfo();
- activityInfo.packageName = "pkg";
- activityInfo.name = "class";
- mTile = new Tile(activityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- mTile.overrideSummary(SUMMARY_1);
- mCallbackInvoked = false;
-
- final Activity activity = Robolectric.buildActivity(Activity.class).get();
-
- mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
- mSummaryLoader.setSummaryConsumer(tile -> mCallbackInvoked = true);
- }
-
- @Test
- public void newInstance_shouldNotLoadCategory() {
- verifyZeroInteractions(mFeatureFactory.dashboardFeatureProvider);
- }
-
- @Test
- public void testUpdateSummaryIfNeeded_SummaryIdentical_NoCallback() {
- mSummaryLoader.updateSummaryIfNeeded(mContext, mTile, SUMMARY_1);
-
- assertThat(mCallbackInvoked).isFalse();
- }
-
- @Test
- public void testUpdateSummaryIfNeeded_SummaryChanged_HasCallback() {
- mSummaryLoader.updateSummaryIfNeeded(mContext, mTile, SUMMARY_2);
-
- assertThat(mCallbackInvoked).isTrue();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 0672bd4..d8dde39 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -19,9 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.endsWith;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -36,7 +34,6 @@
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -66,15 +63,12 @@
public class DataUsageSummaryTest {
@Mock
- private SummaryLoader mSummaryLoader;
- @Mock
private NetworkPolicyManager mNetworkPolicyManager;
@Mock
private NetworkStatsManager mNetworkStatsManager;
private TelephonyManager mTelephonyManager;
private Context mContext;
private FragmentActivity mActivity;
- private SummaryLoader.SummaryProvider mSummaryProvider;
/**
* This set up is contrived to get a passing test so that the build doesn't block without tests.
@@ -96,9 +90,6 @@
shadowTelephonyManager.setTelephonyManagerForSubscriptionId(1, mTelephonyManager);
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
doReturn(mNetworkStatsManager).when(mActivity).getSystemService(NetworkStatsManager.class);
-
- mSummaryProvider = DataUsageSummary.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(mActivity, mSummaryLoader);
}
@Test
@@ -111,20 +102,6 @@
}
@Test
- public void setListening_shouldBlankSummaryWithNoSim() {
- ShadowDataUsageUtils.HAS_SIM = false;
- mSummaryProvider.setListening(true);
- verify(mSummaryLoader).setSummary(mSummaryProvider, null);
- }
-
- @Test
- public void setListening_shouldSetSummaryWithSim() {
- ShadowDataUsageUtils.HAS_SIM = true;
- mSummaryProvider.setListening(true);
- verify(mSummaryLoader).setSummary(anyObject(), endsWith(" of data used"));
- }
-
- @Test
@Config(shadows = ShadowSubscriptionManager.class)
public void configuration_withSim_shouldShowMobileAndWifi() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 6b917f0..2bd193a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -62,7 +62,7 @@
public class BatteryInfoTest {
private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
- private static final String STATUS_CHARGING_TIME = "50% - 0 min until fully charged";
+ private static final String STATUS_CHARGING_TIME = "50% - 0 min until charged";
private static final String STATUS_NOT_CHARGING = "Not charging";
private static final long REMAINING_TIME_NULL = -1;
private static final long REMAINING_TIME = 2;
@@ -71,7 +71,7 @@
private static final String EXTEND_PREFIX = "Extend battery life past";
private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
- "1 min left until fully charged";
+ "1 min left until charged";
private static final String TEST_BATTERY_LEVEL_10 = "10%";
private static final String FIFTEEN_MIN_FORMATTED = "15 min";
private static final Estimate DUMMY_ESTIMATE = new Estimate(
@@ -134,7 +134,7 @@
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
assertThat(info.discharging).isEqualTo(false);
- assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min until fully charged");
+ assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min until charged");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
index eeb465b..6f212df 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
@@ -16,25 +16,22 @@
package com.android.settings.homepage.contextualcards.slices;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import static com.google.common.truth.Truth.assertThat;
-
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.face.FaceManager;
import android.os.UserHandle;
import android.provider.Settings;
-import androidx.slice.Slice;
+import androidx.slice.SliceMetadata;
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
-import com.android.settings.Utils;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -60,8 +57,9 @@
public void getSlice_noFaceManager_shouldReturnNull() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false);
final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+ final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
- assertThat(setupSlice.getSlice()).isNull();
+ assertThat(metadata.isErrorSlice()).isTrue();
}
@Test
@@ -74,7 +72,9 @@
0);
final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
- assertThat(setupSlice.getSlice()).isNull();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
+
+ assertThat(metadata.isErrorSlice()).isTrue();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputPreferenceControllerTest.java
new file mode 100644
index 0000000..3f27fdd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputPreferenceControllerTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2019 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.language;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.view.inputmethod.InputMethodInfo;
+
+import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowInputMethodManagerWithMethodList.class)
+public class LanguageAndInputPreferenceControllerTest {
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = spy(RuntimeEnvironment.application);
+ }
+
+ @Test
+ public void getSummary_shouldSetToCurrentImeName() {
+ final ComponentName componentName = new ComponentName("name1", "cls");
+ final ContentResolver cr = mContext.getContentResolver();
+ Settings.Secure.putString(cr, Settings.Secure.DEFAULT_INPUT_METHOD,
+ componentName.flattenToString());
+ final List<InputMethodInfo> imis = new ArrayList<>();
+ imis.add(mock(InputMethodInfo.class));
+ when(imis.get(0).getPackageName()).thenReturn("name1");
+ when(imis.get(0).loadLabel(any())).thenReturn("label");
+ ShadowInputMethodManagerWithMethodList.getShadow().setInputMethodList(imis);
+
+ final LanguageAndInputPreferenceController controller =
+ new LanguageAndInputPreferenceController(mContext, "key");
+
+ assertThat(controller.getSummary().toString()).contains("label");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 19e62b1..a6a362e 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -28,23 +28,17 @@
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.hardware.input.InputManager;
import android.os.UserManager;
-import android.provider.Settings;
import android.view.autofill.AutofillManager;
-import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager;
import androidx.lifecycle.LifecycleObserver;
import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -67,16 +61,12 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
@Mock
- private PackageManager mPackageManager;
- @Mock
private InputManager mIm;
@Mock
private InputMethodManager mImm;
@Mock
private DevicePolicyManager mDpm;
@Mock
- private InputMethodManager mInputMethodManager;
- @Mock
private AutofillManager mAutofillManager;
private TestFragment mFragment;
@@ -124,31 +114,6 @@
}
@Test
- public void testSummary_shouldSetToCurrentImeName() {
- final Activity activity = mock(Activity.class);
- final SummaryLoader loader = mock(SummaryLoader.class);
- final ComponentName componentName = new ComponentName("pkg", "cls");
- final ContentResolver cr = activity.getContentResolver();
- Settings.Secure.putString(cr, Settings.Secure.DEFAULT_INPUT_METHOD,
- componentName.flattenToString());
- when(activity.getSystemService(Context.INPUT_METHOD_SERVICE))
- .thenReturn(mInputMethodManager);
- when(activity.getPackageManager()).thenReturn(mPackageManager);
- final List<InputMethodInfo> imis = new ArrayList<>();
- imis.add(mock(InputMethodInfo.class));
- when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
- when(mInputMethodManager.getInputMethodList()).thenReturn(imis);
-
- SummaryLoader.SummaryProvider provider = LanguageAndInputSettings.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(activity, loader);
-
- provider.setListening(true);
-
- verify(imis.get(0)).loadLabel(mPackageManager);
- verify(loader).setSummary(provider, null);
- }
-
- @Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = spy(RuntimeEnvironment.application);
final Resources res = spy(RuntimeEnvironment.application.getResources());
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index 6a714d7..3aa6a6f 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -30,6 +30,7 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
+import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
@@ -98,27 +99,33 @@
@Mock
private Cursor mCursor;
+ @Mock
+ private FragmentActivity mActivity;
+
@Captor
private ArgumentCaptor<Uri> mUriCaptor;
private ApnEditor mApnEditorUT;
- private FragmentActivity mActivity;
+ private Context mContext;
private Resources mResources;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));
- mResources = mActivity.getResources();
+ mContext = spy(RuntimeEnvironment.application);
+
+ mResources = mContext.getResources();
mApnEditorUT = spy(new ApnEditor());
doReturn(mActivity).when(mApnEditorUT).getActivity();
doReturn(mResources).when(mApnEditorUT).getResources();
doNothing().when(mApnEditorUT).finish();
doNothing().when(mApnEditorUT).showError();
- when(mApnEditorUT.getContext()).thenReturn(RuntimeEnvironment.application);
+ doReturn(mContext).when(mApnEditorUT).getContext();
+ doReturn(mContext.getTheme()).when(mActivity).getTheme();
+ doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
- setMockPreference(mActivity);
+ setMockPreference(mContext);
mApnEditorUT.mApnData = new FakeApnData(APN_DATA);
mApnEditorUT.sNotSet = "Not Set";
}
@@ -319,7 +326,7 @@
// WHEN press the back button
final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
- mApnEditorUT.onKey(new View(mActivity), KeyEvent.KEYCODE_BACK, event);
+ mApnEditorUT.onKey(new View(mContext), KeyEvent.KEYCODE_BACK, event);
// THEN the apn data is saved and the apn editor is closed
verify(mApnEditorUT).validateAndSaveApnData();
@@ -459,6 +466,7 @@
@Test
@Config(shadows = ShadowFragment.class)
public void onCreate_noAction_shouldFinishAndNoCrash() {
+ doReturn(new Intent()).when(mActivity).getIntent();
doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
mApnEditorUT.onCreate(null);
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
index 4a98753..1c71b96 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
@@ -22,6 +22,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -47,6 +48,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
@@ -76,7 +78,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
@@ -137,9 +139,9 @@
// Check that the onclick listeners are setup to fire with the right subscription id.
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
pref1.getOnPreferenceClickListener().onPreferenceClick(pref1);
pref2.getOnPreferenceClickListener().onPreferenceClick(pref2);
- verify(mContext, times(2)).startActivity(intentCaptor.capture());
final Intent intent1 = intentCaptor.getAllValues().get(0);
final Intent intent2 = intentCaptor.getAllValues().get(1);
assertThat(intent1.getIntExtra(EXTRA_SUB_ID, INVALID_SUBSCRIPTION_ID)).isEqualTo(1);
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 43e8c47..b7691af 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -23,6 +23,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -61,6 +62,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@@ -81,7 +83,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
@@ -190,10 +192,10 @@
mController = new MobileNetworkPreferenceController(mContext);
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2, false);
ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mContext).startActivity(argument.capture());
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(argument.capture());
final ComponentName componentName = argument.getValue().getComponent();
assertThat(componentName.getPackageName()).isEqualTo(MOBILE_NETWORK_PACKAGE);
assertThat(componentName.getClassName()).isEqualTo(MOBILE_NETWORK_CLASS);
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
index e24b0f2..4f4a549 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.notNull;
import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -53,6 +54,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
@@ -81,7 +83,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
@@ -130,9 +132,9 @@
mController.onResume();
assertThat(mController.getSummary()).isEqualTo("Add a network");
- mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).startActivity(intentCaptor.capture());
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
+ mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
assertThat(intentCaptor.getValue().getAction()).isEqualTo(
EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION);
}
@@ -155,9 +157,9 @@
mController.onResume();
assertThat(mController.getSummary()).isEqualTo("sub1");
assertThat(mPreference.getFragment()).isNull();
- mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).startActivity(intentCaptor.capture());
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
+ mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
Intent intent = intentCaptor.getValue();
assertThat(intent.getComponent().getClassName()).isEqualTo(
MobileNetworkActivity.class.getName());
@@ -218,9 +220,9 @@
mController.onSubscriptionsChanged();
assertThat(mController.getSummary()).isEqualTo("sub1");
assertThat(mPreference.getFragment()).isNull();
- mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).startActivity(intentCaptor.capture());
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
+ mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo(
MobileNetworkActivity.class.getName());
}
@@ -239,9 +241,9 @@
mController.onResume();
assertThat(mController.getSummary()).isEqualTo("sub1");
assertThat(mPreference.getFragment()).isNull();
- mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).startActivity(intentCaptor.capture());
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
+ mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference);
assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo(
MobileNetworkActivity.class.getName());
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index 51f8ec0..6fd94c3 100644
--- a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -29,6 +29,7 @@
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -63,6 +64,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowSubscriptionManager;
@@ -107,7 +109,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
@@ -257,14 +259,14 @@
*/
private void runPreferenceClickTest(final int subscriptionCount, final int selectedPrefIndex) {
final List<SubscriptionInfo> subs = setupMockSubscriptions(subscriptionCount);
- mController.displayPreference(mScreen);
final ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
+ mController.displayPreference(mScreen);
verify(mPreferenceCategory, times(subscriptionCount)).addPreference(prefCaptor.capture());
final List<Preference> prefs = prefCaptor.getAllValues();
final Preference pref = prefs.get(selectedPrefIndex);
- pref.getOnPreferenceClickListener().onPreferenceClick(pref);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).startActivity(intentCaptor.capture());
+ doNothing().when(mContext).startActivity(intentCaptor.capture());
+ pref.getOnPreferenceClickListener().onPreferenceClick(pref);
final Intent intent = intentCaptor.getValue();
assertThat(intent).isNotNull();
assertThat(intent.hasExtra(Settings.EXTRA_SUB_ID)).isTrue();
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
index ce4c9a2..d362837 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -47,6 +48,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class ApnPreferenceControllerTest {
@@ -69,7 +71,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
@@ -138,10 +140,10 @@
@Test
public void handPreferenceTreeClick_fireIntent() {
ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mContext).startActivity(captor.capture());
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(captor.capture());
final Intent intent = captor.getValue();
assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS);
assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
index 8907164..46e6978 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -49,6 +50,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class DataServiceSetupPreferenceControllerTest {
@@ -72,7 +74,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
@@ -125,11 +127,10 @@
@Test
public void handlePreferenceTreeClick_startActivity() {
ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mContext).startActivity(captor.capture());
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(captor.capture());
-
final Intent intent = captor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
assertThat(intent.getData()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
index 7a097e7..7681f44 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.network.telephony;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -40,6 +41,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowTelephonyManager;
import org.robolectric.util.ReflectionHelpers;
@@ -58,7 +60,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
+ mContext = spy(RuntimeEnvironment.application);
final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(telephonyManager);
@@ -91,9 +93,10 @@
@Test
public void handlePreferenceTreeClick_needDialog_showDialog() {
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mContext).startActivity(captor.capture());
+
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(captor.capture());
final Intent intent = captor.getValue();
assertThat(intent.getAction()).isEqualTo(Settings.ACTION_MOBILE_DATA_USAGE);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
index 7fbddb4..e4cf303 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -38,6 +38,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class EuiccPreferenceControllerTest {
@@ -46,6 +47,9 @@
@Mock
private TelephonyManager mTelephonyManager;
+ @Mock
+ private Activity mActivity;
+
private EuiccPreferenceController mController;
private Preference mPreference;
private Context mContext;
@@ -54,12 +58,12 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(Robolectric.setupActivity(Activity.class));
- doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mActivity).getSystemService(Context.TELEPHONY_SERVICE);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
mPreference = new Preference(mContext);
- mController = new EuiccPreferenceController(mContext, "euicc");
+ mController = new EuiccPreferenceController(mActivity, "euicc");
mController.init(SUB_ID);
mPreference.setKey(mController.getPreferenceKey());
}
@@ -70,7 +74,7 @@
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(captor.capture());
+ verify(mActivity).startActivity(captor.capture());
assertThat(captor.getValue().getAction()).isEqualTo(
EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
index 43897d5..59fd510 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
@@ -164,7 +164,7 @@
@Test
public void phoneChangeReceiver_ignoresStickyBroadcastFromBeforeRegistering() {
- Activity activity = Robolectric.setupActivity(Activity.class);
+ Context activity = mContext;
MobileNetworkActivity.PhoneChangeReceiver.Client client = mock(
MobileNetworkActivity.PhoneChangeReceiver.Client.class);
MobileNetworkActivity.PhoneChangeReceiver receiver =
@@ -181,7 +181,7 @@
@Test
public void phoneChangeReceiver_ignoresCarrierConfigChangeForWrongSubscriptionId() {
- Activity activity = Robolectric.setupActivity(Activity.class);
+ Context activity = mContext;
MobileNetworkActivity.PhoneChangeReceiver.Client client = mock(
MobileNetworkActivity.PhoneChangeReceiver.Client.class);
@@ -200,7 +200,7 @@
@Test
public void phoneChangeReceiver_dispatchesCarrierConfigChangeForCorrectSubscriptionId() {
- Activity activity = Robolectric.setupActivity(Activity.class);
+ Context activity = mContext;
MobileNetworkActivity.PhoneChangeReceiver.Client client = mock(
MobileNetworkActivity.PhoneChangeReceiver.Client.class);
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..83fe07a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationPreferenceControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2019 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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.testutils.shadow.ShadowNotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNotificationBackend.class)
+public class ConfigureNotificationPreferenceControllerTest {
+
+ private ConfigureNotificationPreferenceController mController;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new ConfigureNotificationPreferenceController(mContext, "key");
+ }
+
+ @Test
+ public void getSummary_noBlockedApps() {
+ ShadowNotificationBackend.setBlockedAppCount(0);
+
+ assertThat(mController.getSummary().toString()).contains("On");
+ }
+
+ @Test
+ public void getSummary_someBlockedApps() {
+ ShadowNotificationBackend.setBlockedAppCount(5);
+
+ assertThat(mController.getSummary().toString()).contains("Off");
+ assertThat(mController.getSummary().toString()).contains("5");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
deleted file mode 100644
index 523b496..0000000
--- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 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.notification;
-
-import static com.android.settings.notification.ConfigureNotificationSettings.SUMMARY_PROVIDER_FACTORY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.notification.ConfigureNotificationSettings.SummaryProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConfigureNotificationSettingsTest {
-
- private Activity mActivity;
-
- @Before
- public void setUp() {
- mActivity = spy(Robolectric.buildActivity(Activity.class).get());
- }
-
- @Test
- public void getSummary_noneBlocked() {
- SummaryLoader loader = mock(SummaryLoader.class);
- NotificationBackend backend = mock(NotificationBackend.class);
- when(backend.getBlockedAppCount()).thenReturn(0);
- SummaryProvider provider =
- (SummaryProvider) SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
- provider.setBackend(backend);
-
- provider.setListening(true);
-
- ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);
- verify(loader).setSummary(any(), captor.capture());
-
- assertThat(captor.getValue().toString()).contains("On");
- }
-
- @Test
- public void getSummary_someBlocked() {
- SummaryLoader loader = mock(SummaryLoader.class);
- NotificationBackend backend = mock(NotificationBackend.class);
- when(backend.getBlockedAppCount()).thenReturn(5);
- SummaryProvider provider =
- (SummaryProvider) SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
- provider.setBackend(backend);
-
- provider.setListening(true);
-
- ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);
- verify(loader).setSummary(any(), captor.capture());
-
- assertThat(captor.getValue().toString()).contains("Off");
- assertThat(captor.getValue().toString()).contains("5");
- }
-}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java b/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java
new file mode 100644
index 0000000..1d3d710
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SlicePreferenceTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2019 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.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.net.Uri;
+import android.view.View;
+
+import androidx.slice.Slice;
+import androidx.slice.widget.SliceView;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class SlicePreferenceTest {
+
+ private SlicePreference mSlicePreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ mSlicePreference = new SlicePreference(mContext, Robolectric.buildAttributeSet()
+ .setStyleAttribute("@style/SlicePreference")
+ .build());
+ }
+
+ @Test
+ public void onSliceUpdated_null_hideSliceView() {
+ final SliceView sliceView = mSlicePreference.findViewById(R.id.slice_view);
+
+ mSlicePreference.onSliceUpdated(null);
+
+ assertThat(sliceView.getVisibility()).isEqualTo(View.GONE);
+ }
+
+ @Test
+ public void onSliceUpdated_notNull_showSliceView() {
+ final SliceView sliceView = mSlicePreference.findViewById(R.id.slice_view);
+
+ mSlicePreference.onSliceUpdated(new Slice.Builder(Uri.parse("uri")).build());
+
+ assertThat(sliceView.getVisibility()).isEqualTo(View.VISIBLE);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationBackend.java
new file mode 100644
index 0000000..4e6cbde
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationBackend.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 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.testutils.shadow;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(NotificationBackend.class)
+public class ShadowNotificationBackend {
+
+ private static int sBlockAppCount;
+
+ @Implementation
+ protected int getBlockedAppCount() {
+ return sBlockAppCount;
+ }
+
+ public static void setBlockedAppCount(int blockAppCount) {
+ sBlockAppCount = blockAppCount;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 1a98238..5853308 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -32,7 +32,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.SharedPreferences;
-import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.os.UserManager;
@@ -49,8 +48,6 @@
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.RestrictedPreference;
@@ -86,14 +83,11 @@
private UserPreference mMePreference;
@Mock
private UserManager mUserManager;
- @Mock
- private SummaryLoader mSummaryLoader;
private FragmentActivity mActivity;
private Context mContext;
private UserSettings mFragment;
private UserCapabilities mUserCapabilities;
- private SummaryLoader.SummaryProvider mSummaryProvider;
@Before
public void setUp() {
@@ -123,9 +117,6 @@
final SharedPreferences prefs = mock(SharedPreferences .class);
when(mMockPreferenceManager.getSharedPreferences()).thenReturn(prefs);
when(mMockPreferenceManager.getContext()).thenReturn(mContext);
-
- mSummaryProvider =
- UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
}
@After
@@ -135,19 +126,6 @@
}
@Test
- public void setListening_shouldSetSummaryWithUserName() {
- final String name = "John";
- final UserInfo userInfo = new UserInfo();
- userInfo.name = name;
- when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
-
- mSummaryProvider.setListening(true);
-
- verify(mSummaryLoader)
- .setSummary(mSummaryProvider, mActivity.getString(R.string.users_summary, name));
- }
-
- @Test
public void testAssignDefaultPhoto_ContextNull_ReturnFalseAndNotCrash() {
// Should not crash here
assertThat(UserSettings.assignDefaultPhoto(null, 0)).isFalse();
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java
new file mode 100644
index 0000000..c90b19b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplayPreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2019 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.wfd;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.media.MediaRouter;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiDisplayPreferenceControllerTest {
+ private Context mContext;
+ private WifiDisplayPreferenceController mWifiDisplayPreferenceController;
+ @Mock
+ private MediaRouter mMediaRouter;
+ @Mock
+ private PackageManager mPackageManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(Context.MEDIA_ROUTER_SERVICE)).thenReturn(mMediaRouter);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
+ mWifiDisplayPreferenceController = new WifiDisplayPreferenceController(mContext, "key");
+ }
+
+ @Test
+ public void getSummary_disconnected_shouldProvideDisconnectedSummary() {
+ assertThat(mWifiDisplayPreferenceController.getSummary().toString()).contains(
+ mContext.getString(R.string.disconnected));
+ }
+
+ @Test
+ public void getSummary_connected_shouldProvideConnectedSummary() {
+ final MediaRouter.RouteInfo route = mock(MediaRouter.RouteInfo.class);
+ when(mMediaRouter.getRouteCount()).thenReturn(1);
+ when(mMediaRouter.getRouteAt(0)).thenReturn(route);
+ when(route.matchesTypes(anyInt())).thenReturn(true);
+ when(route.isSelected()).thenReturn(true);
+ when(route.isConnecting()).thenReturn(false);
+
+ assertThat(mWifiDisplayPreferenceController.getSummary().toString()).contains(
+ mContext.getString(R.string.wifi_display_status_connected));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index a76a1df..1f4fef6 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -19,8 +19,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
@@ -30,9 +28,6 @@
import android.media.MediaRouter;
import android.net.wifi.p2p.WifiP2pManager;
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,45 +41,16 @@
@Mock
private Activity mActivity;
@Mock
- private SummaryLoader mSummaryLoader;
- @Mock
private MediaRouter mMediaRouter;
@Mock
private PackageManager mPackageManager;
- private SummaryLoader.SummaryProvider mSummaryProvider;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE)).thenReturn(mMediaRouter);
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
-
- mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(mActivity, mSummaryLoader);
- }
-
- @Test
- public void listenToSummary_disconnected_shouldProvideDisconnectedSummary() {
- mSummaryProvider.setListening(true);
-
- verify(mActivity).getString(R.string.disconnected);
- verify(mActivity, never()).getString(R.string.wifi_display_status_connected);
- }
-
- @Test
- public void listenToSummary_connected_shouldProvideConnectedSummary() {
- final MediaRouter.RouteInfo route = mock(MediaRouter.RouteInfo.class);
- when(mMediaRouter.getRouteCount()).thenReturn(1);
- when(mMediaRouter.getRouteAt(0)).thenReturn(route);
- when(route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)).thenReturn(true);
- when(route.isSelected()).thenReturn(true);
- when(route.isConnecting()).thenReturn(false);
-
- mSummaryProvider.setListening(true);
-
- verify(mActivity).getString(R.string.wifi_display_status_connected);
}
@Test
diff --git a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
index 24d1bcc..6891441 100644
--- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -431,7 +431,7 @@
responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
context.sendBroadcast(
- responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);
+ responseIntent, android.Manifest.permission.TETHER_PRIVILEGED);
}
}