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

Commit 0cc44e92 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'q_1828' into 'v1-q' 

implement e ui sdk, update navigation drawer background

See merge request !31
parents 7e4549aa 080ed1cf

res/values/colors.xml

+7 −5
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ 
    <!-- Color of the status bar above the contextual selection bar. -->

    <color name="contextual_selection_bar_status_bar_color">#bababa</color>



    <color name="primary_color_dark">#1c3aa9</color>

    <color name="primary_color">#2a56c6</color>

    <color name="primary_color_dark">@lineageos.platform:color/color_default_primary</color>

    <color name="primary_color">@lineageos.platform:color/color_default_primary_dark</color>

    <color name="accent">@lineageos.platform:color/color_default_accent</color>



    <color name="group_primary_color_dark">#546E7A</color>

    <color name="group_primary_color">#607D8B</color>
@@ -205,8 +206,9 @@ 
    <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>



    <!-- Color of the background of the contact detail and editor pages -->

    <color name="background_primary">#f9f9f9</color>

    <color name="contact_all_list_background_color">#FFFFFF</color>

    <color name="background_primary">@lineageos.platform:color/color_default_background</color>

    <color name="contact_all_list_background_color">@lineageos.platform:color/color_default_background</color>





    <!-- Text color used for character counter when the max limit has been exceeded -->

    <color name="call_subject_limit_exceeded">#d1041c</color>
@@ -248,7 +250,7 @@ 
    <color name="drawer_divider_color">#E5E5E5</color>



    <!-- Background color for the navigation drawer -->

    <color name="navigation_drawer_background_color">#FAFAFA</color>

    <color name="navigation_drawer_background_color">@lineageos.platform:color/color_default_background</color>



    <!-- Background color for the current selected item in the navigation drawer -->

    <color name="drawer_selected_color">#E8E8E8</color>

src/com/android/contacts/activities/PeopleActivity.java

+2 −17
Original line number Diff line number Diff line
@@ -1305,23 +1305,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
     * */



    private int fetchAccentColor() {

        TypedValue typedValue = new TypedValue();



        TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });

        int color = a.getColor(0, 0);



        a.recycle();

        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));



        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(color);

        }

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(color));





        int color=getResources().getColor(R.color.accent);

             return color;

    }