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

Commit 51be13aa authored by Justin Klaassen's avatar Justin Klaassen
Browse files

resolve merge conflicts of 2c535e27 to nyc-dev-plus-aosp 

Change-Id: Ibd496a79ecbb4f5e81e697cfb5cac0587192844e
parents 12e1d827 2c535e27

Android.mk

+12 −2
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ LOCAL_RESOURCE_DIR := packages/apps/DeskClock/res 
LOCAL_RESOURCE_DIR += frameworks/opt/datetimepicker/res



ifeq ($(TARGET_BUILD_APPS),)

LOCAL_RESOURCE_DIR += frameworks/support/design/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res

else

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res

endif



LOCAL_MODULE_TAGS := optional
@@ -18,17 +22,23 @@ LOCAL_SDK_VERSION := current 
LOCAL_PACKAGE_NAME := DeskClock

LOCAL_OVERRIDES_PACKAGES := AlarmClock



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES := $(call all-java-files-under, src gen)



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += messageformat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview



LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.design

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview

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

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



LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.pro

AndroidManifest.xml

+53 −67
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 


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

        package="com.android.deskclock"

        android:versionCode="410" android:versionName="4.1.0">

        android:versionCode="450" android:versionName="4.5.0">



    <original-package android:name="com.android.alarmclock" />

    <original-package android:name="com.android.deskclock" />



    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />

    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />



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

    <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -33,7 +33,6 @@ 
    <!-- READ_PHONE_STATE is required to determine when a phone call exists prior to M -->

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

    <!-- READ_EXTERNAL_STORAGE is required to play custom ringtones from the SD card prior to M -->

    <!-- It is also required to display user-friendly names for custom ringtones in the UI. -->

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



    <application android:label="@string/app_label"
@@ -53,7 +52,7 @@ 


        <activity android:name="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClock"

                android:theme="@style/DeskClockTheme"

                android:icon="@mipmap/ic_launcher_alarmclock"

                android:launchMode="singleTask">
@@ -67,7 +66,7 @@ 
        <activity-alias android:name="DockClock"

                android:targetActivity="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClock"

                android:theme="@style/DeskClockTheme"

                android:icon="@mipmap/ic_launcher_alarmclock"

                android:launchMode="singleTask"

                android:enabled="@bool/config_dockAppEnabled"
@@ -79,7 +78,7 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="SettingsActivity"

        <activity android:name=".settings.SettingsActivity"

                android:label="@string/settings"

                android:theme="@style/SettingsTheme"

                android:taskAffinity=""
@@ -90,12 +89,11 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".worldclock.CitiesActivity"

        <activity android:name=".worldclock.CitySelectionActivity"

                android:label="@string/cities_activity_title"

                android:theme="@style/CitiesTheme"

                android:taskAffinity=""

                android:excludeFromRecents="true"

                >

                android:excludeFromRecents="true">

            <intent-filter>

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

            </intent-filter>
@@ -195,7 +193,7 @@ 
                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.deskclock.action.STOP_TIMER" />

                <action android:name="com.android.deskclock.action.PAUSE_TIMER" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>
@@ -220,7 +218,7 @@ 
                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.deskclock.action.STOP_STOPWATCH" />

                <action android:name="com.android.deskclock.action.PAUSE_STOPWATCH" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>
@@ -244,41 +242,50 @@ 
                <action android:name="android.intent.action.TIME_SET" />

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

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

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

            </intent-filter>

        </receiver>



        <receiver android:name="com.android.alarmclock.AnalogAppWidgetProvider" android:label="@string/analog_gadget"

           android:icon="@mipmap/ic_launcher_alarmclock">

        <receiver

            android:name="com.android.alarmclock.AnalogAppWidgetProvider"

            android:icon="@mipmap/ic_launcher_alarmclock"

            android:label="@string/analog_gadget">

            <intent-filter>

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

            </intent-filter>

            <meta-data android:name="android.appwidget.oldName" android:value="com.android.deskclock.AnalogAppWidgetProvider" />

            <meta-data android:name="android.appwidget.provider" android:resource="@xml/analog_appwidget" />



            <meta-data

                android:name="android.appwidget.oldName"

                android:value="com.android.deskclock.AnalogAppWidgetProvider"/>

            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/analog_appwidget"/>

        </receiver>



        <receiver android:name="com.android.alarmclock.DigitalAppWidgetProvider" android:label="@string/digital_gadget"

           android:icon="@mipmap/ic_launcher_alarmclock">

        <receiver

            android:name="com.android.alarmclock.DigitalAppWidgetProvider"

            android:icon="@mipmap/ic_launcher_alarmclock"

            android:label="@string/digital_gadget">

            <intent-filter>

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

                <action android:name="com.android.deskclock.ON_QUARTER_HOUR" />

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

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

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

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

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

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

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

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

                <action android:name="com.android.deskclock.DIGITAL_WIDGET_CHANGED"/>

                <action android:name="com.android.deskclock.ON_QUARTER_HOUR"/>

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

                <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED"/>

                <action android:name="com.android.deskclock.worldclock.update" />

            </intent-filter>

            <meta-data android:name="android.appwidget.provider" android:resource="@xml/digital_appwidget" />

            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/digital_appwidget"/>

        </receiver>



        <service android:name="com.android.alarmclock.DigitalAppWidgetService"

             android:permission="android.permission.BIND_REMOTEVIEWS"

             android:exported="false" />



        <receiver android:name="com.android.alarmclock.DigitalWidgetViewsFactory"

             android:exported="false" />



        <!-- Dream (screensaver) implementation -->

        <service android:name="Screensaver"

            android:exported="true"
