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

Use super class for customizing MainPreferences.java

Browse Source 
With this, we can reduce patch file to one for customizing
MainPreferences.
This commit is contained in:
Simon Hong
2019-09-26 13:46:46 +09:00
parent e129e4f4b6
commit 0efe048af9
5 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/brave_java_sources.gni
+1 -1
View File
@@ -12,7 +12,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java",
"../../brave/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BraveMainPreferences.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceManager.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/privacy/BravePrivacyPreferences.java",
android/java/org/chromium/chrome/browser/preferences/BraveMainPreferences.java → android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java
+2 -2
View File
@@ -8,11 +8,12 @@ package org.chromium.chrome.browser.preferences;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
import java.util.HashMap;
// This exculdes some settings in main settings screen.
public class BraveMainPreferences extends MainPreferences {
public class BraveMainPreferencesBase extends PreferenceFragmentCompat {
// Below prefs are removed from main settings.
public static final String PREF_ACCOUNT_SECTION = "account_section";
public static final String PREF_SIGN_IN = "sign_in";
@@ -24,7 +25,6 @@ public class BraveMainPreferences extends MainPreferences {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
updateBravePreferences();
}
patches/chrome-android-java-src-org-chromium-chrome-browser-payments-PaymentRequestImpl.java.patch
-21
View File
@@ -1,21 +0,0 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index 56bf08a51b2082ba3111ea1d88208c6f0c33e112..2c3f3a28216ab904d54e03b81cd5db9dc4ccfb48 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSecti
import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;
import org.chromium.chrome.browser.payments.ui.SectionInformation;
import org.chromium.chrome.browser.payments.ui.ShoppingCart;
+import org.chromium.chrome.browser.preferences.BraveMainPreferences;
import org.chromium.chrome.browser.preferences.MainPreferences;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.profiles.Profile;
@@ -1847,7 +1848,7 @@ public class PaymentRequestImpl
return;
}
- PreferencesLauncher.launchSettingsPageCompat(context, MainPreferences.class);
+ PreferencesLauncher.launchSettingsPageCompat(context, BraveMainPreferences.class);
}
@Override
patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-MainPreferences.java.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index 56f952c159ffb94c0b51a47d6949e8bc3f99871c..ea90e440c35ae95c6579d27d22feeefd421a376f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -41,7 +41,7 @@ import java.util.Map;
/**
* The main settings screen, shown when the user first opens Settings.
*/
-public class MainPreferences extends PreferenceFragmentCompat
+public class MainPreferences extends BraveMainPreferencesBase
implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
SigninManager.SignInStateObserver {
public static final String PREF_ACCOUNT_SECTION = "account_section";
patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-Preferences.java.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
index 8c8c06dc96f7b43c89ff24e487d1fbd893102a0b..655fd91440ffe7dab901677adfa8e53fa8966922 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
@@ -112,7 +112,7 @@ public class Preferences extends ChromeBaseAppCompatActivity
// If savedInstanceState is non-null, then the activity is being
// recreated and super.onCreate() has already recreated the fragment.
if (savedInstanceState == null) {
- if (initialFragment == null) initialFragment = MainPreferences.class.getName();
+ if (initialFragment == null) initialFragment = BraveMainPreferences.class.getName();
Fragment fragment = Fragment.instantiate(this, initialFragment, initialArguments);
getSupportFragmentManager()