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

Merge "Fix QS translation on tablets" into nyc-dev

Browse Source 
am: 57f4376d33

* commit '57f4376d336652685786b8978fecdae56369ea34':
  Fix QS translation on tablets
This commit is contained in:
Jason Monk
2016-03-08 19:04:39 +00:00
committed by android-build-merger
parent ebbe844952 57f4376d33
commit cf82bc163c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ public class NotificationPanelView extends PanelView implements
private KeyguardUserSwitcher mKeyguardUserSwitcher;
private KeyguardStatusBarView mKeyguardStatusBar;
protected QSContainer mQsContainer;
private DensityContainer mQsDensityContainer;
private KeyguardStatusView mKeyguardStatusView;
private TextView mClockView;
private View mReserveNotificationSpace;
@@ -217,8 +218,8 @@ public class NotificationPanelView extends PanelView implements
super.onFinishInflate();
mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header);
mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);
DensityContainer container = (DensityContainer) findViewById(R.id.qs_density_container);
container.addInflateListener(new InflateListener() {
mQsDensityContainer = (DensityContainer) findViewById(R.id.qs_density_container);
mQsDensityContainer.addInflateListener(new InflateListener() {
@Override
public void onInflated(View v) {
mQsContainer = (QSContainer) v.findViewById(R.id.quick_settings_container);
@@ -2209,7 +2210,7 @@ public class NotificationPanelView extends PanelView implements
protected void setVerticalPanelTranslation(float translation) {
mNotificationStackScroller.setTranslationX(translation);
mQsContainer.setTranslationX(translation);
mQsDensityContainer.setTranslationX(translation);
}
protected void updateStackHeight(float stackHeight) {