| Chunk |
|---|
| Conflicting content |
|---|
TextView mClearButton;
public abstract class StatusBarService extends Service implements CommandQueue.Callbacks {
static final String TAG = "StatusBarService";
<<<<<<< HEAD
=======
static final boolean SPEW_ICONS = false;
static final boolean SPEW = false;
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;
// drag bar
CloseDragHandle mCloseView;
// ongoing
NotificationData mOngoing = new NotificationData();
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;
>>>>>>> f9f9e248a034b3dd891a7bd9f476b1cad5f33779
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 |
| Chunk |
|---|
| Conflicting content |
|---|
=======
new Test("Double Remove") {
}
private Test[] mTests = new Test[] {
<<<<<<< HEAD
new Test("Hide (FLAG_FULLSCREEN)") {
public void run() {
Log.d(TAG, "set 0");
mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
Log.d(TAG, "remove 1");
mStatusBarManager.removeIcon("tty");
SystemClock.sleep(1000);
Log.d(TAG, "set 1");
mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
if (false) {
Log.d(TAG, "set 2");
mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
}
Log.d(TAG, "remove 2");
mStatusBarManager.removeIcon("tty");
Log.d(TAG, "set 3");
mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
}
},
new Test("Hide") {
>>>>>>> f9f9e248a034b3dd891a7bd9f476b1cad5f33779
public void run() {
Window win = getWindow();
win.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, |
| Solution content |
|---|
}
private Test[] mTests = new Test[] {
new Test("Double Remove") {
public void run() {
Log.d(TAG, "set 0");
mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
Log.d(TAG, "remove 1");
mStatusBarManager.removeIcon("tty");
SystemClock.sleep(1000);
Log.d(TAG, "set 1");
mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
if (false) {
Log.d(TAG, "set 2");
mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
}
Log.d(TAG, "remove 2");
mStatusBarManager.removeIcon("tty");
Log.d(TAG, "set 3");
mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
}
},
new Test("Hide (FLAG_FULLSCREEN)") {
public void run() {
Window win = getWindow();
win.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, |
| File |
|---|
| StatusBarTest.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |