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

Commit 4542d763 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'oreo-e-theme-implementation' into 'v1-oreo' 

e theme implementation

See merge request !11
parents fe9797ab e73e2972

res/layout/gallery_main.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
            android:id="@+id/gallery_root"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@color/primary"

            android:layout_above="@+id/bottom_navigation">



            <!-- Toolbar -->

res/layout/gl_root_group.xml

+9 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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.
@@ -20,12 +19,15 @@ 
        android:id="@+id/gl_parent_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <com.android.gallery3d.ui.GLRootView

            android:id="@+id/gl_root_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

    </RelativeLayout>

    <View android:id="@+id/gl_root_cover"



    <View

        android:id="@+id/gl_root_cover"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#fafafa" />

res/layout/main.xml

+22 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/gallery_root"

        android:orientation="vertical"

    android:layout_width="match_parent"

        android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:background="@color/primary"

    android:orientation="vertical">



    <include layout="@layout/gl_root_group" />

    <FrameLayout android:id="@+id/header"

            android:visibility="gone"



    <FrameLayout

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:visibility="gone" />



    <FrameLayout

        android:id="@+id/footer"

        android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    <FrameLayout android:id="@+id/footer"

            android:visibility="gone"

            android:layout_alignParentBottom="true"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentEnd="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

        android:layout_alignParentBottom="true"

        android:visibility="gone" />

</RelativeLayout>

res/values/cm_colors.xml

+2 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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.
@@ -15,7 +14,7 @@ 
-->

<resources>



    <color name="primary">#333333</color>

    <color name="primary">@lineageos.platform:color/color_default_primary_text</color>

    <color name="primaryDark">#000000</color>

    <color name="accent">#33b5e5</color>

res/values/colors.xml

+12 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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.
@@ -15,21 +14,21 @@ 
-->

<resources>



    <color name="default_background">@color/white</color>

    <color name="default_background">@lineageos.platform:color/color_default_primary_text</color>



    <!-- configuration for album set page -->

    <color name="albumset_background">@color/white</color>

    <color name="albumset_background">@color/default_background</color>

    <color name="albumset_placeholder">@color/black_transparent_3</color>

    <color name="albumset_label_background">@color/black_transparent_4</color>

    <color name="albumset_label_background">@color/default_background</color>

    <color name="albumset_label_title">@color/white</color>

    <color name="albumset_label_count">@color/white</color>

    <color name="albumlist_label_title">@color/black_transparent_4</color>

    <color name="albumlist_label_title">@color/white</color>



    <color name="darker_transparent">@color/black_transparent_5</color>



    <!-- configuration for album page -->

    <color name="album_background">@color/white</color>

    <color name="album_placeholder">@color/white</color>

    <color name="album_background">@color/default_background</color>

    <color name="album_placeholder">@color/default_background</color>



    <!-- configuration for photo page -->

    <color name="photo_background">@color/black</color>
@@ -85,10 +84,10 @@ 
    <color name="edit_background">@color/black</color>

    <color name="edit_actionbar_background">@color/black</color>

    <color name="dialog_button_color">#009688</color>

    <color name="timeline_title_text_color">@color/black_transparent_4</color>

    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>

    <color name="timeline_title_background_color">@color/white</color>

    <color name="timeline_title_text_color">@color/white</color>

    <color name="timeline_title_number_text_color">@color/white</color>

    <color name="timeline_title_background_color">@color/default_background</color>



    <color name="navigation_accent_disabled">#747474</color>

    <color name="navigation_accent_enabled">@color/white</color>

    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_gray2</color>

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

</resources>