Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3df1a1da authored by Adam Powell's avatar Adam Powell
Browse files

resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp

Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56
parents f1b5abee d8435643
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -378,9 +378,9 @@ public class PopupWindow {
    }

    /**
     * Set the flag on popup to ignore cheek press event; by default this flag
     * Set the flag on popup to ignore cheek press events; by default this flag
     * is set to false
     * which means the pop wont ignore cheek press dispatch events.
     * which means the popup will not ignore cheek press dispatch events.
     * 
     * <p>If the popup is showing, calling this method will take effect only
     * the next time the popup is shown or through a manual call to one of