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

Commit a4abf42b authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'q-e_calendar_patches' into 'v1-q' 

Q: Merge /e/ patches to lineage calendar

See merge request e/os/android_packages_apps_etar!3
parents 1a3b940f c883f8ef

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -30,3 +30,6 @@ proguard/ 


# Android Studio captures folder

captures/



# Intellij

.idea/

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ android_app { 


    aaptflags: [

        "--rename-manifest-package",

        "org.lineageos.etar",

        "foundation.e.calendar",

    ],

}

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/app_label"

        android:taskAffinity="org.lineageos.etar.task"

        android:taskAffinity="foundation.e.calendar.task"

        android:requiredAccountType="*"

        android:usesCleartextTraffic="false"

        android:theme="@style/CalendarAppTheme">
@@ -180,7 +180,7 @@ 


        <provider

            android:name="androidx.core.content.FileProvider"

            android:authorities="org.lineageos.etar.provider"

            android:authorities="foundation.e.calendar.provider"

            android:exported="false"

            android:grantUriPermissions="true">

            <meta-data
@@ -190,7 +190,7 @@ 


        <provider android:name="com.android.calendar.CalendarRecentSuggestionsProvider"

            android:exported="false"

            android:authorities="org.lineageos.etar.CalendarRecentSuggestionsProvider" />

            android:authorities="foundation.e.calendar.CalendarRecentSuggestionsProvider" />



        <!-- Declarations for alerts/reminders -->

        <activity

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ android { 
    buildToolsVersion '29.0.2'



    defaultConfig {

        minSdkVersion 19

        minSdkVersion 29

        targetSdkVersion 30

        versionCode 25

        versionName "1.0.23"

res/drawable/actionbar_cursor.xml

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

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

    android:shape="rectangle" >

    <solid android:color="@color/colorPrimaryDark" />

    <solid android:color="@color/colorAccent" />

    <size android:width="2dp" />

</shape>
 
 No newline at end of file