Skip to content

Commit d6be37d

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Don't show a blue glow when swiping recents" into jb-dev
2 parents 427db9b + 890c9fe commit d6be37d

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

packages/SystemUI/res/drawable/recents_thumbnail_fg.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1717
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_selected="true" />
1818
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true" />
19-
<item android:drawable="@drawable/recents_thumbnail_bg_dragging" android:state_activated="true" />
2019
<item android:drawable="@*android:color/transparent"/>
2120
</selector>

packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public void onChildDismissed(View v) {
184184
mRecycledViews.add(v);
185185
mLinearLayout.removeView(v);
186186
mCallback.handleSwipe(v);
187-
v.setActivated(false);
188187
// Restore the alpha/translation parameters to what they were before swiping
189188
// (for when these items are recycled)
190189
View contentView = getChildContentView(v);
@@ -196,11 +195,9 @@ public void onBeginDrag(View v) {
196195
// We do this so the underlying ScrollView knows that it won't get
197196
// the chance to intercept events anymore
198197
requestDisallowInterceptTouchEvent(true);
199-
v.setActivated(true);
200198
}
201199

202200
public void onDragCancelled(View v) {
203-
v.setActivated(false);
204201
}
205202

206203
public View getChildAtPosition(MotionEvent ev) {

packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ public void onChildDismissed(View v) {
191191
mRecycledViews.add(v);
192192
mLinearLayout.removeView(v);
193193
mCallback.handleSwipe(v);
194-
v.setActivated(false);
195194
// Restore the alpha/translation parameters to what they were before swiping
196195
// (for when these items are recycled)
197196
View contentView = getChildContentView(v);
@@ -203,11 +202,9 @@ public void onBeginDrag(View v) {
203202
// We do this so the underlying ScrollView knows that it won't get
204203
// the chance to intercept events anymore
205204
requestDisallowInterceptTouchEvent(true);
206-
v.setActivated(true);
207205
}
208206

209207
public void onDragCancelled(View v) {
210-
v.setActivated(false);
211208
}
212209

213210
public View getChildAtPosition(MotionEvent ev) {

0 commit comments

Comments
 (0)