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

Commit c1aaf4b5 authored by Bobby Georgescu's avatar Bobby Georgescu Committed by Android Git Automerger
Browse files

am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce 

* commit 'e3336dc3':
  Prevent lock screen appearing during active slideshow
parents c4edd18d e3336dc3

src/com/android/gallery3d/app/SlideshowPage.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -112,8 +112,7 @@ public class SlideshowPage extends ActivityState { 
    @Override

    @Override

    public void onCreate(Bundle data, Bundle restoreState) {

    public void onCreate(Bundle data, Bundle restoreState) {

        super.onCreate(data, restoreState);

        super.onCreate(data, restoreState);

        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR

        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR);

                | FLAG_ALLOW_LOCK_WHILE_SCREEN_ON);

        if (data.getBoolean(KEY_DREAM)) {

        if (data.getBoolean(KEY_DREAM)) {

            // Dream screensaver only keeps screen on for plugged devices.

            // Dream screensaver only keeps screen on for plugged devices.

            mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED | FLAG_SHOW_WHEN_LOCKED;

            mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED | FLAG_SHOW_WHEN_LOCKED;