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

Fix for crash on some settings due to renaming

Browse Source
This commit is contained in:
samartnik
2020-03-23 10:39:29 -04:00
parent 160ea5ad2b
commit aae3ff7c1a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/layout/add_sync_device_name_dialog.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
style="@style/AlertDialogContent">
<org.chromium.chrome.browser.ui.widget.text.AlertDialogEditText
<org.chromium.components.browser_ui.widget.text.AlertDialogEditText
android:id="@+id/device_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android/java/res/layout/qa_code_check.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
style="@style/AlertDialogContent">
<org.chromium.chrome.browser.ui.widget.text.AlertDialogEditText
<org.chromium.components.browser_ui.widget.text.AlertDialogEditText
android:id="@+id/qa_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android/java/res/xml/clear_browsing_data_preferences_tab.xml
+7 -7
View File
@@ -14,41 +14,41 @@
android:title="@string/clear_browsing_data_tab_period_title"
app:singleLine="true" />
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_history_checkbox"
android:persistent="false"
android:title="@string/clear_history_title"
android:summary="@string/clear_browsing_history_summary" />
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_cookies_checkbox"
android:persistent="false"
android:title="@string/clear_cookies_and_site_data_title"
android:summary="@string/clear_cookies_and_site_data_summary_basic" />
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_cache_checkbox"
android:persistent="false"
android:title="@string/clear_cache_title" />
<!-- TODO(samartnik): disabling option as it requires futher research
At the moment causes issue https://github.com/brave/brave-browser/issues/8737 -->
<!-- <org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<!-- <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_downloads_checkbox"
android:persistent="false"
android:title="@string/clear_downloads_title" /> -->
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_passwords_checkbox"
android:persistent="false"
android:title="@string/clear_passwords_title" />
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_form_data_checkbox"
android:persistent="false"
android:title="@string/clear_form_data_title" />
<org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
<org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
android:key="clear_site_settings_checkbox"
android:persistent="false"
android:title="@string/prefs_site_settings" />