Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65733bd5 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Extract out interface for StatusBarHeader"

parents 14acf721 0e1101d5

packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.systemui.statusbar.phone;



import android.content.Context;

import android.util.AttributeSet;

import android.widget.RelativeLayout;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.NetworkControllerImpl;

import com.android.systemui.statusbar.policy.NextAlarmController;

import com.android.systemui.statusbar.policy.UserInfoController;



public abstract class BaseStatusBarHeader extends RelativeLayout implements

        NetworkControllerImpl.EmergencyListener {



    public BaseStatusBarHeader(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    public abstract int getCollapsedHeight();

    public abstract int getExpandedHeight();

    public abstract void setExpanded(boolean b);

    public abstract void setExpansion(float headerExpansionFraction);

    public abstract void setListening(boolean listening);

    public abstract void updateEverything();

    public abstract void setActivityStarter(ActivityStarter activityStarter);

    public abstract void setQSPanel(QSPanel qSPanel);

    public abstract void setBatteryController(BatteryController batteryController);

    public abstract void setNextAlarmController(NextAlarmController nextAlarmController);

    public abstract void setUserInfoController(UserInfoController userInfoController);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class NotificationPanelView extends PanelView implements 
    public static final long DOZE_ANIMATION_DURATION = 700;



    private KeyguardAffordanceHelper mAfforanceHelper;

    private StatusBarHeaderView mHeader;

    private BaseStatusBarHeader mHeader;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private KeyguardStatusBarView mKeyguardStatusBar;

    private QSContainer mQsContainer;
@@ -232,7 +232,7 @@ public class NotificationPanelView extends PanelView implements 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mHeader = (StatusBarHeaderView) findViewById(R.id.header);

        mHeader = (BaseStatusBarHeader) findViewById(R.id.header);

        mHeader.setOnClickListener(this);

        mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header);

        mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);

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

+2 −2
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private QSPanel mQSPanel;



    // top bar

    StatusBarHeaderView mHeader;

    BaseStatusBarHeader mHeader;

    KeyguardStatusBarView mKeyguardStatusBar;

    View mKeyguardStatusView;

    KeyguardBottomAreaView mKeyguardBottomArea;
@@ -800,7 +800,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mStatusBarView.setScrimController(mScrimController);

        mDozeScrimController = new DozeScrimController(mScrimController, context);



        mHeader = (StatusBarHeaderView) mStatusBarWindow.findViewById(R.id.header);

        mHeader = (BaseStatusBarHeader) mStatusBarWindow.findViewById(R.id.header);

        mHeader.setActivityStarter(this);

        mKeyguardStatusBar = (KeyguardStatusBarView) mStatusBarWindow.findViewById(R.id.keyguard_header);

        mKeyguardStatusView = mStatusBarWindow.findViewById(R.id.keyguard_status_view);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.text.NumberFormat; 
/**

 * The view to manage the header area in the expanded status bar.

 */

public class StatusBarHeaderView extends RelativeLayout implements View.OnClickListener,

public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnClickListener,

        BatteryController.BatteryStateChangeCallback, NextAlarmController.NextAlarmChangeCallback,

        EmergencyListener, TunerService.Tunable {