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

Commit b924c485 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Merge remote-tracking branch 'goog/ub-deskclock-huddle' 

Bug: 35488649
Test: lunch aosp_bullhead-userdebug && make -j24
Change-Id: I353f634cd877dd4ef6002d51b8a03954c894f265
parents b3c676f7 a37420cd

Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)



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
@@ -36,8 +35,7 @@ LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.p 
LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES := android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent

LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
@@ -56,6 +54,5 @@ 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.preference

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

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



include $(BUILD_PACKAGE)

AndroidManifest.xml

+14 −11
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ 
        android:icon="@mipmap/ic_launcher_alarmclock"

        android:label="@string/app_label"

        android:requiredForAllUsers="true"

        android:supportsRtl="true">

        android:supportsRtl="true"

        android:theme="@style/Theme.DeskClock">



        <!-- ============================================================== -->

        <!-- Main app components.                                           -->
@@ -58,7 +59,6 @@ 
            android:name=".DeskClock"

            android:label="@string/app_label"

            android:launchMode="singleTask"

            android:theme="@style/DeskClockTheme"

            android:windowSoftInputMode="adjustPan">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -68,13 +68,19 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".ringtone.RingtonePickerActivity"

            android:excludeFromRecents="true"

            android:taskAffinity=""

            android:theme="@style/Theme.DeskClock.RingtonePicker" />



        <activity

            android:name=".worldclock.CitySelectionActivity"

            android:excludeFromRecents="true"

            android:label="@string/cities_activity_title"

            android:parentActivityName=".DeskClock"

            android:taskAffinity=""

            android:theme="@style/CitiesTheme" />

            android:theme="@style/Theme.DeskClock.CitySelection" />



        <activity

            android:name=".settings.SettingsActivity"
@@ -82,7 +88,7 @@ 
            android:label="@string/settings"

            android:parentActivityName=".DeskClock"

            android:taskAffinity=""

            android:theme="@style/SettingsTheme" />

            android:theme="@style/Theme.DeskClock.Settings" />



        <activity

            android:name=".HandleShortcuts"
@@ -136,7 +142,6 @@ 
            android:resizeableActivity="false"

            android:showOnLockScreen="true"

            android:taskAffinity=""

            android:theme="@style/AlarmAlertFullScreenTheme"

            android:windowSoftInputMode="stateAlwaysHidden" />



        <activity
@@ -183,8 +188,7 @@ 
            android:launchMode="singleInstance"

            android:resizeableActivity="false"

            android:showOnLockScreen="true"

            android:taskAffinity=""

            android:theme="@style/ExpiredTimersActivityTheme" />

            android:taskAffinity="" />



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

        <receiver
@@ -218,15 +222,14 @@ 
            android:name=".ScreensaverActivity"

            android:excludeFromRecents="true"

            android:resizeableActivity="false"

            android:taskAffinity=""

            android:theme="@style/ScreensaverActivityTheme" />

            android:taskAffinity="" />



        <activity

            android:name=".settings.ScreensaverSettingsActivity"

            android:excludeFromRecents="true"

            android:label="@string/screensaver_settings"

            android:taskAffinity=""

            android:theme="@style/SettingsTheme" />

            android:theme="@style/Theme.DeskClock.Settings" />



        <service

            android:name=".Screensaver"

res/anim-v22/caret_toclose_animation_interpolator_0.xml

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

<!--

     Copyright (C) 2016 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.

-->

<pathInterpolator

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

    android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" />

res/anim-v22/caret_toopen_animation_interpolator_0.xml

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

<!--

     Copyright (C) 2016 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.

-->

<pathInterpolator

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

    android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" />

res/interpolator-v22/ic_lap_reset_animation_interpolator_0.xml→res/anim-v22/ic_ringtone_active_animation_interpolator.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


<pathInterpolator

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

    android:pathData="M 0.0,0.0 c 0.4,0.0 0.4,1.0 1.0,1.0" />
 
    android:pathData="M 0.0,0.0 c 0.33333333,0.0 0.66666667,1.0 1.0,1.0" />
 
 No newline at end of file