Merge "Update Setting's Robolectric tests' instructions" into main
diff --git a/src/com/android/settings/biometrics/OWNERS b/src/com/android/settings/biometrics/OWNERS
index cb0d034..f804b0f 100644
--- a/src/com/android/settings/biometrics/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,3 +1,6 @@
+# The Android Biometric team should approve all changes to biometrics subdirectories.
+set noparent
+
graciecheng@google.com
ilyamaty@google.com
jaggies@google.com
diff --git a/src/com/android/settings/biometrics2/OWNERS b/src/com/android/settings/biometrics2/OWNERS
index a257ed8..ac806eb 100644
--- a/src/com/android/settings/biometrics2/OWNERS
+++ b/src/com/android/settings/biometrics2/OWNERS
@@ -1 +1,4 @@
+# The Android Biometric team should approve all changes to biometrics2 subdirectories.
+set noparent
+
include /src/com/android/settings/biometrics/OWNERS
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 4038f4d..b1e4f87 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -376,6 +376,13 @@
|| enableAngleController.isDefaultValue())) {
disableDeveloperOptions();
} else {
+ // Disabling developer options in page-agnostic mode isn't supported as device
+ // isn't in production state
+ if (Enable16kUtils.isPageAgnosticModeOn(getContext())) {
+ Enable16kUtils.showPageAgnosticWarning(getContext());
+ onDisableDevelopmentOptionsRejected();
+ return;
+ }
DisableDevSettingsDialogFragment.show(this /* host */);
}
}
diff --git a/src/com/android/settings/development/Enable16kPagesPreferenceController.java b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
index 23a6a22..0572b1b 100644
--- a/src/com/android/settings/development/Enable16kPagesPreferenceController.java
+++ b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
@@ -207,7 +207,10 @@
int status = data.getInt(SystemUpdateManager.KEY_STATUS);
if (status != SystemUpdateManager.STATUS_UNKNOWN
&& status != SystemUpdateManager.STATUS_IDLE) {
- throw new RuntimeException("System has pending update!");
+ throw new RuntimeException(
+ "System has pending update! Please restart the device to complete applying"
+ + " pending update. If you are seeing this after using 16KB developer"
+ + " options, please check configuration and OTA packages!");
}
// Publish system update info
@@ -313,7 +316,7 @@
}
private void displayToast(String message) {
- Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
+ Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
}
@Override
@@ -330,7 +333,7 @@
@Override
public void onFailure(@NonNull Throwable t) {
- Log.e(TAG, "Failed to change the /data partition with ext4");
+ Log.e(TAG, "Failed to change the /data partition to ext4");
displayToast(mContext.getString(R.string.format_ext4_failure_toast));
}
},
@@ -405,6 +408,7 @@
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
progressBar.setLayoutParams(params);
+ progressBar.setPadding(0, 24, 0, 24);
builder.setView(progressBar);
builder.setCancelable(false);
return builder.create();
diff --git a/src/com/android/settings/development/EnableExt4WarningDialog.java b/src/com/android/settings/development/EnableExt4WarningDialog.java
index c8ba521..0e1dffd 100644
--- a/src/com/android/settings/development/EnableExt4WarningDialog.java
+++ b/src/com/android/settings/development/EnableExt4WarningDialog.java
@@ -70,8 +70,9 @@
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setTitle(R.string.confirm_format_ext4_title)
+ .setIcon(R.drawable.ic_delete_accent)
.setMessage(R.string.confirm_format_ext4_text)
- .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+ .setPositiveButton(R.string.main_clear_confirm_title, this /* onClickListener */)
.setNegativeButton(android.R.string.cancel, this /* onClickListener */)
.create();
}
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
index aa03c59..9cfaf7a 100644
--- a/src/com/android/settings/password/OWNERS
+++ b/src/com/android/settings/password/OWNERS
@@ -1,3 +1,6 @@
+# The Android Biometric team should approve all changes to password subdirectories.
+set noparent
+
# Default reviewers for this and subdirectories.
curtislb@google.com
graciecheng@google.com
diff --git a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkFragmentControllerTest.kt b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkFragmentControllerTest.kt
index 0d57daf..13e4291 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkFragmentControllerTest.kt
+++ b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkFragmentControllerTest.kt
@@ -17,7 +17,6 @@
import android.content.Context
import android.platform.test.flag.junit.SetFlagsRule
-import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import androidx.test.core.app.ApplicationProvider
@@ -27,6 +26,7 @@
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE
import com.android.settings.flags.Flags
import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.MoreExecutors
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -49,7 +49,7 @@
fun setUp() {
mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)
context = spy(ApplicationProvider.getApplicationContext<Context>())
- executor = ContextCompat.getMainExecutor(context)
+ executor = MoreExecutors.directExecutor()
fakeThreadNetworkController = FakeThreadNetworkController()
controller = newControllerWithThreadFeatureSupported(true)
}
diff --git a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt
index 04ebc92..065ff96 100644
--- a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt
+++ b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt
@@ -27,6 +27,7 @@
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE
import com.android.settings.flags.Flags
import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.MoreExecutors
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -50,7 +51,7 @@
fun setUp() {
mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)
context = spy(ApplicationProvider.getApplicationContext<Context>())
- executor = Executor { runnable: Runnable -> runnable.run() }
+ executor = MoreExecutors.directExecutor()
fakeThreadNetworkController = FakeThreadNetworkController()
controller = newControllerWithThreadFeatureSupported(true)
val preferenceManager = PreferenceManager(context)