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

Commit 82c14f0b authored by Suhail Alkowaileet's avatar Suhail Alkowaileet
Browse files

Change package name.

parent e3ee56b0

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
*/

-->

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

    package="org.sufficientlysecure.standalonecalendar" 

    package="ws.xsoh.etar"

    android:installLocation="auto"

    android:versionCode="3"

    android:versionName="standalone-1.2" >

    android:versionCode="4"

    android:versionName="1.0">

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



    <!--

fix_strings_and_import.py

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ def findReplace(directory, find, replace, filePattern): 
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")

findReplace("src", r"import com.android.calendar.R;", r"import ws.xsoh.etar.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")
 
findReplace("src", r"package com.android.calendar;", r"package com.android.calendar;\n\nimport ws.xsoh.etar.R;", "*.java")

src/com/android/calendar/AboutPreferences.java

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


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 org.sufficientlysecure.standalonecalendar.R;

import ws.xsoh.etar.R;



public class AboutPreferences extends PreferenceFragment {

    private static final String BUILD_VERSION = "build_version";

src/com/android/calendar/AllInOneActivity.java

+6 −6
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ import com.android.calendar.agenda.AgendaFragment; 
import com.android.calendar.month.MonthByWeekFragment;

import com.android.calendar.selectcalendars.SelectVisibleCalendarsFragment;



import org.sufficientlysecure.standalonecalendar.R;



import java.io.IOException;

import java.util.List;

import java.util.Locale;

import java.util.TimeZone;



import ws.xsoh.etar.R;



import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS;

import static android.provider.CalendarContract.EXTRA_EVENT_ALL_DAY;

import static android.provider.CalendarContract.EXTRA_EVENT_BEGIN_TIME;
@@ -192,20 +192,20 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH 
    private MenuItem mControlsMenu;

    private Menu mOptionsMenu;

    private QueryHandler mHandler;

    // runs every midnight/time changes and refreshes the today icon

    private final Runnable mTimeChangesUpdater = new Runnable() {

    private final Runnable mHomeTimeUpdater = new Runnable() {

        @Override

        public void run() {

            mTimeZone = Utils.getTimeZone(AllInOneActivity.this, mHomeTimeUpdater);

            updateSecondaryTitleFields(-1);

            AllInOneActivity.this.invalidateOptionsMenu();

            Utils.setMidnightUpdater(mHandler, mTimeChangesUpdater, mTimeZone);

        }

    };

    private final Runnable mHomeTimeUpdater = new Runnable() {

    // runs every midnight/time changes and refreshes the today icon

    private final Runnable mTimeChangesUpdater = new Runnable() {

        @Override

        public void run() {

            mTimeZone = Utils.getTimeZone(AllInOneActivity.this, mHomeTimeUpdater);

            updateSecondaryTitleFields(-1);

            AllInOneActivity.this.invalidateOptionsMenu();

            Utils.setMidnightUpdater(mHandler, mTimeChangesUpdater, mTimeZone);

        }

src/com/android/calendar/AllInOneMenuExtensionsInterface.java

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


package com.android.calendar;



import org.sufficientlysecure.standalonecalendar.R;



import android.content.Context;

import android.view.Menu;

import android.view.MenuItem;