From e96cb899b6a3758fce9f67e0915db09171e676c4 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Mon, 15 Feb 2021 15:34:46 +0530
Subject: [PATCH 1/4] disable night mode

---
 res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index ce060f4467..10c48df8df 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,7 +101,7 @@
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
     </style>
 
-    <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="LaunchScreenTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimary">@color/primary_color</item>
-- 
GitLab


From 4958ecd6cc78ac0c7add75c0743412431b1846c2 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Mon, 15 Feb 2021 17:43:17 +0530
Subject: [PATCH 2/4] disable night mode using java code

---
 src/com/android/contacts/activities/PeopleActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index dc6efff619..96ccc1f7c6 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -361,6 +361,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
             Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate start");
         }
 
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         // Make sure this is *before* calling super.onCreate
         setTheme(R.style.PeopleActivityTheme);
         super.onCreate(savedState);
-- 
GitLab


From 2d7bf07d5b11dd7d9520f14864e8752594b5cab9 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Mon, 15 Feb 2021 17:44:23 +0530
Subject: [PATCH 3/4] disable night mode using java code

---
 src/com/android/contacts/ContactsApplication.java       | 2 +-
 src/com/android/contacts/activities/PeopleActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 18447696c4..0453969c35 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -100,7 +100,7 @@ public class ContactsApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) {
             Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate start");
         }
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 96ccc1f7c6..6f59389e41 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -361,7 +361,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
             Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate start");
         }
 
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+
         // Make sure this is *before* calling super.onCreate
         setTheme(R.style.PeopleActivityTheme);
         super.onCreate(savedState);
-- 
GitLab


From b7dd4b70ec27dfadc13dbd9003f89681164a04c4 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Mon, 15 Feb 2021 18:17:00 +0530
Subject: [PATCH 4/4] disable night mode using java code : bug fix

---
 src/com/android/contacts/ContactsApplication.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 0453969c35..fcd282f7cd 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -39,6 +39,8 @@ import com.android.contactsbind.analytics.AnalyticsUtil;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 public class ContactsApplication extends Application {
     private static final boolean ENABLE_LOADER_LOG = false; // Don't submit with true
     private static final boolean ENABLE_FRAGMENT_LOG = false; // Don't submit with true
@@ -101,6 +103,7 @@ public class ContactsApplication extends Application {
     public void onCreate() {
         super.onCreate();
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+
         if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) {
             Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate start");
         }
-- 
GitLab