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

Commit f7a5edad authored by Dominik Schürmann's avatar Dominik Schürmann
Browse files

Fix manifest and import of R

parent 2fb27e4d

AndroidManifest.xml

+35 −35
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
*/

-->

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

        package="com.android.calendar"

        android:sharedUserLabel="@string/app_label">

    package="org.sufficientlysecure.standalonecalendar" >

<!--         android:sharedUserLabel="@string/app_label"> -->



    <!--

       NOTE: and original-package cannot be used, since the Eclair
@@ -40,18 +40,18 @@ 
    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />

    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="18"></uses-sdk>



    <application android:name="CalendarApplication"

    <application android:name="com.android.calendar.CalendarApplication"

            android:label="@string/app_label" android:icon="@mipmap/ic_launcher_calendar"

            android:taskAffinity="android.task.calendar"

            android:hardwareAccelerated="true"

            android:backupAgent="com.android.calendar.CalendarBackupAgent"

            >

                android:hardwareAccelerated="true" >

<!--             android:backupAgent="com.android.calendar.CalendarBackupAgent" -->

<!--             > -->



        <meta-data android:name="com.google.android.backup.api_key"

                android:value="AEdPqrEAAAAIM256oVOGnuSel5QKDpL8je_T65ZI8rFnDinssA" />

        <!--<meta-data android:name="com.google.android.backup.api_key"

                android:value="AEdPqrEAAAAIM256oVOGnuSel5QKDpL8je_T65ZI8rFnDinssA" />-->



        <activity

            android:name="AllInOneActivity"

            android:name="com.android.calendar.AllInOneActivity"

            android:theme="@style/CalendarTheme.WithActionBar"

            android:launchMode="singleTask"

            android:windowSoftInputMode="adjustPan"
@@ -71,12 +71,12 @@ 
            </intent-filter>

        </activity>



        <activity-alias android:name="LaunchActivity"

            android:targetActivity=".AllInOneActivity"

        <activity-alias android:name="com.android.calendar.LaunchActivity"

            android:targetActivity="com.android.calendar.AllInOneActivity"

            android:exported="true">

        </activity-alias>



        <activity android:name="EventInfoActivity"

        <activity android:name="com.android.calendar.EventInfoActivity"

            android:parentActivityName="com.android.calendar.AllInOneActivity"

            android:theme="@style/CalendarTheme.WithActionBar">

            <intent-filter>
@@ -92,12 +92,12 @@ 
                android:value="com.android.calendar.AllInOneActivity" />

        </activity>



        <activity android:name=".event.EditEventActivity"

        <activity android:name="com.android.calendar.event.EditEventActivity"

            android:theme="@style/CalendarTheme.WithActionBar">

        </activity>



        <activity-alias android:name="EditEventActivity"

            android:targetActivity=".event.EditEventActivity"

        <activity-alias android:name="com.android.calendar.EditEventActivity"

            android:targetActivity="com.android.calendar.event.EditEventActivity"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.EDIT" />
@@ -113,7 +113,7 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label"

        <activity android:name="com.android.calendar.GoogleCalendarUriIntentFilter" android:label="@string/app_label"

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

            android:configChanges="orientation|keyboardHidden">
@@ -129,15 +129,15 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".selectcalendars.SelectVisibleCalendarsActivity"

        <activity android:name="com.android.calendar.selectcalendars.SelectVisibleCalendarsActivity"

            android:label="@string/select_visible_calendars_title"

            android:theme="@android:style/Theme.Holo.Light"/>



        <activity android:name=".selectcalendars.SelectSyncedCalendarsMultiAccountActivity"

        <activity android:name="com.android.calendar.selectcalendars.SelectSyncedCalendarsMultiAccountActivity"

            android:label="@string/select_synced_calendars_title"

            android:theme="@android:style/Theme.Holo.Light"/>



        <activity android:name="CalendarSettingsActivity" android:label="@string/preferences_title"

        <activity android:name="com.android.calendar.CalendarSettingsActivity" android:label="@string/preferences_title"

            android:theme="@android:style/Theme.Holo.Light"/>



        <!-- Declarations for search -->
@@ -145,7 +145,7 @@ 
        <meta-data android:name="android.app.default_searchable"

            android:value="com.android.calendar.SearchActivity"/>



        <activity android:name="SearchActivity" android:label="@string/search_title"

        <activity android:name="com.android.calendar.SearchActivity" android:label="@string/search_title"

            android:launchMode="singleTop" android:theme="@style/CalendarTheme.WithActionBar"

            android:windowSoftInputMode="stateAlwaysHidden"

            android:exported="true">
