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

Commit 7dcb56e9 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'v1-s' 

Gallery: Integrate elib

See merge request !43
parents e76107d4 503e3e5a

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ android_app { 
    name: "Gallery2",



    static_libs: [

        "com.google.android.material_material",

        "androidx.annotation_annotation",

        "androidx.fragment_fragment",

        "androidx.heifwriter_heifwriter",
@@ -16,6 +15,7 @@ android_app { 
        "com.android.gallery3d.common2",

        "xmp_toolkit",

        "mp4parser",

        "elib",

    ],



    srcs: [

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 
        <activity android:name="com.android.gallery3d.app.TrimVideo"

                android:exported="true"

                android:label="@string/trim_label"

                android:theme="@style/Theme.MovieActivity"

                android:theme="@style/Theme.TrimVideo"

                android:configChanges="keyboardHidden|orientation|screenSize">

            <intent-filter android:label="@string/crop_label">

                <action android:name="com.android.camera.action.TRIM" />

res/color/bottom_nav_color.xml

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

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

    <item android:state_checked="true" android:color="@color/navigation_accent_enabled" />

    <item android:state_checked="false" android:color="@color/navigation_accent_disabled"/>

</selector>
 
 No newline at end of file

res/color/primary_text.xml

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


<!-- Copied from framework resource color/primary_text_holo_dark.xml -->

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

    <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_holo_dark"/>

    <item android:state_window_focused="false" android:color="@color/bright_foreground_holo_dark"/>

    <item android:state_pressed="true" android:color="@color/bright_foreground_holo_dark"/>

    <item android:state_selected="true" android:color="@color/bright_foreground_holo_dark"/>

    <item android:state_activated="true" android:color="@color/bright_foreground_holo_dark"/>

    <item android:color="@color/bright_foreground_holo_dark"/> <!-- not selected -->

    <item android:state_enabled="false" android:color="@color/color_default_secondary_text"/>

    <item android:state_window_focused="false" android:color="@color/color_default_secondary_text"/>

    <item android:state_pressed="true" android:color="@color/color_default_primary_text"/>

    <item android:state_selected="true" android:color="@color/color_default_primary_text"/>

    <item android:state_activated="true" android:color="@color/color_default_primary_text"/>

    <item android:color="@color/color_default_secondary_text"/> <!-- not selected -->

</selector>

res/drawable-hdpi/grid_pressed.9.png

+272 B (510 B)
Loading image diff...