Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

Browse Source
This commit is contained in:
Deepanshu Gupta
2016-02-01 22:57:10 +00:00
committed by android-build-merger
parent 08df538482 f43491f8f2
commit 14889dd6cd
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -93,7 +93,7 @@ public class NotificationPanelView extends PanelView implements
public static final long DOZE_ANIMATION_DURATION = 700;
private KeyguardAffordanceHelper mAfforanceHelper;
private BaseStatusBarHeader mHeader;
protected BaseStatusBarHeader mHeader;
private KeyguardUserSwitcher mKeyguardUserSwitcher;
private KeyguardStatusBarView mKeyguardStatusBar;
private QSContainer mQsContainer;
@@ -2404,7 +2404,7 @@ public class NotificationPanelView extends PanelView implements
setVerticalPanelTranslation(0f);
}
private void setVerticalPanelTranslation(float translation) {
protected void setVerticalPanelTranslation(float translation) {
mNotificationStackScroller.setTranslationX(translation);
mScrollView.setTranslationX(translation);
mHeader.setTranslationX(translation);

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -795,7 +795,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mKeyguardBottomArea.getLockIcon());
mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);
// set the inital view visibility
// set the initial view visibility
setAreThereNotifications();
mIconController = new StatusBarIconController(
@@ -2339,8 +2339,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
Animator mScrollViewAnim, mClearButtonAnim;
@Override
public void animateExpandNotificationsPanel() {
if (SPEW) Log.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible);