Commit ce9e0e22 authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

Change two menus inside of privacy to ChromeSwitchPreference

the menus used a checkbox to change value.
it is more user-friendly to use switch-toggle in this case.

Bug: 1112076
Change-Id: I0621f3e5d8382a4272c844158673113bc8ec1f90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398033Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com>
Cr-Commit-Position: refs/heads/master@{#808644}
parent b628034b
......@@ -7,12 +7,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orderingFromXml="false">
<org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="can_make_payment"
android:title="@string/can_make_payment_title"
android:summary="@string/settings_can_make_payment_toggle_label"
android:order="0"/>
<org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="preload_pages"
android:title="@string/preload_pages_title"
android:summary="@string/preload_pages_summary"
......
......@@ -9,7 +9,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
......@@ -28,7 +27,7 @@ import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.prefs.PrefService;
......@@ -93,12 +92,12 @@ public class PrivacySettings
mManagedPreferenceDelegate = createManagedPreferenceDelegate();
ChromeBaseCheckBoxPreference canMakePaymentPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
ChromeBaseCheckBoxPreference networkPredictionPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
ChromeSwitchPreference networkPredictionPref =
(ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS);
networkPredictionPref.setChecked(
PrivacyPreferencesManager.getInstance().getNetworkPredictionEnabled());
networkPredictionPref.setOnPreferenceChangeListener(this);
......@@ -145,8 +144,8 @@ public class PrivacySettings
public void updateSummaries() {
PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
CheckBoxPreference canMakePaymentPref =
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
if (canMakePaymentPref != null) {
canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment