浏览代码

Fix dark mode "follow system"

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
Joris Bodin 5 年之前
父节点
当前提交
653984e7e1
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

+ 6 - 4
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -1268,10 +1268,12 @@ public abstract class DrawerActivity extends ToolbarActivity
     @Override
     protected void onResume() {
         super.onResume();
-        // TODO Check whether dark mode has been changed
-        getDelegate().setLocalNightMode(DarkMode.DARK == preferences.getDarkThemeMode() ?
-                                            AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-        getDelegate().applyDayNight();
+        if (AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+
+            getDelegate().setLocalNightMode(DarkMode.DARK == preferences.getDarkThemeMode() ?
+                                                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
+            getDelegate().applyDayNight();
+        }
         setDrawerMenuItemChecked(mCheckedMenuItem);
     }