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

Commit 0c491c8d authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Clean up status bar date & time code" into cm-10.2

parents 26232efc 99ba3737
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ public class PhoneStatusBar extends BaseStatusBar {

    // top bar
    View mNotificationPanelHeader;
    View mDateTimeView;
    View mClearButton;
    ImageView mSettingsButton, mNotificationButton;

@@ -253,9 +252,6 @@ public class PhoneStatusBar extends BaseStatusBar {
    int[] mPositionTmp = new int[2];
    boolean mExpandedVisible;

    // the date view
    DateView mDateView;

    // for immersive activities
    private IntruderAlertView mIntruderAlertView;

@@ -536,13 +532,10 @@ public class PhoneStatusBar extends BaseStatusBar {
        mClearButton.setAlpha(0f);
        mClearButton.setVisibility(View.INVISIBLE);
        mClearButton.setEnabled(false);
        mDateView = (DateView)mStatusBarWindow.findViewById(R.id.date);

        mHasSettingsPanel = res.getBoolean(R.bool.config_hasSettingsPanel);
        mHasFlipSettings = res.getBoolean(R.bool.config_hasFlipSettingsPanel);

        mDateTimeView = mNotificationPanelHeader.findViewById(R.id.datetime);

        mSettingsButton = (ImageView) mStatusBarWindow.findViewById(R.id.settings_button);
        if (mSettingsButton != null) {
            mSettingsButton.setOnClickListener(mSettingsButtonListener);
+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.ContentUris;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Canvas;
import android.net.Uri;
import android.provider.CalendarContract;
import android.util.AttributeSet;
@@ -31,7 +30,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
import android.view.ViewParent;
import android.widget.RelativeLayout;
import android.widget.TextView;

import com.android.systemui.R;