Projects >> android-frameworks-base-with-screenshot-tweaks >>f2c4edba065f535aa766d9a7f024dc387b5a077e

Chunk
Conflicting content
    NotificationData mOngoing = new NotificationData();

public abstract class StatusBarService extends Service implements CommandQueue.Callbacks {
    static final String TAG = "StatusBarService";
<<<<<<< HEAD
=======
    static final boolean SPEW = true;

    public static final String ACTION_STATUSBAR_START
            = "com.android.internal.policy.statusbar.START";

    static final int EXPANDED_LEAVE_ALONE = -10000;
    static final int EXPANDED_FULL_OPEN = -10001;

    private static final int MSG_ANIMATE = 1000;
    private static final int MSG_ANIMATE_REVEAL = 1001;

    StatusBarPolicy mIconPolicy;

    CommandQueue mCommandQueue;
    IStatusBarService mBarService;

    int mIconSize;
    Display mDisplay;
    StatusBarView mStatusBarView;
    int mPixelFormat;
    H mHandler = new H();
    Object mQueueLock = new Object();

    // icons
    LinearLayout mIcons;
    IconMerger mNotificationIcons;
    LinearLayout mStatusIcons;

    // expanded notifications
    Dialog mExpandedDialog;
    ExpandedView mExpandedView;
    WindowManager.LayoutParams mExpandedParams;
    ScrollView mScrollView;
    View mNotificationLinearLayout;
    View mExpandedContents;
    // top bar
    TextView mNoNotificationsTitle;
    TextView mClearButton;
    // drag bar
    CloseDragHandle mCloseView;
    // ongoing
    TextView mOngoingTitle;
    LinearLayout mOngoingItems;
    // latest
    NotificationData mLatest = new NotificationData();
    TextView mLatestTitle;
    LinearLayout mLatestItems;
    // position
    int[] mPositionTmp = new int[2];
    boolean mExpanded;
    boolean mExpandedVisible;

    // the date view
    DateView mDateView;
>>>>>>> d23329df879993c71d9ba2d1e695f2dca8ef571c

    protected CommandQueue mCommandQueue;
    protected IStatusBarService mBarService;
Solution content
public abstract class StatusBarService extends Service implements CommandQueue.Callbacks {
    static final String TAG = "StatusBarService";

    protected CommandQueue mCommandQueue;
    protected IStatusBarService mBarService;
File
StatusBarService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation