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

Commit 65c6da23 authored by Fahim's avatar Fahim
Browse files

WIP: Update styles to fix statusBar color issue

parent 2026c713

java/com/android/dialer/binary/common/DialerApplication.java

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ public abstract class DialerApplication extends Application implements HasRootCo 


  @Override

  public void onCreate() {

    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);

    Trace.beginSection("DialerApplication.onCreate");

    StrictModeComponent.get(this).getDialerStrictMode().onApplicationCreate(this);

    super.onCreate();

java/com/android/dialer/inject/demo/DemoDaggerApplication.java

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public final class DemoDaggerApplication extends Application implements HasRootC 
  @Override

  public void onCreate() {

    super.onCreate();

    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);

    DemoSubcomponent.get(this).demoObjects();

  }

}

java/com/android/dialer/main/impl/res/values-night-v27/styles.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>





    <style name="LaunchTheme" parent="LaunchBaseTheme">

        <item name="android:windowLightStatusBar">false</item>

        <item name="android:windowLightNavigationBar">false</item>

    </style>

</resources>
 
 No newline at end of file

java/com/android/dialer/main/impl/res/values-v27/styles.xml

+7 −4
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 
  -->

<resources>





  <style name="LaunchTheme" parent="LaunchBaseTheme">

    <item name="android:windowLightStatusBar">true</item>

    <item name="android:windowLightNavigationBar">true</item>

  </style>

  <!-- Used on sdk 27 and above -->

  <!-- TODO(a bug): refactor into dialer/theme -->

  <style name="MainActivityTheme" parent="MainActivityThemeBase">
@@ -32,11 +37,9 @@ 
  <!-- TODO(a bug): refactor into dialer/theme -->

  <style name="MainActivityTheme.Dark" parent="MainActivityThemeBase.Dark">

    <!-- Used to change the navigation bar color -->

    <item name="android:windowLightNavigationBar">true</item>

    <item name="android:windowLightStatusBar">false</item>

    <item name="android:windowLightNavigationBar">false</item>

    <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>

    <item name="android:navigationBarDividerColor">#E0E0E0</item>







  </style>

</resources>
 
 No newline at end of file

java/com/android/dialer/main/impl/res/values/styles.xml

+6 −5
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ 
  -->

<resources>



  <style name="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

  <style name="LaunchTheme" parent="LaunchBaseTheme" />



  <style name="LaunchBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

    <item name="android:colorPrimary">@color/dialer_theme_color</item>

    <item name="colorPrimary">@color/dialer_theme_color</item>

    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <!-- This is used for statusbar and Navigation bar color in recents -->

    <item name="android:windowLightStatusBar">true</item>

    <item name="android:windowLightNavigationBar">true</item>



  </style>



  <!-- Activities should use this theme as their style -->
@@ -51,6 +49,9 @@ 
    <item name="actionModeStyle">@style/MainActionModeStyle</item>

    <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>

    <item name="dialpad_style">@style/Dialpad.Themed</item>



    <item name="android:windowLightStatusBar">false</item>

    <item name="android:windowLightNavigationBar">false</item>

  </style>



  <!-- Colors our actionbar in action mode to dialer theme color. -->