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

Commit b9e9ad7d authored by Fahim's avatar Fahim
Browse files

WIP: Fix base theme navigation color issue

parent 5b807a40

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

+11 −0
Original line number Diff line number Diff line
@@ -21,4 +21,15 @@ 
        <item name="android:windowLightStatusBar">false</item>

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

    </style>



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

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

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

    </style>



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

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

        <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

+2 −9
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 
  <!-- Used on sdk 27 and above -->

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

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





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

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



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

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

  </style>
@@ -37,9 +32,7 @@ 
  <!-- TODO(a bug): refactor into dialer/theme -->

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

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

    <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>

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

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

  </style>

</resources>
 
 No newline at end of file

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

+5 −8
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
  <!-- Activities should use this theme as their style -->

  <style name="MainActivityTheme" parent="MainActivityThemeBase"/>



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

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



  <!-- Used as a procy for values-v27/styles.xml -->

  <style name="MainActivityThemeBase" parent="Dialer.ThemeBase.NoActionBar">
@@ -37,10 +37,8 @@ 
    <item name="actionModeStyle">@style/MainActionModeStyle</item>

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

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



    <!-- This is used for status bar and navigation bar icon color in recents -->

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

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

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

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

  </style>



  <style name="MainActivityThemeBase.Dark" parent="Dialer.Dark.ThemeBase.NoActionBar">
@@ -49,9 +47,8 @@ 
    <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>

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

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

  </style>



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