diff options
author | Adam Cohen <adamcohen@google.com> | 2014-10-16 09:49:24 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-10-22 17:40:39 -0700 |
commit | c2d6e897dbcb96b7b629e42002966368fbda2f95 (patch) | |
tree | 1a9d6e72ac5160709e64e45ffd6de094084f1bec /res | |
parent | 1aa3abea279d8b3ead93d704d424757bfe65c2bd (diff) | |
download | android_packages_apps_Trebuchet-c2d6e897dbcb96b7b629e42002966368fbda2f95.tar.gz android_packages_apps_Trebuchet-c2d6e897dbcb96b7b629e42002966368fbda2f95.tar.bz2 android_packages_apps_Trebuchet-c2d6e897dbcb96b7b629e42002966368fbda2f95.zip |
First pass of the Launcher Overlay interface / impl
-> Added simple reference launcher extension
-> Make launcher able to handle a null qsb
Change-Id: Ib1575243cac800a335e95bbf00cdc394bb4741c3
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 8 | ||||
-rw-r--r-- | res/layout/launcher_overlay.xml | 20 | ||||
-rw-r--r-- | res/layout/launcher_overlay_example.xml | 37 |
5 files changed, 79 insertions, 0 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 8cd867366..fa5fe7334 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -63,4 +63,11 @@ android:layout_height="match_parent" 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" /> </FrameLayout> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9e98d4257..f2d2dd811 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -83,4 +83,11 @@ android:layout_height="match_parent" 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" /> </FrameLayout> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 62615411f..87fa2ed93 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -82,4 +82,12 @@ android:layout_height="match_parent" 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" /> + </FrameLayout> diff --git a/res/layout/launcher_overlay.xml b/res/layout/launcher_overlay.xml new file mode 100644 index 000000000..9ef0c9a97 --- /dev/null +++ b/res/layout/launcher_overlay.xml @@ -0,0 +1,20 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/res/layout/launcher_overlay_example.xml b/res/layout/launcher_overlay_example.xml new file mode 100644 index 000000000..422f2811a --- /dev/null +++ b/res/layout/launcher_overlay_example.xml @@ -0,0 +1,37 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <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> |