summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2013-11-26 08:38:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-26 08:38:59 -0800
commit8e77393ae9b5ff99be06798311b3ec4362fbcb40 (patch)
tree2453c9487e63b15844e0ad647a3ca20556bd4513
parentc1c23780339c35ab2d88c905d91e290050b35435 (diff)
parent99ef026f48948f281467fcf4ce7ebbe15630ad45 (diff)
downloadframeworks_base-8e77393ae9b5ff99be06798311b3ec4362fbcb40.zip
frameworks_base-8e77393ae9b5ff99be06798311b3ec4362fbcb40.tar.gz
frameworks_base-8e77393ae9b5ff99be06798311b3ec4362fbcb40.tar.bz2
am 99ef026f: Merge "Keep PhoneStatusBar default constructor around."
* commit '99ef026f48948f281467fcf4ce7ebbe15630ad45': Keep PhoneStatusBar default constructor around.
-rw-r--r--packages/SystemUI/proguard.flags1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index ab45d99..1ff93d2 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -7,4 +7,5 @@
public void setGlowScale(float);
}
+-keep class com.android.systemui.statusbar.phone.PhoneStatusBar
-keep class com.android.systemui.statusbar.tv.TvStatusBar