@@ -295,7 +302,7 @@ 
        </service>



        <!-- Settings activity for screensaver -->

        <activity android:name=".ScreensaverSettingsActivity"

        <activity android:name=".settings.ScreensaverSettingsActivity"

                android:label="@string/screensaver_settings"

                android:theme="@style/SettingsTheme"

                android:taskAffinity=""
@@ -312,54 +319,33 @@ 
            android:label="@string/dismiss_alarm"

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



        <!-- This activity is basically like the TimerFragment in DeskClock

         but only during lock screen

         so that it only has the fired timers -->

        <activity android:name="com.android.deskclock.timer.TimerAlertFullScreen"

        <!-- This activity displays only the timers that have expired with only a reset button

         present. This makes the activity appropriate for display above the lock screen so that

         users have the limited ability to silence expired timers but nothing else. -->

        <activity android:name=".timer.ExpiredTimersActivity"

                android:excludeFromRecents="true"

                android:theme="@style/TimerAlertFullScreenTheme"

                android:theme="@style/ExpiredTimersActivityTheme"

                android:launchMode="singleInstance"

                android:showOnLockScreen="true"

                android:taskAffinity=""

                android:configChanges="screenSize|keyboardHidden|keyboard|navigation"/>



        <service android:name="TimerRingService"

                android:exported="false"

                android:description="@string/timer_ring_service_desc">

            <intent-filter>

                <action android:name="com.android.deskclock.TIMER_ALERT" />

            </intent-filter>

        </service>



        <!-- Legacy broadcast receiver that honors old scheduled timers across app upgrade. -->

        <receiver android:name="com.android.deskclock.timer.TimerReceiver"

                  android:exported="false">

            <intent-filter>

                <action android:name="start_timer" />

                <action android:name="stop_timer" />

                <action android:name="delete_timer" />

                <action android:name="reset_timer" />

                <action android:name="times_up" />

                <action android:name="timer_done" />

                <action android:name="timer_update" />

                <action android:name="notif_in_use_show" />

                <action android:name="notif_in_use_cancel" />

                <action android:name="notif_times_up_stop" />

                <action android:name="notif_times_up_plus_one" />

                <action android:name="notif_times_up_show" />

                <action android:name="notif_times_up_cancel" />

            </intent-filter>

        </receiver>



        <service android:name="com.android.deskclock.stopwatch.StopwatchService"

        <service android:name=".timer.TimerService"

                 android:exported="false"

                 android:description="@string/timer_service_desc">

        </service>



        <service android:name=".stopwatch.StopwatchService"

                android:exported="false"

                android:description="@string/stopwatch_service_desc">

            <intent-filter>

                <action android:name="start_stopwatch" />

                <action android:name="lap_stopwatch" />

                <action android:name="stop_stopwatch" />

                <action android:name="reset_stopwatch" />

                <action android:name="share_stopwatch" />

            </intent-filter>

        </service>

    </application>

</manifest>

build.gradle

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

* Copyright (C) 2015 The Android Open Source Project

*

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

*

*   http://www.apache.org/licenses/LICENSE-2.0

*

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/



apply plugin: "com.android.application"



android {

    sourceSets {

        main {

            manifest.srcFile "AndroidManifest.xml"

            java.srcDir "src"

            res.srcDir "res"

            assets.srcDir "assets"

        }

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_7

        targetCompatibility JavaVersion.VERSION_1_7

    }



    dependencies {

        compile (project(":android-opt-datetimepicker")) {

            exclude module: "support-v4"

        }

        compile project(":support-v7-appcompat")

        compile project(":support-v7-gridlayout")

        compile project(":support-v13")

    }

}

src/com/android/deskclock/AlarmListeners.java→gen/com/android/deskclock/BuildConfig.java

+4 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -11,28 +11,11 @@ 
 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 * limitations under the License.

 */



package com.android.deskclock;



import android.view.View;



/** Change me */

public class AlarmListeners {



    public static class DigitalClockClickListener implements View.OnClickListener {



        private int alarmId;



        public DigitalClockClickListener(int alarmId) {

            this.alarmId = alarmId;

        }



        @Override

        public void onClick(View view) {



        }

    }



public final class BuildConfig {

  public static final String APPLICATION_ID = "com.android.deskclock";

}

res/animator-v22/ic_alarm_animation_button.xml

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

<!--

     Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

     android:ordering="sequentially">

    <objectAnimator

        android:duration="33"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="33"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="0"/>

</set>
 
 No newline at end of file