| Chunk |
|---|
| Conflicting content |
|---|
*/
*/
public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15;
<<<<<<< HEAD
/**
* Window type: the drag-and-drop pseudowindow. There is only one
* drag layer (at most), and it is placed on top of all other windows.
* @hide
*/
public static final int TYPE_DRAG = FIRST_SYSTEM_WINDOW+16;
=======
>>>>>>> 6ba052b4847d85831c38c9b8e2942cef4987e55b
/**
* End of types of system windows. |
| Solution content |
|---|
*/
public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15;
/**
* Window type: the drag-and-drop pseudowindow. There is only one
* drag layer (at most), and it is placed on top of all other windows.
* @hide
*/
public static final int TYPE_DRAG = FIRST_SYSTEM_WINDOW+16;
/**
* End of types of system windows.
*/ |
| File |
|---|
| WindowManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
// things in here CAN NOT take focus, but are shown on top of everything else.
<<<<<<< HEAD
static final int SYSTEM_OVERLAY_LAYER = 17;
static final int SECURE_SYSTEM_OVERLAY_LAYER = 18;
=======
static final int SYSTEM_OVERLAY_LAYER = 16;
static final int SECURE_SYSTEM_OVERLAY_LAYER = 17;
>>>>>>> 6ba052b4847d85831c38c9b8e2942cef4987e55b
static final int APPLICATION_MEDIA_SUBLAYER = -2;
static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1;
// which sits above all other focusable windows
static final int DRAG_LAYER = 16; |
| Solution content |
|---|
// which sits above all other focusable windows
static final int DRAG_LAYER = 16;
// things in here CAN NOT take focus, but are shown on top of everything else.
static final int SYSTEM_OVERLAY_LAYER = 17;
static final int SECURE_SYSTEM_OVERLAY_LAYER = 18;
static final int APPLICATION_MEDIA_SUBLAYER = -2;
static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1; |
| File |
|---|
| PhoneWindowManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |