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

Commit e077ae21 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch 'merge_upstream_1.0.29' into 'main'

Merge upstream 1.0.29

See merge request e/apps/calendar!43
parents 9acf7664 5742e293
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ proguard/
# Log Files
*.log

# Android Studio
.idea/

# Android Studio Navigation editor temp files
.navigation/

+1 −1
Original line number Diff line number Diff line
image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:legacy"
image: registry.gitlab.e.foundation/e/apps/docker-android-apps-cicd:latest

stages:
- build
+5 −4
Original line number Diff line number Diff line
@@ -2,23 +2,24 @@
	path = external/colorpicker
	url = https://github.com/Etar-Group/android_frameworks_opt_colorpicker.git
	branch = rebase
[submodule "external/datetimepicker"]
	path = external/datetimepicker
	url = https://github.com/Etar-Group/android_frameworks_opt_datetimepicker.git
	branch = rebase
	ignore = untracked
[submodule "external/timezonepicker"]
	path = external/timezonepicker
	url = https://github.com/Etar-Group/standalone-calendar-timezonepicker.git
	branch = rebase
	ignore = untracked
[submodule "external/calendar"]
	path = external/calendar
	url = https://github.com/Etar-Group/android_frameworks_opt_calendar.git
	branch = master
	ignore = untracked
[submodule "external/ex"]
	path = external/ex
	url = https://github.com/Etar-Group/standalone-calendar-frameworks-ex.git
	branch = master
	ignore = untracked
[submodule "external/chips"]
	path = external/chips
	url = https://github.com/Etar-Group/android_frameworks_opt_chips.git
	branch = rebase
	ignore = untracked
+49 −18
Original line number Diff line number Diff line
@@ -18,17 +18,8 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="foundation.e.calendar"
    android:installLocation="auto"
    android:versionCode="20"
    android:versionName="1.0.18"
    >
<!--         android:sharedUserLabel="@string/app_label"> -->

    <!--
       NOTE: and original-package cannot be used, since the Eclair
       version was using a shared user ID with the provider.
    -->
    package="ws.xsoh.etar"
    android:installLocation="auto">

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -39,10 +30,32 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

    <queries>
        <package android:name="at.bitfire.davdroid" />
        <package android:name="com.etesync.syncadapter" />
        <package android:name="com.google.android.gm" />
        <package android:name="org.birthdayadapter" />
        <package android:name="org.decsync.cc" />

        <intent>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="http" />
        </intent>

        <intent>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="https" />
        </intent>
    </queries>

    <application android:name="com.android.calendar.CalendarApplication"
        android:requestLegacyExternalStorage="true"
        android:hardwareAccelerated="true"
        android:icon="@mipmap/ic_launcher"
        android:icon="@mipmap/ic_e_launcher"
        android:label="@string/standalone_app_label"
        android:taskAffinity="ws.xsoh.etar.task"
        android:requiredAccountType="*"
@@ -85,6 +98,7 @@

        <activity android:name="com.android.calendar.EventInfoActivity"
            android:theme="@style/Base.CalendarAppThemeWithActionBar"
            android:exported="true"
            android:parentActivityName="com.android.calendar.AllInOneActivity">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@@ -122,6 +136,7 @@

        <activity
            android:name="com.android.calendar.GoogleCalendarUriIntentFilter"
            android:exported="true"
            android:configChanges="orientation|keyboardHidden"
            android:label="@string/app_label"
            android:theme="@android:style/Theme.NoDisplay">
@@ -176,6 +191,7 @@
        </activity>

        <activity android:name="com.android.calendar.ImportActivity"
            android:exported="true"
            android:theme="@android:style/Theme.NoDisplay"
            android:launchMode="singleTop">
             <intent-filter>
@@ -185,6 +201,7 @@
                <data android:scheme="file" />
                <data android:mimeType="text/x-vcalendar" />
                <data android:mimeType="text/calendar" />
                <data android:mimeType="application/ics" />
            </intent-filter>
        </activity>

@@ -198,9 +215,9 @@
                android:resource="@xml/provider_paths"/>
        </provider>

        <!--<provider android:name="com.android.calendar.CalendarRecentSuggestionsProvider"
        <provider android:name="com.android.calendar.CalendarRecentSuggestionsProvider"
            android:exported="false"
            android:authorities="com.android.calendar.CalendarRecentSuggestionsProvider" />-->
            android:authorities="${applicationId}.CalendarRecentSuggestionsProvider" />

        <!-- Declarations for alerts/reminders -->
        <activity
@@ -222,7 +239,8 @@
            android:launchMode="singleInstance"
            android:theme="@style/customDialogStyle" />

        <receiver android:name="com.android.calendar.alerts.AlertReceiver">
        <receiver android:name="com.android.calendar.alerts.AlertReceiver"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.EVENT_REMINDER" />
                <action android:name="android.intent.action.TIME_SET" />
@@ -241,6 +259,17 @@
        <receiver android:name="com.android.calendar.alerts.GlobalDismissManager"
                  android:exported="false" />

        <receiver android:name="com.android.calendar.UpgradeReceiver"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
            </intent-filter>
        </receiver>

        <service android:name="com.android.calendar.alerts.AlertService" />

        <service android:name="com.android.calendar.alerts.DismissAlarmsService" />
@@ -248,7 +277,8 @@
        <service android:name="com.android.calendar.alerts.SnoozeAlarmsService" />

        <!-- Declarations for the widget -->
        <!--receiver android:name="com.android.calendar.widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">
        <receiver android:name="com.android.calendar.widget.CalendarAppWidgetProvider"
            android:exported="true">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                <action android:name="com.android.calendar.APPWIDGET_UPDATE" />
@@ -256,7 +286,8 @@
            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
        </receiver>

        <receiver android:name="com.android.calendar.widget.CalendarAppWidgetService$CalendarFactory">
        <receiver android:name="com.android.calendar.widget.CalendarAppWidgetService$CalendarFactory"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>
                <action android:name="android.intent.action.DATE_CHANGED"/>
@@ -279,7 +310,7 @@
        <service android:name="com.android.calendar.widget.CalendarAppWidgetService"
            android:exported="false"
            android:permission="android.permission.BIND_REMOTEVIEWS">
        </service-->
        </service>

        <service android:name="com.android.calendar.AsyncQueryServiceHelper" />

+5 −3
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ this app would be just a dream. So thanks to them!
- Week, day & agenda view.
- Uses Android calendar sync. Works with Google Calendar, Exchange, etc.
- Material designed.
- Support offline calendar
- -Agenda widget.- (disabled until #373 and #374 are fixed. Use [Calendar Widget](https://f-droid.org/de/packages/com.plusonelabs.calendar/) as an alternative.)
- Support offline calendar.
- Agenda widget.
- Multilingual UI.

## How to use Etar
Store your calendar on the phone only:
@@ -47,7 +48,8 @@ an event to which calendar it should be added.
### Important permissions Etar requires
- READ_EXTERNAL_STORAGE & WRITE_EXTERNAL_STORAGE  
->import and export ics calendar files  
- READ_CONTACTS  
- READ_CONTACTS(optional)  
  Is queried the first time an appointment is created and can be rejected. But then search and location suggestions no longer work.
->allows search and location suggestions when adding guests to an event  
- READ_CALENDAR & WRITE_CALENDAR  
->read and create calendar events
Loading