Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2857e5a9 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Update parental control patch for v132

parent ae5c389d
Loading
Loading
Loading
Loading
+13 −5
Original line number Diff line number Diff line
From 8d9920de4878d81e87489631bcac8c5981783355 Mon Sep 17 00:00:00 2001
From 415ca6262686f9255ed3b7ef7835fb004ac86d22 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Thu, 11 Jul 2024 11:11:15 +0530
Subject: Browser: Hide settings when parental control is active

---
 .../chrome/browser/app/ChromeActivity.java    |  2 +-
 .../chrome/browser/app/ChromeActivity.java    |  3 +-
 .../AppMenuPropertiesDelegateImpl.java        |  5 ++++
 .../browser/app/flags/ChromeCachedFlags.java  | 29 +++++++++++++++++++
 .../chrome/browser/settings/MainSettings.java |  4 +++
 4 files changed, 39 insertions(+), 1 deletion(-)
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
index e9220cb9947d8..655865bba50a5 100644
index e9220cb9947d8..3b67f537da328 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2433,7 +2433,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -71,6 +71,7 @@ import org.chromium.chrome.browser.PlayServicesVersionInfo;
 import org.chromium.chrome.browser.WarmupManager;
 import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
 import org.chromium.chrome.browser.app.download.DownloadMessageUiDelegate;
+import org.chromium.chrome.browser.app.flags.ChromeCachedFlags;
 import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;
 import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory;
 import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
@@ -2433,7 +2434,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         @BrowserProfileType
         int type = Profile.getBrowserProfileTypeFromProfile(getCurrentTabModel().getProfile());