diff options
| author | hoffc <hoffc@codeaurora.org> | 2016-06-21 09:15:40 +0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:07:00 -0600 |
| commit | fed7388109ae06049b74c51e07e483606c9e9fe9 (patch) | |
| tree | c94bdf8ac4bf036b6e42db8190836221445341a4 | |
| parent | 3e89d79943669d12fa9e097c5f4dfe40b1d5f20a (diff) | |
| download | android_packages_apps_DeskClock-fed7388109ae06049b74c51e07e483606c9e9fe9.tar.gz android_packages_apps_DeskClock-fed7388109ae06049b74c51e07e483606c9e9fe9.tar.bz2 android_packages_apps_DeskClock-fed7388109ae06049b74c51e07e483606c9e9fe9.zip | |
DeskClock: Fix the FC when tapping worldclock imageButton
When tapping worldclock image button, clock will FC.
Change-Id: I8a2852cb8c8e3478eb604dc2585cef835e19bc2f
CRs-Fixed: 1031529
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | proguard-rules.pro | 31 |
2 files changed, 33 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index b40a57a2b..cff50bc6a 100644 --- a/Android.mk +++ b/Android.mk @@ -28,6 +28,7 @@ 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-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview @@ -41,5 +42,6 @@ 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 +LOCAL_PROGUARD_FLAG_FILES += proguard-rules.pro include $(BUILD_PACKAGE) diff --git a/proguard-rules.pro b/proguard-rules.pro new file mode 100644 index 000000000..e03d061c4 --- /dev/null +++ b/proguard-rules.pro @@ -0,0 +1,31 @@ +# Copyright (c) 2016, The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of The Linux Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Preference objects are inflated via reflection +-keep public class android.support.v7.widget.SearchView { + public <init>(android.content.Context); +} |