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

am 9e2781bd: am 6fa4e34d: am d4fbac6e: Merge "Fixed a bug in the notification touch selection." into lmp-dev

Browse Source 
* commit '9e2781bd3ebd403d2860d67bde7ec44e6f1ea59a':
  Fixed a bug in the notification touch selection.
This commit is contained in:
Selim Cinek
2014-09-02 17:44:38 +00:00
committed by Android Git Automerger
parent eeee029d53 3a1b7eb4a6
commit 1fbf77cd1e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -754,15 +754,20 @@ public abstract class BaseStatusBar extends SystemUI implements
public boolean onLongPress(View v, int x, int y) {
dismissPopups();
if (v.getWindowToken() == null) return false;
if (v.getWindowToken() == null) {
Log.e(TAG, "Trying to show notification guts, but not attached to window");
return false;
}
// Assume we are a status_bar_notification_row
final NotificationGuts guts = (NotificationGuts) v.findViewById(
R.id.notification_guts);
if (guts == null) return false;
// Already showing?
if (guts.getVisibility() == View.VISIBLE) return false;
if (guts.getVisibility() == View.VISIBLE) {
Log.e(TAG, "Trying to show notification guts, but already visible");
return false;
}
guts.setVisibility(View.VISIBLE);
final double horz = Math.max(guts.getWidth() - x, x);

4
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -580,7 +580,7 @@ public class NotificationStackScrollLayout extends ViewGroup
}
float childTop = slidingChild.getTranslationY();
float top = childTop + slidingChild.getClipTopAmount();
float bottom = top + slidingChild.getActualHeight();
float bottom = childTop + slidingChild.getActualHeight();
// Allow the full width of this view to prevent gesture conflict on Keyguard (phone and
// camera affordance).
@@ -1530,7 +1530,7 @@ public class NotificationStackScrollLayout extends ViewGroup
return position;
}
if (child.getVisibility() != View.GONE) {
position += child.getHeight();
position += getIntrinsicHeight(child);
if (i < getChildCount()-1) {
position += mPaddingBetweenElements;
}