gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[frameworks/base] Merge branch 'rk32/mid/5.1/develop' of ssh://10.10.10.29/platform/frameworks/base into zjwork

Browse Source
This commit is contained in:
Firefly
2015-10-10 16:11:31 +08:00
committed by djw
parent 7819f0e256 6ef006619b
commit e5b0bbf255
6 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/base/packages/SystemUI/res/layout-sw720dp/navigation_bar.xml
View File

@ -119,6 +119,7 @@
android:contentDescription="@string/accessibility_recent"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
@ -312,6 +313,7 @@
android:contentDescription="@string/accessibility_recent"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>

21
frameworks/base/packages/SystemUI/res/layout-sw720dp/navigation_bar_win.xml
View File

@ -184,6 +184,17 @@
android:visibility="invisible"
android:contentDescription="@string/accessibility_ime_switch_button" />
</FrameLayout>
<com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/displaycopy" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
android:layout_width="100dp" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_height="match_parent"
@ -426,6 +437,16 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0"
/>
<com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/displaycopy" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
<com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/sub"

20
frameworks/base/packages/SystemUI/res/layout-sw800dp/navigation_bar_win.xml
View File

@ -176,6 +176,16 @@
android:visibility="invisible"
android:contentDescription="@string/accessibility_ime_switch_button" />
</FrameLayout>
<com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/displaycopy" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
android:layout_width="90dp" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_height="match_parent"
@ -430,6 +440,16 @@
android:src="@drawable/sub_normal"
android:visibility="invisible"
systemui:keyCode="25"
/>
<com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/displaycopy" android:paddingStart="10dp" android:paddingEnd="0dp"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
android:layout_width="120dp" android:paddingStart="16dp" android:paddingEnd="16dp"

2
frameworks/base/packages/SystemUI/res/layout/navigation_bar.xml
View File

@ -137,6 +137,7 @@
android:contentDescription="@string/accessibility_recent"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>
@ -331,6 +332,7 @@
android:contentDescription="@string/accessibility_recent"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:scaleType="centerInside"
android:src="@drawable/display_copy"
android:visibility="invisible"
/>

15
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@ -2480,18 +2480,21 @@ if(mDecorContentParent != null)
@Override
public boolean dispatchPointerEvent(MotionEvent ev,boolean block) {
Configuration config = getResources().getConfiguration();
if(config.multiwindowflag == Configuration.DISABLE_MULTI_WINDOW){
/*if(config.multiwindowflag == Configuration.DISABLE_MULTI_WINDOW){
if(config.dualscreenflag== Configuration.ENABLE_DUAL_SCREEN){
LOGWINDOW(" mDisplayDector.onTouchEvent ");
mDisplayDector.onTouchEvent(ev);
}
return super.dispatchPointerEvent(ev,block);
}*/
if(config.dualscreenflag== Configuration.ENABLE_DUAL_SCREEN){
LOGWINDOW(" mDisplayDector.onTouchEvent ");
mDisplayDector.onTouchEvent(ev);
}
if(mMultiWindowUtil != null){
return mMultiWindowUtil.dispatchPointerEvent(ev,block);
}else{
return true;
}
if(mMultiWindowUtil != null){
mMultiWindowUtil.dispatchPointerEvent(ev,block);
}
return true;
}
@Override

2
frameworks/base/services/core/java/com/android/server/am/ActivityStack.java
View File

@ -1899,7 +1899,7 @@ final class ActivityStack {
}
if (dualconfig) {
if (!multiconfig && dualconfig) {
for (int i = 0; i < mTaskHistory.size(); i ++) {
final TaskRecord task = mTaskHistory.get(i);
final ArrayList<ActivityRecord> activities = task.mActivities;