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

Commit 4ec7134a authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Cleaning up the overlay interface 

Overlays are supposed to use their own UI and not interfere with the
Launcher UI. If the UI needs to be put inside the Launcher, use customContent
instead.

Removing some unnecessary and unused methods related to overlays

Bug: 25993953
Change-Id: I4d715cdee04eb7b0ebef673d885a4258c521ff1f
parent 0fb31cf7

res/layout-land/launcher.xml

+0 −6
Original line number Diff line number Diff line
@@ -72,10 +72,4 @@ 
            android:visibility="invisible" />

    </com.android.launcher3.DragLayer>



    <ViewStub

        android:id="@+id/launcher_overlay_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />

</com.android.launcher3.LauncherRootView>

res/layout-port/launcher.xml

+0 −6
Original line number Diff line number Diff line
@@ -82,10 +82,4 @@ 
            android:visibility="invisible" />

    </com.android.launcher3.DragLayer>



    <ViewStub

        android:id="@+id/launcher_overlay_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />

</com.android.launcher3.LauncherRootView>

res/layout-sw720dp/launcher.xml

+0 −7
Original line number Diff line number Diff line
@@ -80,11 +80,4 @@ 
            android:visibility="invisible" />

    </com.android.launcher3.DragLayer>



    <ViewStub

        android:id="@+id/launcher_overlay_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />



</com.android.launcher3.LauncherRootView>

res/layout/launcher_overlay.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<com.android.launcher3.InsettableFrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout/launcher_overlay_example.xml

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:layout_ignoreInsets="true">



    <FrameLayout

        android:id="@+id/search_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#ff00ff00"

        android:visibility="invisible" />



    <FrameLayout

        android:id="@+id/search_box"

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

        android:layout_marginTop="36dp"

        android:background="#ffff0000" />

</FrameLayout>