MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java
MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java
multiwindow: Fix NullPointerException

Change-Id: I5c423bcde7d191331be53ce180f827e7023dc472

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
mutliwindow: notify split view if layout changed [2/2]

Change-Id: I2bbdd58dcf89cd70aa01a4c2bfc06641508f632c
MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/content/Intent.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	services/java/com/android/server/wm/WindowManagerService.java
MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/content/Intent.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	services/java/com/android/server/wm/WindowManagerService.java
MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/content/Intent.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	services/java/com/android/server/wm/WindowManagerService.java
MultiWindow

Change-Id: Ie5860c2105ad9c971157b41d65f8fab337461ef6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/wm/WindowManagerService.java

Conflicts:
	core/java/android/content/Intent.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	services/java/com/android/server/wm/WindowManagerService.java
MULTI VIEW initial commit

Change-Id: I4d70f52dc688c1c3a4850698b301193574cc1cb1
Merge branch 'ck44' of https://github.com/CandyShop/candykat_frameworks_base into ck44