diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-25 00:19:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-25 00:19:40 +0000 |
commit | 10a0e8a5c65404bd6067b3e42de2ea360321b2e5 (patch) | |
tree | dbefc893013d4860bd64a4d285a8c7ef04b94d9d /res | |
parent | 86feafc1e5413f3b73fd228b65a49f1f43850029 (diff) | |
parent | 32554d1c6169df944f651846c64096f8bb57fb31 (diff) | |
download | android_packages_apps_Trebuchet-10a0e8a5c65404bd6067b3e42de2ea360321b2e5.tar.gz android_packages_apps_Trebuchet-10a0e8a5c65404bd6067b3e42de2ea360321b2e5.tar.bz2 android_packages_apps_Trebuchet-10a0e8a5c65404bd6067b3e42de2ea360321b2e5.zip |
Merge "Cleaning up the overlay interface" into ub-launcher3-calgary
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout/launcher_overlay.xml | 20 | ||||
-rw-r--r-- | res/layout/launcher_overlay_example.xml | 39 |
5 files changed, 0 insertions, 78 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index aac0f83fc..63e460e5d 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -75,10 +75,4 @@ android:visibility="invisible" /> </com.android.launcher3.dragndrop.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> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index fb015f8ec..39f5ac1c9 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -85,10 +85,4 @@ android:visibility="invisible" /> </com.android.launcher3.dragndrop.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> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index a45858c92..b57244414 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -83,11 +83,4 @@ android:visibility="invisible" /> </com.android.launcher3.dragndrop.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> diff --git a/res/layout/launcher_overlay.xml b/res/layout/launcher_overlay.xml deleted file mode 100644 index b35a2d8ae..000000000 --- a/res/layout/launcher_overlay.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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" /> diff --git a/res/layout/launcher_overlay_example.xml b/res/layout/launcher_overlay_example.xml deleted file mode 100644 index 7d92d4f0d..000000000 --- a/res/layout/launcher_overlay_example.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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> |