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

Commit 78d8510a authored by Adam Skory's avatar Adam Skory Committed by Android Git Automerger
Browse files

am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 

* commit '9e3ebf3c':
  Do not show overview when menu pressed on CustomContent screen.
  Missing paddingRight added.
parents 77ef6b2b 9e3ebf3c

res/layout-land/migration_workspace_cling.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end|center_vertical"

        android:layout_gravity="end|center_vertical"

        android:paddingEnd="60dp"

        android:paddingEnd="60dp"

        android:paddingRight="60dp"

        android:orientation="vertical">

        android:orientation="vertical">

        <LinearLayout

        <LinearLayout

            android:id="@+id/migration_workspace_cling_bubble"

            android:id="@+id/migration_workspace_cling_bubble"

src/com/android/launcher3/Launcher.java

+15 −9
Original line number Original line Diff line number Diff line
@@ -2044,9 +2044,14 @@ public class Launcher extends Activity 
        }

        }

    }

    }





    public boolean isOnCustomContent() {

        return mWorkspace.isOnOrMovingToCustomContent();

    }



    @Override

    @Override

    public boolean onPrepareOptionsMenu(Menu menu) {

    public boolean onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        super.onPrepareOptionsMenu(menu);

        if (!isOnCustomContent()) {

            // Close any open folders

            // Close any open folders

            closeFolder();

            closeFolder();

            // Stop resizing any widgets

            // Stop resizing any widgets
@@ -2057,6 +2062,7 @@ public class Launcher extends Activity 
            } else {

            } else {

                showWorkspace(true);

                showWorkspace(true);

            }

            }

        }

        return false;

        return false;

    }

    }