Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] Theme.Chromium.AlertDialog was renamed

Browse Source 
Chromium change:
https://github.com/chromium/chromium/commit/765e02f5a2030faa8496260bceea16bf328ff9ca

[GMNext] Clean up and rename Theme.Chromium.AlertDialog
AlertDialog.Builder presubmit error is a false positive because this CL
doesn't add a call but modifies one of the arguments.

NOPRESUBMIT=true

Bug: 1242702
This commit is contained in:
samartnik
2022-05-13 18:01:39 +01:00
committed by Claudio DeSouza
parent 9a267bd601
commit 51228639d8
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java
+3 -2
View File
@@ -1063,7 +1063,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
private void showEndDialog(String message, Runnable runWhenDismissed) {
AlertDialog.Builder alert =
new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog);
new AlertDialog.Builder(getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
if (null == alert) {
return;
}
@@ -1082,7 +1082,8 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
}
private void deleteDeviceDialog(BraveSyncDevices.SyncDeviceInfo device) {
AlertDialog.Builder alert = new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog);
AlertDialog.Builder alert =
new AlertDialog.Builder(getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
if (null == alert) {
return;
}
android/java/org/chromium/chrome/browser/settings/BraveWalletAutoLockPreferences.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class BraveWalletAutoLockPreferences
};
AlertDialog.Builder alert =
new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog);
new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
AlertDialog alertDialog =
alert.setTitle(R.string.brave_wallet_settings_autolock_option)
.setView(view)
android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class BraveWalletResetPreference
};
AlertDialog.Builder alert =
new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog);
new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
AlertDialog alertDialog =
alert.setTitle(R.string.brave_wallet_reset_settings_option)
.setView(view)
android/java/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class BraveWalletResetTxHistoryAndNoncePreference
};
AlertDialog.Builder alert =
new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog);
new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
AlertDialog alertDialog =
alert.setTitle(R.string.brave_wallet_clear_tx_and_nonce_setting_title)
.setView(view)
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+11 -9
View File
@@ -172,8 +172,8 @@ public class BraveQAPreferences extends BravePreferenceFragment
}
};
AlertDialog.Builder alert =
new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog);
AlertDialog.Builder alert = new AlertDialog.Builder(
getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
AlertDialog.Builder alertDialog =
alert.setTitle("Enter Wallet restore phrase")
.setView(view)
@@ -253,8 +253,8 @@ public class BraveQAPreferences extends BravePreferenceFragment
});
input.requestFocus();
AlertDialog.Builder alert =
new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog);
AlertDialog.Builder alert = new AlertDialog.Builder(
getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
if (alert == null) {
return true;
}
@@ -371,7 +371,7 @@ public class BraveQAPreferences extends BravePreferenceFragment
input.requestFocus();
AlertDialog.Builder alert =
new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog);
new AlertDialog.Builder(getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
if (alert == null) {
return;
}
@@ -483,10 +483,12 @@ public class BraveQAPreferences extends BravePreferenceFragment
}
}
};
AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog)
.setMessage(
"This operation requires restart. Would you like to restart application and start operation?")
.setPositiveButton(R.string.ok, onClickListener).setNegativeButton(R.string.cancel, onClickListener);
AlertDialog.Builder alertDialog =
new AlertDialog.Builder(getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog)
.setMessage(
"This operation requires restart. Would you like to restart application and start operation?")
.setPositiveButton(R.string.ok, onClickListener)
.setNegativeButton(R.string.cancel, onClickListener);
Dialog dialog = alertDialog.create();
dialog.setCanceledOnTouchOutside(false);
dialog.show();
android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java
+6 -4
View File
@@ -70,10 +70,12 @@ public class BraveRewardsDebugPreferences extends BravePreferenceFragment {
}
}
};
AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity(), R.style.Theme_Chromium_AlertDialog)
.setMessage(
"This operation requires restart. Would you like to restart application and start operation?")
.setPositiveButton(R.string.ok, onClickListener).setNegativeButton(R.string.cancel, onClickListener);
AlertDialog.Builder alertDialog =
new AlertDialog.Builder(getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog)
.setMessage(
"This operation requires restart. Would you like to restart application and start operation?")
.setPositiveButton(R.string.ok, onClickListener)
.setNegativeButton(R.string.cancel, onClickListener);
Dialog dialog = alertDialog.create();
dialog.setCanceledOnTouchOutside(false);
dialog.show();