Merge "Preliminary classification for homepage IA grouping"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 189e1b6..0c4183d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -422,7 +422,7 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.network.ApnSettings" />
+ android:value="com.android.settings.network.apn.ApnSettings" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -2003,7 +2003,7 @@
<data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.network.ApnEditor" />
+ android:value="com.android.settings.network.apn.ApnEditor" />
</activity>
<activity
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 0c9374f..3f1b3d3 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -64,4 +64,15 @@
android:layout_marginStart="4dp"/>
</LinearLayout>
+ <TextView
+ android:id="@+id/bt_battery_prediction"
+ style="@style/TextAppearance.EntityHeaderSummary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:visibility="gone"/>
+
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
deleted file mode 100644
index 2bd464b..0000000
--- a/res/layout/edit_user_info_dialog_content.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- Copyright (C) 2013 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.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:baselineAligned="false"
- android:padding="16dip">
-
- <ImageView
- android:id="@+id/user_photo"
- android:layout_width="56dip"
- android:layout_height="56dip"
- android:layout_gravity="bottom"
- android:contentDescription="@string/user_image_photo_selector"
- android:background="@*android:drawable/spinner_background_holo_dark"
- android:scaleType="fitCenter"/>
-
- <EditText
- android:id="@+id/user_name"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:layout_weight="1"
- android:layout_marginStart="6dp"
- android:minHeight="@dimen/min_tap_target_size"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textAlignment="viewStart"
- android:inputType="text|textCapWords"
- android:selectAllOnFocus="true"
- android:hint="@string/user_nickname"
- android:maxLength="100"/>
-
-</LinearLayout>
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
deleted file mode 100644
index 636e3f9..0000000
--- a/res/layout/restricted_popup_menu_item.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:gravity="center_vertical"
- android:paddingStart="16dip"
- android:paddingEnd="16dip">
- <TextView
- android:id="@+id/text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="?android:attr/textColorAlertDialogListItem"
- android:textAppearance="?android:attr/textAppearanceListItemSmall"
- android:ellipsize="marquee"
- android:layout_alignParentLeft="true" />
- <ImageView
- android:id="@+id/restricted_icon"
- android:layout_width="@*android:dimen/config_restrictedIconSize"
- android:layout_height="@*android:dimen/config_restrictedIconSize"
- android:scaleType="centerInside"
- android:tint="?android:attr/colorAccent"
- android:src="@*android:drawable/ic_info"
- android:layout_alignParentRight="true"
- android:visibility="gone" />
-</RelativeLayout>
diff --git a/res/values/config.xml b/res/values/config.xml
index 3c58a06..72fbdf2 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -467,4 +467,7 @@
<!-- Whether to show the Preference for Adaptive connectivity -->
<bool name="config_show_adaptive_connectivity">false</bool>
+
+ <!-- Authority of advanced device battery prediction -->
+ <string name="config_battery_prediction_authority" translatable="false"></string>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 799aa22..a561df2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,9 +51,6 @@
<dimen name="pager_tabs_title_padding">16dp</dimen>
<dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
- <!-- Minimum width for the popup for updating a user's photo. -->
- <dimen name="update_user_photo_popup_min_width">300dip</dimen>
-
<dimen name="captioning_preview_height">200dp</dimen>
<dimen name="autoclick_preview_height">200dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c3d5256..f6c69d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6990,8 +6990,6 @@
<string name="user_admin">Admin</string>
<!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
<string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
- <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
- <string name="user_nickname">Nickname</string>
<!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
<string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string>
@@ -7429,13 +7427,6 @@
<!-- Wizard finish button label [CHAR LIMIT=25] -->
<string name="wizard_finish">Finish</string>
- <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] -->
- <string name="user_image_take_photo" msgid="7496128293167402354">Take a photo</string>
- <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] -->
- <string name="user_image_choose_photo" msgid="3746334626214970837">Choose an image</string>
- <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
- <string name="user_image_photo_selector">Select photo</string>
-
<!-- Text to display in regulatory info screen (from device overlay). -->
<string name="regulatory_info_text"></string>
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 53fe369..97139c4 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -49,7 +49,7 @@
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 71c016f..a7e0eec 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -18,10 +18,6 @@
import static android.content.Intent.EXTRA_USER;
import static android.content.Intent.EXTRA_USER_ID;
-import static android.media.MediaRoute2Info.TYPE_GROUP;
-import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER;
-import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;
-import static android.media.MediaRoute2Info.TYPE_UNKNOWN;
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
@@ -57,8 +53,6 @@
import android.graphics.drawable.VectorDrawable;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
-import android.media.MediaRoute2Info;
-import android.media.MediaRouter2Manager;
import android.net.ConnectivityManager;
import android.net.LinkProperties;
import android.net.Network;
@@ -1143,31 +1137,4 @@
drawable.draw(canvas);
return roundedBitmap;
}
-
- /**
- * Returns {@code true} if needed to disable media output, otherwise returns {@code false}.
- */
- public static boolean isMediaOutputDisabled(
- MediaRouter2Manager router2Manager, String packageName) {
- boolean isMediaOutputDisabled = false;
- if (!TextUtils.isEmpty(packageName)) {
- final List<MediaRoute2Info> infos = router2Manager.getAvailableRoutes(packageName);
- if (infos.size() == 1) {
- final MediaRoute2Info info = infos.get(0);
- final int deviceType = info.getType();
- switch (deviceType) {
- case TYPE_UNKNOWN:
- case TYPE_REMOTE_TV:
- case TYPE_REMOTE_SPEAKER:
- case TYPE_GROUP:
- isMediaOutputDisabled = true;
- break;
- default:
- isMediaOutputDisabled = false;
- break;
- }
- }
- }
- return isMediaOutputDisabled;
- }
}
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 64bb201..81db4df 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -247,7 +247,8 @@
identityIntent.setAction(SHOULD_NOT_RESOLVE);
identityIntent.addCategory(SHOULD_NOT_RESOLVE);
- mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent, 0);
+ mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent,
+ PendingIntent.FLAG_IMMUTABLE);
addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
AccountManager.get(this).addAccountAsUser(
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 052b3f0..3782039 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -670,7 +670,9 @@
mRemovalSidecar.startRemove(fingerPrint, mUserId);
String name = genKey(fingerPrint.getBiometricId());
Preference prefToRemove = findPreference(name);
- prefToRemove.setEnabled(false);
+ if (prefToRemove != null) {
+ prefToRemove.setEnabled(false);
+ }
updateAddPreference();
}
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index a147656..1ab3a65 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -18,8 +18,10 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
+import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
@@ -49,12 +51,14 @@
import com.android.settingslib.core.lifecycle.events.OnDestroy;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.LayoutPreference;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* This class adds a header with device name and status (connected/disconnected, etc.).
@@ -64,7 +68,22 @@
private static final String TAG = "AdvancedBtHeaderCtrl";
private static final int LOW_BATTERY_LEVEL = 15;
private static final int CASE_LOW_BATTERY_LEVEL = 19;
- private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+ private static final String PATH = "time_remaining";
+ private static final String QUERY_PARAMETER_ADDRESS = "address";
+ private static final String QUERY_PARAMETER_BATTERY_ID = "battery_id";
+ private static final String QUERY_PARAMETER_BATTERY_LEVEL = "battery_level";
+ private static final String QUERY_PARAMETER_TIMESTAMP = "timestamp";
+ private static final String BATTERY_ESTIMATE = "battery_estimate";
+ private static final String ESTIMATE_READY = "estimate_ready";
+ private static final String DATABASE_ID = "id";
+ private static final String DATABASE_BLUETOOTH = "Bluetooth";
+ private static final long TIME_OF_HOUR = TimeUnit.SECONDS.toMillis(3600);
+ private static final long TIME_OF_MINUTE = TimeUnit.SECONDS.toMillis(60);
+ private static final int LEFT_DEVICE_ID = 1;
+ private static final int RIGHT_DEVICE_ID = 2;
+ private static final int CASE_DEVICE_ID = 3;
@VisibleForTesting
LayoutPreference mLayoutPreference;
@@ -168,19 +187,22 @@
BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,
BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING,
- R.string.bluetooth_left_name);
+ R.string.bluetooth_left_name,
+ LEFT_DEVICE_ID);
updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
BluetoothDevice.METADATA_UNTETHERED_CASE_ICON,
BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY,
BluetoothDevice.METADATA_UNTETHERED_CASE_CHARGING,
- R.string.bluetooth_middle_name);
+ R.string.bluetooth_middle_name,
+ CASE_DEVICE_ID);
updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
BluetoothDevice.METADATA_UNTETHERED_RIGHT_ICON,
BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY,
BluetoothDevice.METADATA_UNTETHERED_RIGHT_CHARGING,
- R.string.bluetooth_right_name);
+ R.string.bluetooth_right_name,
+ RIGHT_DEVICE_ID);
}
}
@@ -204,7 +226,7 @@
}
private void updateSubLayout(LinearLayout linearLayout, int iconMetaKey, int batteryMetaKey,
- int chargeMetaKey, int titleResId) {
+ int chargeMetaKey, int titleResId, int batteryId) {
if (linearLayout == null) {
return;
}
@@ -217,11 +239,15 @@
final int batteryLevel = BluetoothUtils.getIntMetaData(bluetoothDevice, batteryMetaKey);
final boolean charging = BluetoothUtils.getBooleanMetaData(bluetoothDevice, chargeMetaKey);
- if (DBG) {
+ if (DEBUG) {
Log.d(TAG, "updateSubLayout() icon : " + iconMetaKey + ", battery : " + batteryMetaKey
+ ", charge : " + chargeMetaKey + ", batteryLevel : " + batteryLevel
+ ", charging : " + charging + ", iconUri : " + iconUri);
}
+
+ if (batteryId != CASE_DEVICE_ID) {
+ showBatteryPredictionIfNecessary(linearLayout, batteryId, batteryLevel);
+ }
if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
linearLayout.setVisibility(View.VISIBLE);
final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
@@ -238,6 +264,64 @@
textView.setVisibility(View.VISIBLE);
}
+ private void showBatteryPredictionIfNecessary(LinearLayout linearLayout, int batteryId,
+ int batteryLevel) {
+ ThreadUtils.postOnBackgroundThread(() -> {
+ final Uri contentUri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(mContext.getString(R.string.config_battery_prediction_authority))
+ .appendPath(PATH)
+ .appendPath(DATABASE_ID)
+ .appendPath(DATABASE_BLUETOOTH)
+ .appendQueryParameter(QUERY_PARAMETER_ADDRESS, mCachedDevice.getAddress())
+ .appendQueryParameter(QUERY_PARAMETER_BATTERY_ID, String.valueOf(batteryId))
+ .appendQueryParameter(QUERY_PARAMETER_BATTERY_LEVEL,
+ String.valueOf(batteryLevel))
+ .appendQueryParameter(QUERY_PARAMETER_TIMESTAMP,
+ String.valueOf(System.currentTimeMillis()))
+ .build();
+
+ final String[] columns = new String[] {BATTERY_ESTIMATE, ESTIMATE_READY};
+ final Cursor cursor =
+ mContext.getContentResolver().query(contentUri, columns, null, null, null);
+ if (cursor == null) {
+ Log.w(TAG, "showBatteryPredictionIfNecessary() cursor is null!");
+ return;
+ }
+ try {
+ for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+ final int estimateReady =
+ cursor.getInt(cursor.getColumnIndex(ESTIMATE_READY));
+ final long batteryEstimate =
+ cursor.getLong(cursor.getColumnIndex(BATTERY_ESTIMATE));
+ if (DEBUG) {
+ Log.d(TAG, "showBatteryTimeIfNecessary() batteryId : " + batteryId
+ + ", ESTIMATE_READY : " + estimateReady
+ + ", BATTERY_ESTIMATE : " + batteryEstimate);
+ }
+ showBatteryPredictionIfNecessary(estimateReady, batteryEstimate,
+ linearLayout);
+ }
+ } finally {
+ cursor.close();
+ }
+ });
+ }
+
+ @VisibleForTesting
+ void showBatteryPredictionIfNecessary(int estimateReady, long batteryEstimate,
+ LinearLayout linearLayout) {
+ ThreadUtils.postOnMainThread(() -> {
+ final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+ if (estimateReady == 1) {
+ textView.setVisibility(View.VISIBLE);
+ textView.setText(StringUtil.formatElapsedTime(mContext, batteryEstimate, false));
+ } else {
+ textView.setVisibility(View.GONE);
+ }
+ });
+ }
+
private void showBatteryIcon(LinearLayout linearLayout, int level, boolean charging,
int batteryMetaKey) {
final int lowBatteryLevel =
@@ -279,7 +363,7 @@
final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
final String iconUri = BluetoothUtils.getStringMetaData(bluetoothDevice,
BluetoothDevice.METADATA_MAIN_ICON);
- if (DBG) {
+ if (DEBUG) {
Log.d(TAG, "updateDisconnectLayout() iconUri : " + iconUri);
}
if (iconUri != null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 5a4ee1f..67c3650 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -129,13 +129,13 @@
private static PendingIntent getPrimaryAction(Context context) {
final Intent intent = getIntent(context);
return PendingIntent.getActivity(context, 0 /* requestCode */,
- intent, 0 /* flags */);
+ intent, PendingIntent.FLAG_IMMUTABLE);
}
private static PendingIntent getBroadcastIntent(Context context) {
final Intent intent = new Intent(ACTION_BLUETOOTH_SLICE_CHANGED)
.setClass(context, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_UPDATE_CURRENT);
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 4a5d71a..8934034 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -108,11 +108,11 @@
import com.android.settings.localepicker.LocaleListEditor;
import com.android.settings.location.LocationSettings;
import com.android.settings.location.ScanningSettings;
-import com.android.settings.network.ApnEditor;
-import com.android.settings.network.ApnSettings;
import com.android.settings.network.MobileNetworkListFragment;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.network.apn.ApnEditor;
+import com.android.settings.network.apn.ApnSettings;
import com.android.settings.nfc.AndroidBeam;
import com.android.settings.nfc.PaymentSettings;
import com.android.settings.notification.ConfigureNotificationSettings;
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
index d99d01e..6a5b300 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
@@ -163,7 +163,8 @@
private PendingIntent getPrimaryAction() {
final Intent intent = getIntent();
- return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_IMMUTABLE);
}
private Slice buildBatteryGoodSlice(ListBuilder sliceBuilder, boolean isError) {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
index 2bc09e9..576b435 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
@@ -116,8 +116,8 @@
private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) {
final SliceAction primarySliceAction = SliceAction.createDeeplink(
- PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon,
- ListBuilder.ICON_IMAGE, title);
+ PendingIntent.getActivity(mContext, 0, getIntent(), PendingIntent.FLAG_IMMUTABLE),
+ icon, ListBuilder.ICON_IMAGE, title);
return new RowBuilder()
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java
index 2759690..f8add12 100644
--- a/src/com/android/settings/location/LocationSlice.java
+++ b/src/com/android/settings/location/LocationSlice.java
@@ -96,6 +96,6 @@
private PendingIntent getPrimaryAction() {
final Intent intent = getIntent();
return PendingIntent.getActivity(mContext, 0 /* requestCode */,
- intent, 0 /* flags */);
+ intent, PendingIntent.FLAG_IMMUTABLE);
}
}
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index 1288cf5..a5dec14 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -247,6 +247,10 @@
}
+ boolean shouldDisableMediaOutput(String packageName) {
+ return mLocalMediaManager.shouldDisableMediaOutput(packageName);
+ }
+
private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 4198269..9ed6f4e 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -122,7 +122,7 @@
.setValue(info.getVolume()));
final boolean isMediaOutputDisabled =
- Utils.isMediaOutputDisabled(mRouterManager, info.getClientPackageName());
+ getWorker().shouldDisableMediaOutput(info.getClientPackageName());
final SpannableString spannableTitle = new SpannableString(
TextUtils.isEmpty(appName) ? "" : appName);
spannableTitle.setSpan(new ForegroundColorSpan(
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
similarity index 97%
rename from src/com/android/settings/network/ApnEditor.java
rename to src/com/android/settings/network/apn/ApnEditor.java
index a852fd6..8f6d64d 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.network;
+package com.android.settings.network.apn;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
@@ -53,6 +53,7 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.ProxySubscriptionManager;
import com.android.settingslib.utils.ThreadUtils;
import java.util.Arrays;
@@ -61,20 +62,21 @@
import java.util.Objects;
import java.util.Set;
+/** Use to edit apn settings. */
public class ApnEditor extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, OnKeyListener {
- private final static String TAG = ApnEditor.class.getSimpleName();
- private final static boolean VDBG = false; // STOPSHIP if true
+ private static final String TAG = ApnEditor.class.getSimpleName();
+ private static final boolean VDBG = false; // STOPSHIP if true
- private final static String KEY_AUTH_TYPE = "auth_type";
+ private static final String KEY_AUTH_TYPE = "auth_type";
private static final String KEY_APN_TYPE = "apn_type";
- private final static String KEY_PROTOCOL = "apn_protocol";
- private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
- private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
- private final static String KEY_BEARER_MULTI = "bearer_multi";
- private final static String KEY_MVNO_TYPE = "mvno_type";
- private final static String KEY_PASSWORD = "apn_password";
+ private static final String KEY_PROTOCOL = "apn_protocol";
+ private static final String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
+ private static final String KEY_CARRIER_ENABLED = "carrier_enabled";
+ private static final String KEY_BEARER_MULTI = "bearer_multi";
+ private static final String KEY_MVNO_TYPE = "mvno_type";
+ private static final String KEY_PASSWORD = "apn_password";
private static final int MENU_DELETE = Menu.FIRST;
private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -213,7 +215,7 @@
Telephony.Carriers.MCC, // 9
Telephony.Carriers.MNC, // 10
Telephony.Carriers.NUMERIC, // 11
- Telephony.Carriers.MMSPROXY,// 12
+ Telephony.Carriers.MMSPROXY, // 12
Telephony.Carriers.MMSPORT, // 13
Telephony.Carriers.AUTH_TYPE, // 14
Telephony.Carriers.TYPE, // 15
@@ -583,7 +585,7 @@
}
}
- if (mBearerInitialVal != 0 && bearers.contains("" + mBearerInitialVal) == false) {
+ if (mBearerInitialVal != 0 && !bearers.contains("" + mBearerInitialVal)) {
// add mBearerInitialVal to bearers
bearers.add("" + mBearerInitialVal);
}
@@ -699,7 +701,7 @@
&& Arrays.asList(mReadOnlyApnFields)
.contains(Telephony.Carriers.MVNO_MATCH_DATA));
mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
- if (newValue != null && newValue.equals(oldValue) == false) {
+ if (newValue != null && !newValue.equals(oldValue)) {
if (values[mvnoIndex].equals("SPN")) {
TelephonyManager telephonyManager = (TelephonyManager)
getContext().getSystemService(TelephonyManager.class);
@@ -739,7 +741,9 @@
}
}
}
-
+ /**
+ * Callback when preference status changed.
+ */
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
if (KEY_AUTH_TYPE.equals(key)) {
@@ -1342,8 +1346,13 @@
}
}
+ /**
+ * Dialog of error message.
+ */
public static class ErrorDialog extends InstrumentedDialogFragment {
-
+ /**
+ * Show error dialog.
+ */
public static void showError(ApnEditor editor) {
final ErrorDialog dialog = new ErrorDialog();
dialog.setTargetFragment(editor, 0);
diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/apn/ApnPreference.java
similarity index 82%
rename from src/com/android/settings/network/ApnPreference.java
rename to src/com/android/settings/network/apn/ApnPreference.java
index 63e2838..f277db0 100755
--- a/src/com/android/settings/network/ApnPreference.java
+++ b/src/com/android/settings/network/apn/ApnPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.network;
+package com.android.settings.network.apn;
import android.content.ContentUris;
import android.content.Context;
@@ -40,7 +40,7 @@
*/
public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener,
View.OnClickListener {
- final static String TAG = "ApnPreference";
+ private static final String TAG = "ApnPreference";
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -65,8 +65,8 @@
this(context, null);
}
- private static String mSelectedKey = null;
- private static CompoundButton mCurrentChecked = null;
+ private static String sSelectedKey = null;
+ private static CompoundButton sCurrentChecked = null;
private boolean mProtectFromCheckedChange = false;
private boolean mSelectable = true;
private boolean mHideDetails = false;
@@ -84,10 +84,10 @@
if (mSelectable) {
rb.setOnCheckedChangeListener(this);
- final boolean isChecked = getKey().equals(mSelectedKey);
+ final boolean isChecked = getKey().equals(sSelectedKey);
if (isChecked) {
- mCurrentChecked = rb;
- mSelectedKey = getKey();
+ sCurrentChecked = rb;
+ sSelectedKey = getKey();
}
mProtectFromCheckedChange = true;
@@ -100,14 +100,23 @@
}
}
+ /**
+ * Return the preference is checked or not.
+ */
public boolean isChecked() {
- return getKey().equals(mSelectedKey);
+ return getKey().equals(sSelectedKey);
}
+ /**
+ * Set preference checked.
+ */
public void setChecked() {
- mSelectedKey = getKey();
+ sSelectedKey = getKey();
}
+ /**
+ * Change the preference status.
+ */
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Log.i(TAG, "ID: " + getKey() + " :" + isChecked);
if (mProtectFromCheckedChange) {
@@ -115,15 +124,15 @@
}
if (isChecked) {
- if (mCurrentChecked != null) {
- mCurrentChecked.setChecked(false);
+ if (sCurrentChecked != null) {
+ sCurrentChecked.setChecked(false);
}
- mCurrentChecked = buttonView;
- mSelectedKey = getKey();
- callChangeListener(mSelectedKey);
+ sCurrentChecked = buttonView;
+ sSelectedKey = getKey();
+ callChangeListener(sSelectedKey);
} else {
- mCurrentChecked = null;
- mSelectedKey = null;
+ sCurrentChecked = null;
+ sSelectedKey = null;
}
}
@@ -161,6 +170,9 @@
mSubId = subId;
}
+ /**
+ * Hide details
+ */
public void setHideDetails() {
mHideDetails = true;
}
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
similarity index 96%
rename from src/com/android/settings/network/ApnSettings.java
rename to src/com/android/settings/network/apn/ApnSettings.java
index f7617fc..f5bb1be 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.network;
+package com.android.settings.network.apn;
import android.app.Activity;
import android.app.Dialog;
@@ -56,19 +56,21 @@
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.util.ArrayList;
+/** Handle each different apn setting. */
public class ApnSettings extends RestrictedSettingsFragment
implements Preference.OnPreferenceChangeListener {
static final String TAG = "ApnSettings";
public static final String EXTRA_POSITION = "position";
public static final String RESTORE_CARRIERS_URI =
- "content://telephony/carriers/restore";
+ "content://telephony/carriers/restore";
public static final String PREFERRED_APN_URI =
- "content://telephony/carriers/preferapn";
+ "content://telephony/carriers/preferapn";
public static final String APN_ID = "apn_id";
public static final String SUB_ID = "sub_id";
@@ -104,7 +106,7 @@
private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
private static final Uri PREFERAPN_URI = Uri.parse(PREFERRED_APN_URI);
- private static boolean mRestoreDefaultApnMode;
+ private boolean mRestoreDefaultApnMode;
private UserManager mUserManager;
private TelephonyManager mTelephonyManager;
@@ -385,13 +387,12 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case MENU_NEW:
- addNewApn();
- return true;
-
- case MENU_RESTORE:
- restoreDefaultApn();
- return true;
+ case MENU_NEW:
+ addNewApn();
+ return true;
+ case MENU_RESTORE:
+ restoreDefaultApn();
+ return true;
}
return super.onOptionsItemSelected(item);
}
@@ -451,8 +452,7 @@
mRestoreApnUiHandler = new RestoreApnUiHandler();
}
- if (mRestoreApnProcessHandler == null ||
- mRestoreDefaultApnThread == null) {
+ if (mRestoreApnProcessHandler == null || mRestoreDefaultApnThread == null) {
mRestoreDefaultApnThread = new HandlerThread(
"Restore default APN Handler: Process Thread");
mRestoreDefaultApnThread.start();
@@ -503,7 +503,7 @@
private class RestoreApnProcessHandler extends Handler {
private Handler mRestoreApnUiHandler;
- public RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
+ RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
super(looper);
this.mRestoreApnUiHandler = restoreApnUiHandler;
}
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index 8442de2..0e0e5d1 100644
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -32,7 +32,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.SettingsActivity;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java
index bb62a56..320862c 100644
--- a/src/com/android/settings/notification/RemoteVolumeGroupController.java
+++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java
@@ -131,8 +131,8 @@
seekBarPreference.setIcon(R.drawable.ic_volume_remote);
mPreferenceCategory.addPreference(seekBarPreference);
// Add output indicator
- final boolean isMediaOutputDisabled = Utils.isMediaOutputDisabled(
- mRouterManager, info.getClientPackageName());
+ final boolean isMediaOutputDisabled = mLocalMediaManager.shouldDisableMediaOutput(
+ info.getClientPackageName());
final Preference preference = new Preference(mContext);
preference.setKey(SWITCHER_PREFIX + info.getId());
preference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index c9a203e..14c9117 100644
--- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -142,13 +142,14 @@
private static PendingIntent getPrimaryAction(Context context) {
final Intent intent = getIntent(context);
- return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+ return PendingIntent.getActivity(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_IMMUTABLE);
}
private static PendingIntent getBroadcastIntent(Context context) {
final Intent intent = new Intent(ACTION_ZEN_MODE_SLICE_CHANGED)
.setClass(context, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_CANCEL_CURRENT);
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
}
diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java
index 92c604e..57475a9 100644
--- a/src/com/android/settings/slices/CustomSliceable.java
+++ b/src/com/android/settings/slices/CustomSliceable.java
@@ -95,7 +95,7 @@
.setData(getUri())
.setClass(context, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_UPDATE_CURRENT);
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
@Override
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 552927e..6e14a3f 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -159,7 +159,7 @@
.setClass(context, SliceBroadcastReceiver.class)
.putExtra(EXTRA_SLICE_KEY, data.getKey());
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_UPDATE_CURRENT);
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
/**
@@ -167,7 +167,8 @@
*/
public static PendingIntent getContentPendingIntent(Context context, SliceData sliceData) {
final Intent intent = getContentIntent(context, sliceData);
- return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+ return PendingIntent.getActivity(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_IMMUTABLE);
}
/**
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
deleted file mode 100644
index 6b5e670..0000000
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2013 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.users;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import java.io.File;
-
-/**
- * This class encapsulates a Dialog for editing the user nickname and photo.
- */
-public class EditUserInfoController {
-
- private static final String KEY_AWAITING_RESULT = "awaiting_result";
- private static final String KEY_SAVED_PHOTO = "pending_photo";
-
- private Dialog mEditUserInfoDialog;
- private Bitmap mSavedPhoto;
- private EditUserPhotoController mEditUserPhotoController;
- private UserHandle mUser;
- private UserManager mUserManager;
- private boolean mWaitingForActivityResult = false;
-
- /**
- * Callback made when either the username text or photo choice changes.
- */
- public interface OnContentChangedCallback {
- /** Photo updated. */
- void onPhotoChanged(UserHandle user, Drawable photo);
- /** Username updated. */
- void onLabelChanged(UserHandle user, CharSequence label);
- }
-
- /**
- * Callback made when the dialog finishes.
- */
- public interface OnDialogCompleteCallback {
- /** Dialog closed with positive button. */
- void onPositive();
- /** Dialog closed with negative button or cancelled. */
- void onNegativeOrCancel();
- }
-
- public void clear() {
- if (mEditUserPhotoController != null) {
- mEditUserPhotoController.removeNewUserPhotoBitmapFile();
- }
- mEditUserInfoDialog = null;
- mSavedPhoto = null;
- }
-
- public Dialog getDialog() {
- return mEditUserInfoDialog;
- }
-
- public void onRestoreInstanceState(Bundle icicle) {
- String pendingPhoto = icicle.getString(KEY_SAVED_PHOTO);
- if (pendingPhoto != null) {
- mSavedPhoto = EditUserPhotoController.loadNewUserPhotoBitmap(new File(pendingPhoto));
- }
- mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
- }
-
- public void onSaveInstanceState(Bundle outState) {
- if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
- // Bitmap cannot be stored into bundle because it may exceed parcel limit
- // Store it in a temporary file instead
- File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
- if (file != null) {
- outState.putString(KEY_SAVED_PHOTO, file.getPath());
- }
- }
- if (mWaitingForActivityResult) {
- outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
- }
- }
-
- public void startingActivityForResult() {
- mWaitingForActivityResult = true;
- }
-
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- mWaitingForActivityResult = false;
-
- if (mEditUserPhotoController != null && mEditUserInfoDialog != null) {
- mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
- }
- }
-
- public Dialog createDialog(final Fragment fragment, final Drawable currentUserIcon,
- final CharSequence currentUserName,
- String title, final OnContentChangedCallback callback, UserHandle user,
- OnDialogCompleteCallback completeCallback) {
- Activity activity = fragment.getActivity();
- mUser = user;
- if (mUserManager == null) {
- mUserManager = activity.getSystemService(UserManager.class);
- }
- LayoutInflater inflater = activity.getLayoutInflater();
- View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
-
- final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
- userNameView.setText(currentUserName);
-
- final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
-
- boolean canChangePhoto = mUserManager != null &&
- canChangePhoto(activity, mUserManager.getUserInfo(user.getIdentifier()));
- if (!canChangePhoto) {
- // some users can't change their photos so we need to remove suggestive
- // background from the photoView
- userPhotoView.setBackground(null);
- }
- Drawable drawable = null;
- if (mSavedPhoto != null) {
- drawable = CircleFramedDrawable.getInstance(activity, mSavedPhoto);
- } else {
- drawable = currentUserIcon;
- }
- userPhotoView.setImageDrawable(drawable);
- if (canChangePhoto) {
- mEditUserPhotoController =
- createEditUserPhotoController(fragment, userPhotoView, drawable);
- }
- mEditUserInfoDialog = new AlertDialog.Builder(activity)
- .setTitle(title)
- .setView(content)
- .setCancelable(true)
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (which == DialogInterface.BUTTON_POSITIVE) {
- // Update the name if changed.
- CharSequence userName = userNameView.getText();
- if (!TextUtils.isEmpty(userName)) {
- if (currentUserName == null
- || !userName.toString().equals(
- currentUserName.toString())) {
- if (callback != null) {
- callback.onLabelChanged(mUser, userName.toString());
- }
- }
- }
- // Update the photo if changed.
- if (mEditUserPhotoController != null) {
- Drawable drawable =
- mEditUserPhotoController.getNewUserPhotoDrawable();
- if (drawable != null && !drawable.equals(currentUserIcon)) {
- if (callback != null) {
- callback.onPhotoChanged(mUser, drawable);
- }
- }
- }
- }
- clear();
- if (completeCallback != null) {
- completeCallback.onPositive();
- }
- }
- })
- .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- clear();
- if (completeCallback != null) {
- completeCallback.onNegativeOrCancel();
- }
- }
- })
- .setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- clear();
- if (completeCallback != null) {
- completeCallback.onNegativeOrCancel();
- }
- }
- })
- .create();
-
- // Make sure the IME is up.
- mEditUserInfoDialog.getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
- return mEditUserInfoDialog;
- }
-
- @VisibleForTesting
- boolean canChangePhoto(Context context, UserInfo user) {
- return PhotoCapabilityUtils.canCropPhoto(context) &&
- (PhotoCapabilityUtils.canChoosePhoto(context)
- || PhotoCapabilityUtils.canTakePhoto(context));
- }
-
- @VisibleForTesting
- EditUserPhotoController createEditUserPhotoController(Fragment fragment,
- ImageView userPhotoView, Drawable drawable) {
- return new EditUserPhotoController(fragment, userPhotoView,
- mSavedPhoto, drawable, mWaitingForActivityResult);
- }
-}
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
deleted file mode 100644
index a20513a..0000000
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2013 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.users;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.StrictMode;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.ContactsContract.DisplayPhoto;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListPopupWindow;
-import android.widget.TextView;
-
-import androidx.core.content.FileProvider;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import libcore.io.Streams;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EditUserPhotoController {
- private static final String TAG = "EditUserPhotoController";
-
- // It seems that this class generates custom request codes and they may
- // collide with ours, these values are very unlikely to have a conflict.
- private static final int REQUEST_CODE_CHOOSE_PHOTO = 1001;
- private static final int REQUEST_CODE_TAKE_PHOTO = 1002;
- private static final int REQUEST_CODE_CROP_PHOTO = 1003;
-
- private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
- private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
- private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";
-
- private final int mPhotoSize;
-
- private final Context mContext;
- private final Fragment mFragment;
- private final ImageView mImageView;
-
- private final Uri mCropPictureUri;
- private final Uri mTakePictureUri;
-
- private Bitmap mNewUserPhotoBitmap;
- private Drawable mNewUserPhotoDrawable;
-
- public EditUserPhotoController(Fragment fragment, ImageView view,
- Bitmap bitmap, Drawable drawable, boolean waiting) {
- mContext = view.getContext();
- mFragment = fragment;
- mImageView = view;
- mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
- mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
- mPhotoSize = getPhotoSize(mContext);
- mImageView.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- showUpdatePhotoPopup();
- }
- });
- mNewUserPhotoBitmap = bitmap;
- mNewUserPhotoDrawable = drawable;
- }
-
- public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
- if (resultCode != Activity.RESULT_OK) {
- return false;
- }
- final Uri pictureUri = data != null && data.getData() != null
- ? data.getData() : mTakePictureUri;
- switch (requestCode) {
- case REQUEST_CODE_CROP_PHOTO:
- onPhotoCropped(pictureUri, true);
- return true;
- case REQUEST_CODE_TAKE_PHOTO:
- case REQUEST_CODE_CHOOSE_PHOTO:
- if (mTakePictureUri.equals(pictureUri)) {
- cropPhoto();
- } else {
- copyAndCropPhoto(pictureUri);
- }
- return true;
- }
- return false;
- }
-
- public Bitmap getNewUserPhotoBitmap() {
- return mNewUserPhotoBitmap;
- }
-
- public Drawable getNewUserPhotoDrawable() {
- return mNewUserPhotoDrawable;
- }
-
- private void showUpdatePhotoPopup() {
- final Context context = mImageView.getContext();
- final boolean canTakePhoto = PhotoCapabilityUtils.canTakePhoto(context);
- final boolean canChoosePhoto = PhotoCapabilityUtils.canChoosePhoto(context);
-
- if (!canTakePhoto && !canChoosePhoto) {
- return;
- }
-
- final List<EditUserPhotoController.RestrictedMenuItem> items = new ArrayList<>();
-
- if (canTakePhoto) {
- final String title = context.getString(R.string.user_image_take_photo);
- final Runnable action = new Runnable() {
- @Override
- public void run() {
- takePhoto();
- }
- };
- items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
- action));
- }
-
- if (canChoosePhoto) {
- final String title = context.getString(R.string.user_image_choose_photo);
- final Runnable action = new Runnable() {
- @Override
- public void run() {
- choosePhoto();
- }
- };
- items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
- action));
- }
-
- final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
-
- listPopupWindow.setAnchorView(mImageView);
- listPopupWindow.setModal(true);
- listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
- listPopupWindow.setAdapter(new RestrictedPopupMenuAdapter(context, items));
-
- final int width = Math.max(mImageView.getWidth(), context.getResources()
- .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
- listPopupWindow.setWidth(width);
- listPopupWindow.setDropDownGravity(Gravity.START);
-
- listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- listPopupWindow.dismiss();
- final RestrictedMenuItem item =
- (RestrictedMenuItem) parent.getAdapter().getItem(position);
- item.doAction();
- }
- });
-
- listPopupWindow.show();
- }
-
- private void takePhoto() {
- Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
- appendOutputExtra(intent, mTakePictureUri);
- mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
- }
-
- private void choosePhoto() {
- Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
- intent.setType("image/*");
- appendOutputExtra(intent, mTakePictureUri);
- mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
- }
-
- private void copyAndCropPhoto(final Uri pictureUri) {
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... params) {
- final ContentResolver cr = mContext.getContentResolver();
- try (InputStream in = cr.openInputStream(pictureUri);
- OutputStream out = cr.openOutputStream(mTakePictureUri)) {
- Streams.copy(in, out);
- } catch (IOException e) {
- Log.w(TAG, "Failed to copy photo", e);
- }
- return null;
- }
-
- @Override
- protected void onPostExecute(Void result) {
- if (!mFragment.isAdded()) return;
- cropPhoto();
- }
- }.execute();
- }
-
- private void cropPhoto() {
- // TODO: Use a public intent, when there is one.
- Intent intent = new Intent("com.android.camera.action.CROP");
- intent.setDataAndType(mTakePictureUri, "image/*");
- appendOutputExtra(intent, mCropPictureUri);
- appendCropExtras(intent);
- if (intent.resolveActivity(mContext.getPackageManager()) != null) {
- try {
- StrictMode.disableDeathOnFileUriExposure();
- mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
- } finally {
- StrictMode.enableDeathOnFileUriExposure();
- }
- } else {
- onPhotoCropped(mTakePictureUri, false);
- }
- }
-
- private void appendOutputExtra(Intent intent, Uri pictureUri) {
- intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
- intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
- | Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
- }
-
- private void appendCropExtras(Intent intent) {
- intent.putExtra("crop", "true");
- intent.putExtra("scale", true);
- intent.putExtra("scaleUpIfNeeded", true);
- intent.putExtra("aspectX", 1);
- intent.putExtra("aspectY", 1);
- intent.putExtra("outputX", mPhotoSize);
- intent.putExtra("outputY", mPhotoSize);
- }
-
- private void onPhotoCropped(final Uri data, final boolean cropped) {
- new AsyncTask<Void, Void, Bitmap>() {
- @Override
- protected Bitmap doInBackground(Void... params) {
- if (cropped) {
- InputStream imageStream = null;
- try {
- imageStream = mContext.getContentResolver()
- .openInputStream(data);
- return BitmapFactory.decodeStream(imageStream);
- } catch (FileNotFoundException fe) {
- Log.w(TAG, "Cannot find image file", fe);
- return null;
- } finally {
- if (imageStream != null) {
- try {
- imageStream.close();
- } catch (IOException ioe) {
- Log.w(TAG, "Cannot close image stream", ioe);
- }
- }
- }
- } else {
- // Scale and crop to a square aspect ratio
- Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
- Config.ARGB_8888);
- Canvas canvas = new Canvas(croppedImage);
- Bitmap fullImage = null;
- try {
- InputStream imageStream = mContext.getContentResolver()
- .openInputStream(data);
- fullImage = BitmapFactory.decodeStream(imageStream);
- } catch (FileNotFoundException fe) {
- return null;
- }
- if (fullImage != null) {
- final int squareSize = Math.min(fullImage.getWidth(),
- fullImage.getHeight());
- final int left = (fullImage.getWidth() - squareSize) / 2;
- final int top = (fullImage.getHeight() - squareSize) / 2;
- Rect rectSource = new Rect(left, top,
- left + squareSize, top + squareSize);
- Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
- Paint paint = new Paint();
- canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
- return croppedImage;
- } else {
- // Bah! Got nothin.
- return null;
- }
- }
- }
-
- @Override
- protected void onPostExecute(Bitmap bitmap) {
- if (bitmap != null) {
- mNewUserPhotoBitmap = bitmap;
- mNewUserPhotoDrawable = CircleFramedDrawable
- .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
- mImageView.setImageDrawable(mNewUserPhotoDrawable);
- }
- new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
- new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
- }
- }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
- }
-
- private static int getPhotoSize(Context context) {
- Cursor cursor = context.getContentResolver().query(
- DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
- new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
- try {
- cursor.moveToFirst();
- return cursor.getInt(0);
- } finally {
- cursor.close();
- }
- }
-
- private Uri createTempImageUri(Context context, String fileName, boolean purge) {
- final File folder = context.getCacheDir();
- folder.mkdirs();
- final File fullPath = new File(folder, fileName);
- if (purge) {
- fullPath.delete();
- }
- return FileProvider.getUriForFile(context, Utils.FILE_PROVIDER_AUTHORITY, fullPath);
- }
-
- File saveNewUserPhotoBitmap() {
- if (mNewUserPhotoBitmap == null) {
- return null;
- }
- try {
- File file = new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME);
- OutputStream os = new FileOutputStream(file);
- mNewUserPhotoBitmap.compress(Bitmap.CompressFormat.PNG, 100, os);
- os.flush();
- os.close();
- return file;
- } catch (IOException e) {
- Log.e(TAG, "Cannot create temp file", e);
- }
- return null;
- }
-
- static Bitmap loadNewUserPhotoBitmap(File file) {
- return BitmapFactory.decodeFile(file.getAbsolutePath());
- }
-
- void removeNewUserPhotoBitmapFile() {
- new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME).delete();
- }
-
- private static final class RestrictedMenuItem {
- private final Context mContext;
- private final String mTitle;
- private final Runnable mAction;
- private final RestrictedLockUtils.EnforcedAdmin mAdmin;
- // Restriction may be set by system or something else via UserManager.setUserRestriction().
- private final boolean mIsRestrictedByBase;
-
- /**
- * The menu item, used for popup menu. Any element of such a menu can be disabled by admin.
- * @param context A context.
- * @param title The title of the menu item.
- * @param restriction The restriction, that if is set, blocks the menu item.
- * @param action The action on menu item click.
- */
- public RestrictedMenuItem(Context context, String title, String restriction,
- Runnable action) {
- mContext = context;
- mTitle = title;
- mAction = action;
-
- final int myUserId = UserHandle.myUserId();
- mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
- restriction, myUserId);
- mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
- restriction, myUserId);
- }
-
- @Override
- public String toString() {
- return mTitle;
- }
-
- final void doAction() {
- if (isRestrictedByBase()) {
- return;
- }
-
- if (isRestrictedByAdmin()) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mAdmin);
- return;
- }
-
- mAction.run();
- }
-
- final boolean isRestrictedByAdmin() {
- return mAdmin != null;
- }
-
- final boolean isRestrictedByBase() {
- return mIsRestrictedByBase;
- }
- }
-
- /**
- * Provide this adapter to ListPopupWindow.setAdapter() to have a popup window menu, where
- * any element can be restricted by admin (profile owner or device owner).
- */
- private static final class RestrictedPopupMenuAdapter extends ArrayAdapter<RestrictedMenuItem> {
- public RestrictedPopupMenuAdapter(Context context, List<RestrictedMenuItem> items) {
- super(context, R.layout.restricted_popup_menu_item, R.id.text, items);
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- final View view = super.getView(position, convertView, parent);
- final RestrictedMenuItem item = getItem(position);
- final TextView text = (TextView) view.findViewById(R.id.text);
- final ImageView image = (ImageView) view.findViewById(R.id.restricted_icon);
-
- text.setEnabled(!item.isRestrictedByAdmin() && !item.isRestrictedByBase());
- image.setVisibility(item.isRestrictedByAdmin() && !item.isRestrictedByBase() ?
- ImageView.VISIBLE : ImageView.GONE);
-
- return view;
- }
- }
-}
diff --git a/src/com/android/settings/users/PhotoCapabilityUtils.java b/src/com/android/settings/users/PhotoCapabilityUtils.java
deleted file mode 100644
index 1e09857..0000000
--- a/src/com/android/settings/users/PhotoCapabilityUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 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.users;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.provider.MediaStore;
-
-class PhotoCapabilityUtils {
-
- /**
- * Check if the current user can perform any activity for
- * android.media.action.IMAGE_CAPTURE action.
- */
- static boolean canTakePhoto(Context context) {
- return context.getPackageManager().queryIntentActivities(
- new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
- PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
- }
-
- /**
- * Check if the current user can perform any activity for
- * android.intent.action.GET_CONTENT action for images.
- */
- static boolean canChoosePhoto(Context context) {
- Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
- intent.setType("image/*");
- return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
- }
-
- /**
- * Check if the current user can perform any activity for
- * com.android.camera.action.CROP action for images.
- */
- static boolean canCropPhoto(Context context) {
- Intent intent = new Intent("com.android.camera.action.CROP");
- intent.setType("image/*");
- return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
- }
-
-}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8bfac91..50cb5de 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,8 +16,6 @@
package com.android.settings.users;
-import static android.os.Process.myUserHandle;
-
import android.app.Activity;
import android.app.ActivityManager;
import android.app.Dialog;
@@ -39,10 +37,12 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.ContactsContract;
+import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
import android.view.Menu;
@@ -73,6 +73,8 @@
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.drawable.CircleFramedDrawable;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.users.EditUserInfoController;
+import com.android.settingslib.users.UserCreatingDialog;
import com.android.settingslib.utils.ThreadUtils;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -83,7 +85,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Random;
/**
* Screen that manages the list of users on the device.
@@ -165,9 +166,11 @@
private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
private MultiUserSwitchBarController mSwitchBarController;
- private EditUserInfoController mEditUserInfoController = new EditUserInfoController();
+ private EditUserInfoController mEditUserInfoController =
+ new EditUserInfoController(Utils.FILE_PROVIDER_AUTHORITY);
private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
private MultiUserFooterPreferenceController mMultiUserFooterPreferenceController;
+ private UserCreatingDialog mUserCreatingDialog;
private CharSequence mPendingUserName;
private Drawable mPendingUserIcon;
@@ -175,6 +178,8 @@
// A place to cache the generated default avatar
private Drawable mDefaultIconDrawable;
+ // TODO: Replace current Handler solution to something that doesn't leak memory and works
+ // TODO: during a configuration change
private Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
@@ -321,9 +326,9 @@
@Override
public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
mEditUserInfoController.onSaveInstanceState(outState);
outState.putInt(SAVE_REMOVING_USER, mRemovingUserId);
+ super.onSaveInstanceState(outState);
}
@Override
@@ -471,11 +476,22 @@
}
private void onUserCreated(int userId) {
+ hideUserCreatingDialog();
+ // prevent crash when config changes during user creation
+ if (getContext() == null) {
+ return;
+ }
mAddingUser = false;
UserInfo userInfo = mUserManager.getUserInfo(userId);
openUserDetails(userInfo, true);
}
+ private void hideUserCreatingDialog() {
+ if (mUserCreatingDialog != null && mUserCreatingDialog.isShowing()) {
+ mUserCreatingDialog.dismiss();
+ }
+ }
+
private void openUserDetails(UserInfo userInfo, boolean newUser) {
Bundle extras = new Bundle();
extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
@@ -605,94 +621,82 @@
return dlg;
}
case DIALOG_USER_PROFILE_EDITOR: {
- UserHandle user = myUserHandle();
- UserInfo info = mUserManager.getUserInfo(user.getIdentifier());
- return mEditUserInfoController.createDialog(
- this,
- Utils.getUserIcon(getPrefContext(), mUserManager, info),
- info.name,
- getString(com.android.settingslib.R.string.profile_info_settings_title),
- new EditUserInfoController.OnContentChangedCallback() {
- @Override
- public void onPhotoChanged(UserHandle user, Drawable photo) {
- ThreadUtils.postOnBackgroundThread(new Runnable() {
- @Override
- public void run() {
- mUserManager.setUserIcon(user.getIdentifier(),
- UserIcons.convertToBitmap(photo));
- }
- });
- mMePreference.setIcon(photo);
- }
-
- @Override
- public void onLabelChanged(UserHandle user, CharSequence label) {
- mMePreference.setTitle(label.toString());
- mUserManager.setUserName(user.getIdentifier(), label.toString());
- }
- },
- user,
- null);
+ return buildEditCurrentUserDialog();
}
case DIALOG_USER_PROFILE_EDITOR_ADD_USER: {
synchronized (mUserLock) {
- mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
- new Random(System.currentTimeMillis()).nextInt(8), false);
mPendingUserName = getString(
com.android.settingslib.R.string.user_new_user_name);
+ mPendingUserIcon = null;
}
- return buildAddUserProfileEditorDialog(USER_TYPE_USER);
+ return buildAddUserDialog(USER_TYPE_USER);
}
case DIALOG_USER_PROFILE_EDITOR_ADD_RESTRICTED_PROFILE: {
synchronized (mUserLock) {
- mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
- new Random(System.currentTimeMillis()).nextInt(8), false);
mPendingUserName = getString(
com.android.settingslib.R.string.user_new_profile_name);
+ mPendingUserIcon = null;
}
- return buildAddUserProfileEditorDialog(USER_TYPE_RESTRICTED_PROFILE);
+ return buildAddUserDialog(USER_TYPE_RESTRICTED_PROFILE);
}
default:
return null;
}
}
- private Dialog buildAddUserProfileEditorDialog(int userType) {
+ private Dialog buildEditCurrentUserDialog() {
+ final Activity activity = getActivity();
+ if (activity == null) {
+ return null;
+ }
+
+ UserInfo user = mUserManager.getUserInfo(Process.myUserHandle().getIdentifier());
+ Drawable userIcon = Utils.getUserIcon(activity, mUserManager, user);
+
+ return mEditUserInfoController.createDialog(
+ activity,
+ this::startActivityForResult,
+ userIcon,
+ user.name,
+ getString(com.android.settingslib.R.string.profile_info_settings_title),
+ (newUserName, newUserIcon) -> {
+ if (newUserIcon != userIcon) {
+ ThreadUtils.postOnBackgroundThread(() ->
+ mUserManager.setUserIcon(user.id,
+ UserIcons.convertToBitmap(newUserIcon)));
+ mMePreference.setIcon(newUserIcon);
+ }
+
+ if (!TextUtils.isEmpty(newUserName) && !newUserName.equals(user.name)) {
+ mMePreference.setTitle(newUserName);
+ mUserManager.setUserName(user.id, newUserName);
+ }
+ }, null);
+ }
+
+ private Dialog buildAddUserDialog(int userType) {
Dialog d;
synchronized (mUserLock) {
d = mEditUserInfoController.createDialog(
- this,
- mPendingUserIcon,
- mPendingUserName,
+ getActivity(),
+ this::startActivityForResult,
+ null,
+ mPendingUserName.toString(),
getString(userType == USER_TYPE_USER
? com.android.settingslib.R.string.user_info_settings_title
: com.android.settingslib.R.string.profile_info_settings_title),
- new EditUserInfoController.OnContentChangedCallback() {
- @Override
- public void onPhotoChanged(UserHandle user, Drawable photo) {
- mPendingUserIcon = photo;
- }
-
- @Override
- public void onLabelChanged(UserHandle user, CharSequence label) {
- mPendingUserName = label;
- }
+ (userName, userIcon) -> {
+ mPendingUserIcon = userIcon;
+ mPendingUserName = userName;
+ addUserNow(userType);
},
- myUserHandle(),
- new EditUserInfoController.OnDialogCompleteCallback() {
- @Override
- public void onPositive() {
- addUserNow(userType);
+ () -> {
+ synchronized (mUserLock) {
+ mPendingUserIcon = null;
+ mPendingUserName = null;
}
-
- @Override
- public void onNegativeOrCancel() {
- synchronized (mUserLock) {
- mPendingUserIcon = null;
- mPendingUserName = null;
- }
- }
- });
+ }
+ );
}
return d;
}
@@ -759,6 +763,9 @@
: (mPendingUserName != null ? mPendingUserName.toString()
: getString(R.string.user_new_profile_name));
}
+
+ mUserCreatingDialog = new UserCreatingDialog(getActivity());
+ mUserCreatingDialog.show();
ThreadUtils.postOnBackgroundThread(new Runnable() {
@Override
public void run() {
@@ -781,13 +788,15 @@
mAddingUser = false;
mPendingUserIcon = null;
mPendingUserName = null;
+ ThreadUtils.postOnMainThread(() -> hideUserCreatingDialog());
return;
}
- if (mPendingUserIcon != null) {
- mUserManager.setUserIcon(user.id,
- UserIcons.convertToBitmap(mPendingUserIcon));
+ Drawable newUserIcon = mPendingUserIcon;
+ if (newUserIcon == null) {
+ newUserIcon = UserIcons.getDefaultUserIcon(getResources(), user.id, false);
}
+ mUserManager.setUserIcon(user.id, UserIcons.convertToBitmap(newUserIcon));
if (userType == USER_TYPE_USER) {
mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
diff --git a/tests/robotests/assets/exempt_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider
index 80e179a..97fe120 100644
--- a/tests/robotests/assets/exempt_not_implementing_index_provider
+++ b/tests/robotests/assets/exempt_not_implementing_index_provider
@@ -54,8 +54,8 @@
com.android.settings.inputmethod.SpellCheckersSettings
com.android.settings.location.LocationPersonalSettings
com.android.settings.location.LocationWorkProfileSettings
-com.android.settings.network.ApnEditor
-com.android.settings.network.ApnSettings
+com.android.settings.network.apn.ApnEditor
+com.android.settings.network.apn.ApnSettings
com.android.settings.network.telephony.NetworkSelectSettings
com.android.settings.notification.app.AppNotificationSettings
com.android.settings.notification.app.ChannelNotificationSettings
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index e914b01..e251669 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -35,6 +35,6 @@
// Nightmode is currently hidden
preferenceKeys.remove("night_mode");
- assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+ assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
}
}
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 78a5ee3..3418a40 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -46,6 +46,6 @@
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
}
diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
index c28ffc4..a8f42c2 100644
--- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
@@ -94,6 +94,6 @@
final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
assertThat(updatedShortcuts).hasSize(1);
- assertThat(updatedShortcuts.get(0)).isSameAs(info);
+ assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
}
}
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 303fb1b..2aa8418 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -40,8 +40,6 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.VectorDrawable;
-import android.media.MediaRoute2Info;
-import android.media.MediaRouter2Manager;
import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties;
@@ -301,33 +299,4 @@
assertThat(Utils.isSettingsIntelligence(mContext)).isFalse();
}
-
- @Test
- public void isMediaOutputDisabled_infosSizeEqual1_returnsTrue() {
- final MediaRouter2Manager router2Manager = mock(MediaRouter2Manager.class);
- final MediaRoute2Info info = mock(MediaRoute2Info.class);
- final List<MediaRoute2Info> infos = new ArrayList<>();
- infos.add(info);
-
- when(router2Manager.getAvailableRoutes(anyString())).thenReturn(infos);
- when(info.getType()).thenReturn(0);
-
- assertThat(Utils.isMediaOutputDisabled(router2Manager, "test")).isTrue();
- }
-
- @Test
- public void isMediaOutputDisabled_infosSizeOverThan1_returnsFalse() {
- final MediaRouter2Manager router2Manager = mock(MediaRouter2Manager.class);
- final MediaRoute2Info info = mock(MediaRoute2Info.class);
- final MediaRoute2Info info2 = mock(MediaRoute2Info.class);
- final List<MediaRoute2Info> infos = new ArrayList<>();
- infos.add(info);
- infos.add(info2);
-
- when(router2Manager.getAvailableRoutes(anyString())).thenReturn(infos);
- when(info.getType()).thenReturn(0);
- when(info2.getType()).thenReturn(0);
-
- assertThat(Utils.isMediaOutputDisabled(router2Manager, "test")).isFalse();
- }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 329c23d..c2cc609 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -99,7 +99,7 @@
final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 1651cb6..7044389 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -280,7 +280,7 @@
final List<String> expectedPackages = Arrays.asList(testDialer, testSms,
testLocationHistory);
- assertThat(keepEnabledPackages).containsAllIn(expectedPackages);
+ assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index a5ac209..9a65dc8 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -420,7 +420,7 @@
mController.forceStopPackage(PACKAGE_NAME);
verify(mAm).forceStopPackage(PACKAGE_NAME);
- assertThat(mController.mAppEntry).isSameAs(appEntry);
+ assertThat(mController.mAppEntry).isSameInstanceAs(appEntry);
verify(mController).updateForceStopButton();
}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 78ab49b..465e735 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -92,7 +93,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult();
- assertThat(startedActivity).named("Next activity 1").isNotNull();
+ assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
}
@@ -107,12 +108,12 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult();
- assertThat(startedActivity).named("Next activity 1").isNotNull();
+ assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
// Should only start one next activity
- assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
+ assertWithMessage("Next activity 2").that(shadowActivity.getNextStartedActivityForResult())
.isNull();
}
@@ -129,7 +130,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
IntentForResult startedActivity =
shadowActivity.getNextStartedActivityForResult();
- assertThat(startedActivity).named("Next activity").isNotNull();
+ assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent())
.isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
}
@@ -140,7 +141,7 @@
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
- assertThat(shadowActivity.getResultCode()).named("result code")
+ assertWithMessage("result code").that(shadowActivity.getResultCode())
.isEqualTo(BiometricEnrollBase.RESULT_SKIP);
}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 9fa6099..ea5511d 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -70,12 +71,13 @@
final Button cancelButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
- assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
+ assertWithMessage("Cancel visible").that(cancelButton.getVisibility())
+ .isEqualTo(View.VISIBLE);
cancelButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
- assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
- assertThat(shadowActivity.getResultCode()).named("Result code")
+ assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+ assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(Activity.RESULT_CANCELED);
}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
index 57a56fc..e238a0e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -19,6 +19,7 @@
import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -76,7 +77,7 @@
ShadowActivity.IntentForResult startedActivity =
Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
- assertThat(startedActivity).named("Next activity").isNotNull();
+ assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent())
.isEqualTo(enrollingComponent);
}
@@ -91,7 +92,7 @@
ShadowActivity.IntentForResult startedActivity =
Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
- assertThat(startedActivity).named("Next activity").isNotNull();
+ assertWithMessage("Next activity").that(startedActivity).isNotNull();
assertThat(startedActivity.intent.getComponent())
.isEqualTo(enrollingComponent);
}
@@ -162,4 +163,4 @@
assertThat(application.getPackageManager().getComponentEnabledSetting(
mComponentName)).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 2e70236..25780f7 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -106,12 +107,12 @@
mController.get().findViewById(R.id.setup_wizard_layout);
final Button skipButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
- assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+ assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
skipButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
- assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
- assertThat(shadowActivity.getResultCode()).named("Result code")
+ assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+ assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(SetupSkipDialog.RESULT_SKIP);
}
@@ -125,12 +126,12 @@
mController.get().findViewById(R.id.setup_wizard_layout);
final Button skipButton =
layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
- assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+ assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
skipButton.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
- assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
- assertThat(shadowActivity.getResultCode()).named("Result code")
+ assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+ assertWithMessage("Result code").that(shadowActivity.getResultCode())
.isEqualTo(BiometricEnrollBase.RESULT_SKIP);
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 5c4e03d..4d2ad36 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -42,6 +42,7 @@
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
@@ -285,6 +286,68 @@
verify(mBitmap).recycle();
}
+ @Test
+ public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showView() {
+ mController.showBatteryPredictionIfNecessary(1, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_left));
+ mController.showBatteryPredictionIfNecessary(1, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_middle));
+ mController.showBatteryPredictionIfNecessary(1, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_right));
+
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+ View.VISIBLE);
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+ View.VISIBLE);
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+ View.VISIBLE);
+ }
+
+ @Test
+ public void showBatteryPredictionIfNecessary_estimateReadyIsNotAvailable_notShowView() {
+ mController.showBatteryPredictionIfNecessary(0, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_left));
+ mController.showBatteryPredictionIfNecessary(0, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_middle));
+ mController.showBatteryPredictionIfNecessary(0, 14218009,
+ mLayoutPreference.findViewById(R.id.layout_right));
+
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+ View.GONE);
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+ View.GONE);
+ assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+ View.GONE);
+ }
+
+ @Test
+ public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showCorrectValue() {
+ final String leftBatteryPrediction =
+ StringUtil.formatElapsedTime(mContext, 12000000, false).toString();
+ final String rightBatteryPrediction =
+ StringUtil.formatElapsedTime(mContext, 1200000, false).toString();
+
+ mController.showBatteryPredictionIfNecessary(1, 12000000,
+ mLayoutPreference.findViewById(R.id.layout_left));
+ mController.showBatteryPredictionIfNecessary(1, 1200000,
+ mLayoutPreference.findViewById(R.id.layout_right));
+
+ assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_left),
+ leftBatteryPrediction);
+ assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_right),
+ rightBatteryPrediction);
+ }
+
+ private void assertBatteryPredictionVisible(LinearLayout linearLayout, int visible) {
+ final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+ assertThat(textView.getVisibility()).isEqualTo(visible);
+ }
+
+ private void assertBatteryPrediction(LinearLayout linearLayout, String prediction) {
+ final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+ assertThat(textView.getText().toString()).isEqualTo(prediction);
+ }
+
private void assertBatteryLevel(LinearLayout linearLayout, int batteryLevel) {
final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
assertThat(textView.getText().toString()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 9b1c411..a6bd865 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -47,6 +47,6 @@
MetricsFeatureProvider feature2 =
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
- assertThat(feature1).isSameAs(feature2);
+ assertThat(feature1).isSameInstanceAs(feature2);
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
index 64eaad5..a0db866 100644
--- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
@@ -67,7 +67,7 @@
@Test
public void getInstance_shouldBeSingleton() {
- assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext));
+ assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
}
@Test
@@ -147,9 +147,9 @@
mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
// Verify they are now sorted.
- assertThat(category.getTile(0)).isSameAs(tile3);
- assertThat(category.getTile(1)).isSameAs(tile1);
- assertThat(category.getTile(2)).isSameAs(tile2);
+ assertThat(category.getTile(0)).isSameInstanceAs(tile3);
+ assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+ assertThat(category.getTile(2)).isSameInstanceAs(tile2);
}
@Test
@@ -170,9 +170,9 @@
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify they are now sorted.
- assertThat(category.getTile(0)).isSameAs(tile2);
- assertThat(category.getTile(1)).isSameAs(tile1);
- assertThat(category.getTile(2)).isSameAs(tile3);
+ assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+ assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+ assertThat(category.getTile(2)).isSameInstanceAs(tile3);
}
@Test
@@ -192,9 +192,9 @@
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed
- assertThat(category.getTile(0)).isSameAs(tile1);
- assertThat(category.getTile(1)).isSameAs(tile2);
- assertThat(category.getTile(2)).isSameAs(tile3);
+ assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+ assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+ assertThat(category.getTile(2)).isSameInstanceAs(tile3);
}
@Test
@@ -217,10 +217,10 @@
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed
- assertThat(category.getTile(0)).isSameAs(tile1);
- assertThat(category.getTile(1)).isSameAs(tile2);
- assertThat(category.getTile(2)).isSameAs(tile3);
- assertThat(category.getTile(3)).isSameAs(tile4);
+ assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+ assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+ assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+ assertThat(category.getTile(3)).isSameInstanceAs(tile4);
}
@Test
@@ -242,9 +242,9 @@
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is internal first, follow by package name ordering
- assertThat(category.getTile(0)).isSameAs(tile2);
- assertThat(category.getTile(1)).isSameAs(tile3);
- assertThat(category.getTile(2)).isSameAs(tile1);
+ assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+ assertThat(category.getTile(1)).isSameInstanceAs(tile3);
+ assertThat(category.getTile(2)).isSameInstanceAs(tile1);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 4b53ed1..efc7263 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -129,7 +129,7 @@
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
- assertThat(controller).isSameAs(retrievedController);
+ assertThat(controller).isSameInstanceAs(retrievedController);
}
@Test
@@ -142,7 +142,7 @@
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
- assertThat(controller1).isSameAs(retrievedController);
+ assertThat(controller1).isSameInstanceAs(retrievedController);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 1acbcda..d21aa04 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -54,7 +54,7 @@
when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
- .isSameAs(countryTimeZones);
+ .isSameInstanceAs(countryTimeZones);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 79a19b5..89f51a7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -533,7 +533,7 @@
BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
BatterySipper.DrainType.SCREEN);
- assertThat(sipper).isSameAs(mScreenBatterySipper);
+ assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
}
@Test
@@ -541,7 +541,7 @@
BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
BatterySipper.DrainType.APP);
- assertThat(sipper).isSameAs(mNormalBatterySipper);
+ assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 7839e1a..a94ca93 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -232,7 +232,7 @@
final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index a6a362e..5a92aa2 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -133,7 +133,7 @@
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
@Test
@@ -151,7 +151,7 @@
preferenceKeys.add(controller.getPreferenceKey());
}
- assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+ assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
}
/**
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index a7e59fc..5fd417d 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -22,6 +22,7 @@
import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
@@ -145,13 +146,13 @@
mPreference.mEditText.setText(invalid);
mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
- assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue();
+ assertWithMessage("off: " + invalid).that(mSaveButton.isEnabled()).isTrue();
mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
- assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue();
+ assertWithMessage("opportunistic: " + invalid).that(mSaveButton.isEnabled()).isTrue();
mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
- assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
+ assertWithMessage("provider: " + invalid).that(mSaveButton.isEnabled()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/network/ApnEditorTest.java
rename to tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
index 7ec1174..0a430cd 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.network;
+package com.android.settings.network.apn;
import static com.google.common.truth.Truth.assertThat;
@@ -46,7 +46,8 @@
import androidx.preference.SwitchPreference;
import com.android.settings.R;
-import com.android.settings.network.ApnEditor.ApnData;
+import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.apn.ApnEditor.ApnData;
import com.android.settings.testutils.shadow.ShadowFragment;
import org.junit.Before;
@@ -93,7 +94,7 @@
private static final int CURSOR_INTEGER_INDEX = 0;
private static final int CURSOR_STRING_INDEX = 1;
- private static final Uri mApnUri = Uri.parse("Apn://row/1");
+ private static final Uri APN_URI = Uri.parse("Apn://row/1");
@Mock
private Cursor mCursor;
@@ -382,7 +383,7 @@
public void testApnData_invalidIntegerType_throwsInvalidTypeException() {
// GIVEN a ApnData constructed from cursor
initCursor();
- final ApnData data = new ApnData(mApnUri, mCursor);
+ final ApnData data = new ApnData(APN_URI, mCursor);
// WHEN get a string from an integer column
// THEN the InvalidTypeException is threw
@@ -393,7 +394,7 @@
public void testApnData_invalidStringType_throwsInvalidTypeException() {
// GIVEN a ApnData constructed from cursor
initCursor();
- final ApnData data = new ApnData(mApnUri, mCursor);
+ final ApnData data = new ApnData(APN_URI, mCursor);
// WHEN get a integer from a string column
// THEN the InvalidTypeException is threw
@@ -404,7 +405,7 @@
public void testApnData_validIntegerType_returnCorrectValue() {
// GIVEN a ApnData constructed from cursor
initCursor();
- final ApnData data = new ApnData(mApnUri, mCursor);
+ final ApnData data = new ApnData(APN_URI, mCursor);
// WHEN get integer from an integer column
final int val = data.getInteger(CURSOR_INTEGER_INDEX);
@@ -417,7 +418,7 @@
public void testApnData_validStringType_returnCorrectValue() {
// GIVEN a ApnData constructed from cursor
initCursor();
- final ApnData data = new ApnData(mApnUri, mCursor);
+ final ApnData data = new ApnData(APN_URI, mCursor);
// WHEN get string from a string column
final String str = data.getString(CURSOR_STRING_INDEX);
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 e03da10..566ea8b 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -34,7 +34,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 525f3ef..6740cb0 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -113,7 +113,7 @@
final List<String> niks =
PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
- assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY);
+ assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index b6f06f4..af0567f 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -70,7 +70,7 @@
keys.add("ring_volume");
keys.add("notification_volume");
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 4adc01b..5067de6 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -22,6 +22,7 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -84,24 +85,24 @@
public void isScreenLockVisible_shouldRespectResourceConfig() {
for (ScreenLockType lock : ScreenLockType.values()) {
// All locks except managed defaults to visible
- assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+ assertWithMessage(lock + " visible").that(mController.isScreenLockVisible(lock))
.isEqualTo(lock != ScreenLockType.MANAGED);
}
SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
- assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+ assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
.isFalse();
- assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
- .isFalse();
+ assertWithMessage("SWIPE visible").that(
+ mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
}
@Test
public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
mController = new ChooseLockGenericController(application, 1 /* userId */);
- assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
- .isFalse();
- assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+ assertWithMessage("SWIPE visible").that(
+ mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
+ assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
.isFalse();
}
@@ -109,34 +110,31 @@
public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
- assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
- .isTrue();
+ assertWithMessage("MANAGED visible").that(
+ mController.isScreenLockVisible(ScreenLockType.MANAGED)).isTrue();
}
@Test
public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
- .named(lock + " enabled")
- .isFalse();
+ assertWithMessage(lock + " enabled").that(
+ mController.isScreenLockEnabled(lock, lock.maxQuality + 1)).isFalse();
}
}
@Test
public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
- .named(lock + " enabled")
- .isTrue();
+ assertWithMessage(lock + " enabled").that(
+ mController.isScreenLockEnabled(lock, lock.defaultQuality)).isTrue();
}
}
@Test
public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
- .named(lock + " enabled")
- .isTrue();
+ assertWithMessage(lock + " enabled").that(
+ mController.isScreenLockEnabled(lock, lock.maxQuality - 1)).isTrue();
}
}
@@ -144,9 +142,8 @@
public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
- .named(lock + " disabledByAdmin")
- .isTrue();
+ assertWithMessage(lock + " disabledByAdmin").that(
+ mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)).isTrue();
}
}
@@ -154,9 +151,8 @@
public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
- .named(lock + " disabledByAdmin")
- .isFalse();
+ assertWithMessage(lock + " disabledByAdmin").that(
+ mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)).isFalse();
}
}
@@ -164,18 +160,16 @@
public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
for (ScreenLockType lock : ScreenLockType.values()) {
- assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
- .named(lock + " disabledByAdmin")
- .isFalse();
+ assertWithMessage(lock + " disabledByAdmin").that(
+ mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)).isFalse();
}
}
@Test
public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
- assertThat(mController.isScreenLockDisabledByAdmin(
+ assertWithMessage("MANANGED disabledByAdmin").that(mController.isScreenLockDisabledByAdmin(
ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
- .named("MANANGED disabledByAdmin")
.isTrue();
}
@@ -218,7 +212,7 @@
final int upgradedQuality =
mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
- assertThat(upgradedQuality).named("upgradedQuality")
+ assertWithMessage("upgradedQuality").that(upgradedQuality)
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
}
@@ -230,7 +224,7 @@
final int upgradedQuality =
mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
- assertThat(upgradedQuality).named("upgradedQuality")
+ assertWithMessage("upgradedQuality").that(upgradedQuality)
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index a9bb8ce..09e4408 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -33,6 +33,7 @@
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -92,18 +93,16 @@
.setUserId(123)
.build();
- assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
- .named("EXTRA_KEY_FORCE_VERIFY")
+ assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(
+ intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
.isFalse();
- assertThat((LockscreenCredential) intent.getParcelableExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
- .named("EXTRA_KEY_PASSWORD")
+ assertWithMessage("EXTRA_KEY_PASSWORD").that(
+ (LockscreenCredential) intent.getParcelableExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
.isEqualTo(LockscreenCredential.createPassword("password"));
- assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
- .named("PASSWORD_TYPE_KEY")
+ assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
- assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
- .named("EXTRA_USER_ID")
+ assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.isEqualTo(123);
}
@@ -115,15 +114,13 @@
.setUserId(123)
.build();
- assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
- false))
- .named("EXTRA_KEY_REQUEST_GK_PW")
+ assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(
+ intent.getBooleanExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
.isTrue();
- assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
- .named("PASSWORD_TYPE_KEY")
+ assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
.isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
- assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
- .named("EXTRA_USER_ID")
+ assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.isEqualTo(123);
}
@@ -151,12 +148,12 @@
.setProfileToUnify(23, LockscreenCredential.createNone())
.build();
- assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
- .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+ assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(
+ intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
.isEqualTo(23);
- assertThat((LockscreenCredential) intent.getParcelableExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
- .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+ assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+ (LockscreenCredential) intent.getParcelableExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
.isNotNull();
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index f95fda4..1cb946b 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -58,16 +59,13 @@
.setUserId(123)
.build();
- assertThat(intent
+ assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(intent
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
- .named("EXTRA_KEY_FORCE_VERIFY")
.isFalse();
- assertThat((LockscreenCredential) intent
+ assertWithMessage("EXTRA_KEY_PASSWORD").that((LockscreenCredential) intent
.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
- .named("EXTRA_KEY_PASSWORD")
.isEqualTo(createPattern("1234"));
- assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
- .named("EXTRA_USER_ID")
+ assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.isEqualTo(123);
}
@@ -78,13 +76,11 @@
.setUserId(123)
.build();
- assertThat(intent
+ assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(intent
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
- .named("EXTRA_KEY_REQUEST_GK_PW")
.isTrue();
- assertThat(intent
- .getIntExtra(Intent.EXTRA_USER_ID, 0))
- .named("EXTRA_USER_ID")
+ assertWithMessage("EXTRA_USER_ID")
+ .that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
.isEqualTo(123);
}
@@ -94,12 +90,12 @@
.setProfileToUnify(23, LockscreenCredential.createNone())
.build();
- assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
- .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+ assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(intent
+ .getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
.isEqualTo(23);
- assertThat((LockscreenCredential) intent.getParcelableExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
- .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+ assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+ (LockscreenCredential) intent.getParcelableExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
.isNotNull();
}
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 1a76799..5242e11 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -115,7 +116,7 @@
activity.findViewById(R.id.screen_lock_options).performClick();
AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
int count = latestAlertDialog.getListView().getCount();
- assertThat(count).named("List items shown").isEqualTo(3);
+ assertWithMessage("List items shown").that(count).isEqualTo(3);
}
@Test
@@ -141,7 +142,7 @@
assertThat(nextStartedActivity).isNotNull();
assertThat(nextStartedActivity.getBooleanExtra(
ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
- assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra")
+ assertWithMessage("Foo extra").that(nextStartedActivity.getStringExtra("foo"))
.isEqualTo("bar");
}
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index 4852546..53e68d9 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
@@ -112,7 +113,7 @@
AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(chooserDialog).isNotNull();
int count = chooserDialog.getListView().getCount();
- assertThat(count).named("List items shown").isEqualTo(3);
+ assertWithMessage("List items shown").that(count).isEqualTo(3);
}
@Config(qualifiers = "sw400dp")
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index c9bff38..1fc0230 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -117,7 +117,7 @@
}
assertThat(keys).hasSize(3);
- assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5");
+ assertThat(keys).containsAtLeast("pref_key_1", "pref_key_3", "pref_key_5");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
index 2adad00..43d8d94 100644
--- a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
+++ b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
@@ -80,7 +80,7 @@
final List<String> nonIndexableKeys =
SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
- assertThat(nonIndexableKeys).containsAllIn(mTestKeys);
+ assertThat(nonIndexableKeys).containsAtLeastElementsIn(mTestKeys);
}
}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index 8b5c5fe..294d05e 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -74,7 +74,7 @@
List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
mTestFragment.getPreferenceScreenResId());
- assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
+ assertThat(keys).containsAtLeast(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
}
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 8dc0db5..392d44e 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -48,7 +48,7 @@
final TrustAgentManager m1 = mImpl.getTrustAgentManager();
final TrustAgentManager m2 = mImpl.getTrustAgentManager();
- assertThat(m1).isSameAs(m2);
+ assertThat(m1).isSameInstanceAs(m2);
}
@Test
@@ -56,6 +56,6 @@
final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext);
final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext);
- assertThat(l1).isSameAs(l2);
+ assertThat(l1).isSameInstanceAs(l2);
}
}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 7bdc368..baa4690 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -73,7 +73,7 @@
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
- assertThat(keys).containsAllIn(niks);
+ assertThat(keys).containsAtLeastElementsIn(niks);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
deleted file mode 100644
index db9872f..0000000
--- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2018 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.users;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@RunWith(RobolectricTestRunner.class)
-public class EditUserInfoControllerTest {
- private static final int MAX_USER_NAME_LENGTH = 100;
-
- @Mock
- private Fragment mFragment;
- @Mock
- private Drawable mCurrentIcon;
-
- private boolean mCanChangePhoto;
-
- private FragmentActivity mActivity;
- private TestEditUserInfoController mController;
-
- public class TestEditUserInfoController extends EditUserInfoController {
- private EditUserPhotoController mPhotoController;
-
- private EditUserPhotoController getPhotoController() {
- return mPhotoController;
- }
-
- @Override
- protected EditUserPhotoController createEditUserPhotoController(Fragment fragment,
- ImageView userPhotoView, Drawable drawable) {
- mPhotoController = mock(EditUserPhotoController.class, Answers.RETURNS_DEEP_STUBS);
- return mPhotoController;
- }
-
- @Override
- boolean canChangePhoto(Context context, UserInfo user) {
- return mCanChangePhoto;
- }
- }
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mActivity = spy(ActivityController.of(new FragmentActivity()).get());
- when(mFragment.getActivity()).thenReturn(mActivity);
- mController = new TestEditUserInfoController();
- mCanChangePhoto = true;
- }
-
- @Test
- public void photoControllerOnActivityResult_whenWaiting_isCalled() {
- mController.createDialog(mFragment, mCurrentIcon, "test user",
- "title", null,
- android.os.Process.myUserHandle(), null);
- mController.startingActivityForResult();
- Intent resultData = new Intent();
- mController.onActivityResult(0, 0, resultData);
- EditUserPhotoController photoController = mController.getPhotoController();
- assertThat(photoController).isNotNull();
- verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
- }
-
- @Test
- @Config(shadows = ShadowAlertDialogCompat.class)
- public void userNameView_inputLongName_shouldBeConstrained() {
- // generate a string of 200 'A's
- final String longName = Stream.generate(
- () -> String.valueOf('A')).limit(200).collect(Collectors.joining());
- final AlertDialog dialog = (AlertDialog) mController.createDialog(mFragment, mCurrentIcon,
- "test user", "title", null,
- android.os.Process.myUserHandle(), null);
- final EditText userName = ShadowAlertDialogCompat.shadowOf(dialog).getView()
- .findViewById(R.id.user_name);
-
- userName.setText(longName);
-
- assertThat(userName.getText().length()).isEqualTo(MAX_USER_NAME_LENGTH);
- }
-
- @Test
- public void onDialogCompleteCallback_isCalled_whenCancelled() {
- EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
- EditUserInfoController.OnContentChangedCallback.class);
-
- EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
- EditUserInfoController.OnDialogCompleteCallback.class);
-
- AlertDialog dialog = (AlertDialog) mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", contentChangeCallback,
- android.os.Process.myUserHandle(),
- dialogCompleteCallback);
-
- dialog.show();
- dialog.cancel();
-
- verify(contentChangeCallback, times(0))
- .onLabelChanged(any(), any());
- verify(contentChangeCallback, times(0))
- .onPhotoChanged(any(), any());
- verify(dialogCompleteCallback, times(0)).onPositive();
- verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
- }
-
- @Test
- public void onDialogCompleteCallback_isCalled_whenPositiveClicked() {
- EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
- EditUserInfoController.OnContentChangedCallback.class);
-
- EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
- EditUserInfoController.OnDialogCompleteCallback.class);
-
- AlertDialog dialog = (AlertDialog) mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", contentChangeCallback,
- android.os.Process.myUserHandle(),
- dialogCompleteCallback);
-
- // No change to the photo.
- when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
- dialog.show();
- dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
- verify(contentChangeCallback, times(0))
- .onLabelChanged(any(), any());
- verify(contentChangeCallback, times(0))
- .onPhotoChanged(any(), any());
- verify(dialogCompleteCallback, times(1)).onPositive();
- verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
- }
-
- @Test
- public void onDialogCompleteCallback_isCalled_whenNegativeClicked() {
- EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
- EditUserInfoController.OnContentChangedCallback.class);
-
- EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
- EditUserInfoController.OnDialogCompleteCallback.class);
-
- AlertDialog dialog = (AlertDialog) mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", contentChangeCallback,
- android.os.Process.myUserHandle(),
- dialogCompleteCallback);
-
- dialog.show();
- dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick();
-
- verify(contentChangeCallback, times(0))
- .onLabelChanged(any(), any());
- verify(contentChangeCallback, times(0))
- .onPhotoChanged(any(), any());
- verify(dialogCompleteCallback, times(0)).onPositive();
- verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
- }
-
- @Test
- public void onContentChangedCallback_isCalled_whenLabelChanges() {
- EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
- EditUserInfoController.OnContentChangedCallback.class);
-
- EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
- EditUserInfoController.OnDialogCompleteCallback.class);
-
- AlertDialog dialog = (AlertDialog) mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", contentChangeCallback,
- android.os.Process.myUserHandle(),
- dialogCompleteCallback);
-
- // No change to the photo.
- when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
- dialog.show();
- String expectedNewName = "new test user";
- EditText editText = (EditText) dialog.findViewById(R.id.user_name);
- editText.setText(expectedNewName);
-
- dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
- verify(contentChangeCallback, times(1))
- .onLabelChanged(any(), eq(expectedNewName));
- verify(contentChangeCallback, times(0))
- .onPhotoChanged(any(), any());
- verify(dialogCompleteCallback, times(1)).onPositive();
- verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
- }
-
- @Test
- public void onContentChangedCallback_isCalled_whenPhotoChanges() {
- EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
- EditUserInfoController.OnContentChangedCallback.class);
-
- EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
- EditUserInfoController.OnDialogCompleteCallback.class);
-
- AlertDialog dialog = (AlertDialog) mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", contentChangeCallback,
- android.os.Process.myUserHandle(),
- dialogCompleteCallback);
-
- // A different drawable.
- Drawable newPhoto = mock(Drawable.class);
- when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto);
-
- dialog.show();
- dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
- verify(contentChangeCallback, times(0))
- .onLabelChanged(any(), any());
- verify(contentChangeCallback, times(1))
- .onPhotoChanged(any(), eq(newPhoto));
- verify(dialogCompleteCallback, times(1)).onPositive();
- verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
- }
-
- @Test
- public void createDialog_canNotChangePhoto_nullPhotoController() {
- mCanChangePhoto = false;
-
- mController.createDialog(
- mFragment, mCurrentIcon, "test",
- "title", null,
- android.os.Process.myUserHandle(),
- null);
-
- assertThat(mController.mPhotoController).isNull();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 27c90b0..ec2fdc6 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -398,7 +398,7 @@
ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
verify(mFragment.mUserListCategory).addPreference(captor.capture());
UserPreference adminPref = captor.getValue();
- assertThat(adminPref).isSameAs(mMePreference);
+ assertThat(adminPref).isSameInstanceAs(mMePreference);
}
@Test
@@ -417,7 +417,7 @@
assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST);
assertThat(guestPref.isEnabled()).isEqualTo(true);
assertThat(guestPref.isSelectable()).isEqualTo(true);
- assertThat(guestPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+ assertThat(guestPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
}
@Test
@@ -436,7 +436,7 @@
assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID);
assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true);
- assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+ assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
}
@Test
@@ -456,7 +456,7 @@
assertThat(userPref.getSummary()).isEqualTo("Restricted profile");
assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true);
- assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+ assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
}
@Test
@@ -493,7 +493,7 @@
assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile");
assertThat(userPref.isEnabled()).isEqualTo(true);
assertThat(userPref.isSelectable()).isEqualTo(true);
- assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+ assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
}
@Test
@@ -518,7 +518,7 @@
assertThat(userPref.getSummary()).isEqualTo("Not set up");
assertThat(userPref.isEnabled()).isEqualTo(false);
assertThat(userPref.isSelectable()).isEqualTo(true);
- assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+ assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index f7702be..5a17622 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -36,6 +36,6 @@
final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
- assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader());
+ assertThat(mContextThemeWrapper.getClassLoader()).isSameInstanceAs(clazz.getClassLoader());
}
}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index df9a2c1..f73d0f7 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -105,7 +105,7 @@
mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
View view = mController.done(mActivity);
- assertThat(view).isSameAs(inputView);
+ assertThat(view).isSameInstanceAs(inputView);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index 9521e7a..89df035 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -36,6 +36,6 @@
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
assertThat(keys).isNotNull();
- assertThat(niks).containsAllIn(keys);
+ assertThat(niks).containsAtLeastElementsIn(keys);
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
index 81615f2..c9d2119 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
@@ -103,7 +103,7 @@
preferenceKeys.add(controller.getPreferenceKey());
}
- assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+ assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
}
@Test
diff --git a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
index 264abd0..1f3031a 100644
--- a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -37,7 +37,7 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
index cc0253f..037c805 100644
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -27,6 +27,7 @@
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.hamcrest.CoreMatchers.not;
@@ -80,7 +81,7 @@
assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
skipOrClearButton.performClick();
- assertThat(activity.isFinishing()).named("Is finishing").isTrue();
+ assertWithMessage("Is finishing").that(activity.isFinishing()).isTrue();
}
@Test