Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't show a blue glow when swiping recents" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-04-30 10:28:21 -07:00
committed by Android (Google) Code Review
parent 427db9b3d1 890c9fe026
commit d6be37d4d9
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/drawable/recents_thumbnail_fg.xml
View File

@@ -16,6 +16,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_selected="true" />
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true" />
<item android:drawable="@drawable/recents_thumbnail_bg_dragging" android:state_activated="true" />
<item android:drawable="@*android:color/transparent"/>
</selector>

3
packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java
View File

@@ -184,7 +184,6 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView
mRecycledViews.add(v);
mLinearLayout.removeView(v);
mCallback.handleSwipe(v);
v.setActivated(false);
// Restore the alpha/translation parameters to what they were before swiping
// (for when these items are recycled)
View contentView = getChildContentView(v);
@@ -196,11 +195,9 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView
// We do this so the underlying ScrollView knows that it won't get
// the chance to intercept events anymore
requestDisallowInterceptTouchEvent(true);
v.setActivated(true);
}
public void onDragCancelled(View v) {
v.setActivated(false);
}
public View getChildAtPosition(MotionEvent ev) {

3
packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
View File

@@ -191,7 +191,6 @@ public class RecentsVerticalScrollView extends ScrollView
mRecycledViews.add(v);
mLinearLayout.removeView(v);
mCallback.handleSwipe(v);
v.setActivated(false);
// Restore the alpha/translation parameters to what they were before swiping
// (for when these items are recycled)
View contentView = getChildContentView(v);
@@ -203,11 +202,9 @@ public class RecentsVerticalScrollView extends ScrollView
// We do this so the underlying ScrollView knows that it won't get
// the chance to intercept events anymore
requestDisallowInterceptTouchEvent(true);
v.setActivated(true);
}
public void onDragCancelled(View v) {
v.setActivated(false);
}
public View getChildAtPosition(MotionEvent ev) {