UI and error message fixes for 16k developer option
- Disallow disabling option when hardware offload
values aren't default ones. This was bypassing warning dialogue
- For ext4 format dialog, add a delete icon and change confirmation text
- Change error message when update is pending.
- Add padding to progress dialog
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 338139884
Change-Id: Ib1c3ac075a75a8515fe725103b062983ecf11fba
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();
}