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

Commit c927cca3 authored by Bill Yi's avatar Bill Yi Committed by Android Git Automerger
Browse files

am 0899e609: Merge remote-tracking branch \'goog/ub-deskclock-charm\' into HEAD 

* commit '0899e609': (110 commits)
  Allow authority to be set from build configuration - DO NOT MERGE
  Align "label" and text entry field.
  Import translations. DO NOT MERGE
  Re-style stopwatch notification to match that of timer.
  World Clocks should not appear to be touchable
  Set activated switch color in Settings to red.
  Import translations. DO NOT MERGE
  Use hardcoded locale to do toUpperCase to parse ClockStyle.
  Make dream setting ui fit to system screen.
  Use first char of city name as index if it's not provided.
  Polish Timer HUN
  Handle minor Alarm updates properly.
  Fix Timer notification UI.
  Never remove Timer times up notification.
  Import translations. DO NOT MERGE
  NumberPickers in settings now survive device rotations
  Simplify code that adds None as a valid timer ringtone
  Polish predismiss UI.
  Import translations. DO NOT MERGE
  Remove duplicate resources.
  ...
parents bc788300 0899e609

Android.mk

+8 −0
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
@@ -21,13 +25,17 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

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



include $(BUILD_PACKAGE)

AndroidManifest.xml

+42 −29
Original line number Diff line number Diff line
@@ -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"
@@ -52,7 +51,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">
@@ -66,7 +65,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"
@@ -78,7 +77,7 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="SettingsActivity"

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

                android:label="@string/settings"

                android:theme="@style/SettingsTheme"

                android:taskAffinity=""
@@ -89,12 +88,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>
@@ -238,41 +236,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.CITIES_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"
@@ -289,7 +296,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=""
@@ -341,6 +348,12 @@ 
                <action android:name="notif_times_up_plus_one" />

                <action android:name="notif_times_up_show" />

                <action android:name="notif_times_up_cancel" />

                <action android:name="notif_pause_timer" />

                <action android:name="notif_plus_one_timer" />

                <action android:name="notif_resume_timer" />

                <action android:name="notif_reset_timer" />

                <action android:name="notif_reset_all_timers" />

                <action android:name="notif_update" />

            </intent-filter>

        </receiver>

build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ android { 
        compile (project(":android-opt-datetimepicker")) {

            exclude module: "support-v4"

        }

        compile project(":support-design")

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

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

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

        compile project(":support-v13")

    }

}

res/color/bg_day_tint_color.xml

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



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

    <item android:state_activated="true" android:color="@color/clock_white" />

    <item android:state_checked="true" android:color="@color/clock_white" />

    <item android:color="@android:color/transparent" />

</selector>

res/drawable-hdpi/alarm_background_expanded.9.png

0 → 100644
+110 B
Loading image diff...