Merge "Fixing the build" into jb-mr1-dev

sganov · Android (Google) Code Review · commit 2fd6cb043901 · 2012-09-25T17:05:04.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -228,7 +228,7 @@ private void startSettingsActivity(Intent intent, boolean onlyProvisioned) {
         }
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
-        getService().animateCollapse();
+        getService().animateCollapseNotifications();
     }
 
     private void addUserTiles(ViewGroup parent, LayoutInflater inflater) {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ private void startSettingsActivity(Intent intent, boolean onlyProvisioned) {`
`228`	`228`	`}`
`229`	`229`	`intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TOP);`
`230`	`230`	`mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));`
`231`		`- getService().animateCollapse();`
	`231`	`+ getService().animateCollapseNotifications();`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`private void addUserTiles(ViewGroup parent, LayoutInflater inflater) {`