@@ -155,22 +155,22 @@ 
            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>

        </activity>



        <provider android:name=".CalendarRecentSuggestionsProvider"

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

            android:exported="false"

            android:authorities="com.android.calendar.CalendarRecentSuggestionsProvider" />

            android:authorities="com.android.calendar.CalendarRecentSuggestionsProvider" />-->



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

        <activity android:name=".alerts.AlertActivity" android:launchMode="singleInstance"

        <activity android:name="com.android.calendar.alerts.AlertActivity" android:launchMode="singleInstance"

             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" />



        <activity android:name=".alerts.QuickResponseActivity" android:launchMode="singleInstance"

        <activity android:name="com.android.calendar.alerts.QuickResponseActivity" android:launchMode="singleInstance"

             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true"

             android:label="@string/quick_response_dialog_title" />



        <activity android:name=".alerts.SnoozeDelayActivity" android:launchMode="singleInstance"

        <activity android:name="com.android.calendar.alerts.SnoozeDelayActivity" android:launchMode="singleInstance"

             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" />



        <receiver android:name=".alerts.AlertReceiver">

        <receiver android:name="com.android.calendar.alerts.AlertReceiver">

            <intent-filter>

                <action android:name="android.intent.action.EVENT_REMINDER" />

                <action android:name="android.intent.action.TIME_SET" />
@@ -189,19 +189,19 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".alerts.GlobalDismissManager"

        <receiver android:name="com.android.calendar.alerts.GlobalDismissManager"

                  android:exported="false" />



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

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



        <service android:name=".alerts.DismissAlarmsService" />

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



        <service android:name=".alerts.SnoozeAlarmsService" />

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



        <service android:name=".alerts.InitAlarmsService" />

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



        <!-- Declarations for the widget -->

        <receiver android:name=".widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">

        <receiver android:name="com.android.calendar.widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

                <action android:name="com.android.calendar.APPWIDGET_UPDATE" />
@@ -209,7 +209,7 @@ 
            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />

        </receiver>



        <receiver android:name=".widget.CalendarAppWidgetService$CalendarFactory">

        <receiver android:name="com.android.calendar.widget.CalendarAppWidgetService$CalendarFactory">

            <intent-filter>

                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>

                <action android:name="android.intent.action.DATE_CHANGED"/>
@@ -229,12 +229,12 @@ 
            </intent-filter>

        </receiver>



        <service android:name=".widget.CalendarAppWidgetService"

        <service android:name="com.android.calendar.widget.CalendarAppWidgetService"

            android:permission="android.permission.BIND_REMOTEVIEWS"

            android:exported="false">

        </service>



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

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



    </application>

</manifest>

fix_strings.py→fix_strings_and_import.py

+21 −0
Original line number Diff line number Diff line 
import os, fnmatch, re



def findReplace(directory, filePattern):

def findReplace(directory, find, replace, filePattern):

    for path, dirs, files in os.walk(os.path.abspath(directory)):

        for filename in fnmatch.filter(files, filePattern):

            filepath = os.path.join(path, filename)

            print(filepath)

            with open(filepath) as f:

                s = f.read()

            s = re.sub(r'(<string name=\"custom\" product=\"tablet\".*>).*(</string>)', r'', s)

            s = re.sub(find, replace, s)

            with open(filepath, "w") as f:

                f.write(s)



findReplace("res", "strings.xml")
 
# gradle can't compile if two strings are defined with the same name, this removes one useless occurence

findReplace("res", r"(<string name=\"custom\" product=\"tablet\".*>).*(</string>)", r"", "strings.xml")



# change import of generated R file to fix packagename

findReplace("src", r"import com.android.calendar.R;", r"import org.sufficientlysecure.standalonecalendar.R;", "*.java")



# add R import to com.android.calendar

findReplace("src", r"package com.android.calendar;", r"package com.android.calendar;\n\nimport org.sufficientlysecure.standalonecalendar.R;", "*.java")

src/com/android/calendar/AboutPreferences.java

+3 −1
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ 


package com.android.calendar;



import org.sufficientlysecure.standalonecalendar.R;



import android.app.Activity;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.preference.PreferenceFragment;



import com.android.calendar.R;

import org.sufficientlysecure.standalonecalendar.R;



public class AboutPreferences extends PreferenceFragment {

    private static final String BUILD_VERSION = "build_version";

src/com/android/calendar/AbstractCalendarActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.calendar;



import org.sufficientlysecure.standalonecalendar.R;



import android.app.Activity;



public abstract class AbstractCalendarActivity extends Activity {

src/com/android/calendar/AllInOneActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.calendar;



import org.sufficientlysecure.standalonecalendar.R;



import static android.provider.CalendarContract.EXTRA_EVENT_ALL_DAY;

import static android.provider.CalendarContract.EXTRA_EVENT_BEGIN_TIME;

import static android.provider.CalendarContract.EXTRA_EVENT_END_TIME;