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

Commit 9e9ee5d5 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.3_r2.1' into cm-10.2 

Android 4.3 release 2.1

Conflicts:
	res/values-cs/strings.xml
	src/com/android/calendar/GeneralPreferences.java
	src/com/android/calendar/alerts/AlertReceiver.java
	src/com/android/calendar/alerts/AlertService.java
	src/com/android/calendar/alerts/AlertUtils.java

Change-Id: Ieb99951c15ff0eb484341aa07d007d0a7d14dac2
parents b2134103 71b49345

.classpath

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

<classpath>

	<classpathentry kind="src" path="src_ex_common"/>

	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>

	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>

	<classpathentry kind="src" path="src"/>

	<classpathentry kind="src" path="gen"/>

	<classpathentry kind="output" path="bin/classes"/>

</classpath>

.gitignore

+3 −0
Original line number Diff line number Diff line 
bin/

gen/

.project

res/.DS_Store

res/drawable-hdpi/.DS_Store

Android.mk

+21 −10
Original line number Diff line number Diff line
@@ -3,8 +3,11 @@ include $(CLEAR_VARS) 


# Include res dir from chips

chips_dir := ../../../frameworks/ex/chips/res

res_dirs := $(chips_dir) res

src_dirs := src extensions_src

color_picker_dir := ../../../frameworks/opt/colorpicker/res

datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res

timezonepicker_dir := ../../../frameworks/opt/timezonepicker/res

res_dirs := $(chips_dir) $(color_picker_dir) $(datetimepicker_dir) $(timezonepicker_dir) res

src_dirs := src



LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.*
@@ -22,18 +25,26 @@ LOCAL_SRC_FILES := $(call all-java-files-under,$(src_dirs)) 
LOCAL_STATIC_JAVA_LIBRARIES := \

        android-common \

        android-common-chips \

        colorpicker \

        android-opt-datetimepicker \

        android-opt-timezonepicker \

        android-support-v4 \

        calendar-common



LOCAL_SDK_VERSION := current



LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))



LOCAL_PACKAGE_NAME := Calendar



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES := proguard.flags \

                             ../../../frameworks/opt/datetimepicker/proguard.flags



LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips

LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker

LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker

LOCAL_AAPT_FLAGS += --extra-packages com.android.timezonepicker



include $(BUILD_PACKAGE)

AndroidManifest.xml

+12 −3
Original line number Diff line number Diff line
@@ -36,14 +36,16 @@ 
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.USE_CREDENTIALS" />

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />

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

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



    <application android:name="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:backupAgent="com.android.calendar.CalendarBackupAgent"

            android:requiredAccountType="*" >



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

                android:value="AEdPqrEAAAAIM256oVOGnuSel5QKDpL8je_T65ZI8rFnDinssA" />
@@ -171,10 +173,12 @@ 
        <receiver android:name=".alerts.AlertReceiver">

            <intent-filter>

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

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

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

                <data android:scheme="content" />

            </intent-filter>

            <intent-filter>

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

            </intent-filter>

            <intent-filter>

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

            </intent-filter>
@@ -185,12 +189,17 @@ 
            </intent-filter>

        </receiver>



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

                  android:exported="false" />



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



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



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



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



        <!-- Declarations for the widget -->

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

            <intent-filter>

assets/backward

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../../external/timezonepicker-support/backward
 
 No newline at end of file