diff options
author | Adam Cohen <adamcohen@google.com> | 2014-10-23 17:28:30 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 18:55:56 -0700 |
commit | bf18c372cd9abf7c24495fd94c535fd850539060 (patch) | |
tree | a1e8fa8ebfb21b62d8a6d451b9326c1f2752bdf1 /res | |
parent | e8e3e71f40ba9154fafafb59e93babaddd0e512b (diff) | |
download | android_packages_apps_Trebuchet-bf18c372cd9abf7c24495fd94c535fd850539060.tar.gz android_packages_apps_Trebuchet-bf18c372cd9abf7c24495fd94c535fd850539060.tar.bz2 android_packages_apps_Trebuchet-bf18c372cd9abf7c24495fd94c535fd850539060.zip |
Allow LauncherOverlay to access and manage insets
Change-Id: Ib9faf37eb22ad2a0b18c076978ec9f2fd8864c0c
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 10 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 10 | ||||
-rw-r--r-- | res/layout/app_drawer_container.xml | 4 | ||||
-rw-r--r-- | res/layout/launcher_overlay.xml | 4 | ||||
-rw-r--r-- | res/layout/launcher_overlay_example.xml | 8 | ||||
-rw-r--r-- | res/layout/overview_panel.xml | 4 |
7 files changed, 24 insertions, 23 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index d2088d819..9afb8cae1 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -15,14 +15,15 @@ --> <!-- Full screen view projects under the status bar and contains the background --> -<FrameLayout +<com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:id="@+id/launcher" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/workspace_bg"> + android:background="@drawable/workspace_bg" + android:fitsSystemWindows="true"> <FrameLayout android:id="@+id/reveal_fake_page_container" @@ -43,8 +44,7 @@ <com.android.launcher3.DragLayer android:id="@+id/drag_layer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:layout_height="match_parent"> <com.android.launcher3.FocusIndicatorView android:id="@+id/focus_indicator" @@ -92,4 +92,4 @@ android:layout_height="match_parent" android:inflatedId="@+id/launcher_overlay" android:layout="@layout/launcher_overlay" /> -</FrameLayout> +</com.android.launcher3.LauncherRootView> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index a0570720d..9e8775b99 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -15,14 +15,15 @@ --> <!-- Full screen view projects under the status bar and contains the background --> -<FrameLayout +<com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:id="@+id/launcher" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/workspace_bg"> + android:background="@drawable/workspace_bg" + android:fitsSystemWindows="true"> <FrameLayout android:id="@+id/reveal_fake_page_container" @@ -112,4 +113,4 @@ android:layout_height="match_parent" android:inflatedId="@+id/launcher_overlay" android:layout="@layout/launcher_overlay" /> -</FrameLayout> +</com.android.launcher3.LauncherRootView> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 36e76dd88..582a782b6 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -15,14 +15,15 @@ --> <!-- Full screen view projects under the status bar and contains the background --> -<FrameLayout +<com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:id="@+id/launcher" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/workspace_bg"> + android:background="@drawable/workspace_bg" + android:fitsSystemWindows="true"> <FrameLayout android:id="@+id/reveal_fake_page_container" @@ -43,8 +44,7 @@ <com.android.launcher3.DragLayer android:id="@+id/drag_layer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:layout_height="match_parent"> <com.android.launcher3.FocusIndicatorView android:id="@+id/focus_indicator" @@ -112,4 +112,4 @@ android:inflatedId="@+id/launcher_overlay" android:layout="@layout/launcher_overlay" /> -</FrameLayout> +</com.android.launcher3.LauncherRootView> diff --git a/res/layout/app_drawer_container.xml b/res/layout/app_drawer_container.xml index 146906637..9633f95c2 100644 --- a/res/layout/app_drawer_container.xml +++ b/res/layout/app_drawer_container.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher3.AppDrawerContainer xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -82,4 +82,4 @@ android:visibility="invisible" android:layout_height="100dp" /> </RelativeLayout> -</FrameLayout> +</com.android.launcher3.AppDrawerContainer> diff --git a/res/layout/launcher_overlay.xml b/res/layout/launcher_overlay.xml index 9ef0c9a97..b35a2d8ae 100644 --- a/res/layout/launcher_overlay.xml +++ b/res/layout/launcher_overlay.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<FrameLayout +<com.android.launcher3.InsettableFrameLayout 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 + android:layout_height="match_parent" /> diff --git a/res/layout/launcher_overlay_example.xml b/res/layout/launcher_overlay_example.xml index 422f2811a..8735d141b 100644 --- a/res/layout/launcher_overlay_example.xml +++ b/res/layout/launcher_overlay_example.xml @@ -14,19 +14,19 @@ limitations under the License. --> -<FrameLayout +<com.android.launcher3.InsettableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <FrameLayout + <com.android.launcher3.InsettableFrameLayout android:id="@+id/search_overlay" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff00ff00" android:visibility="invisible" /> - <FrameLayout + <com.android.launcher3.InsettableFrameLayout android:id="@+id/search_box" android:layout_width="match_parent" android:layout_height="48dp" @@ -34,4 +34,4 @@ android:layout_marginRight="8dp" android:layout_marginTop="36dp" android:background="#ffff0000" /> -</FrameLayout> +</com.android.launcher3.InsettableFrameLayout> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index 9b0bb7723..a0a60ab59 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher3.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher3.OverviewPanel xmlns:android="http://schemas.android.com/apk/res/android" xmlns:slidingpanel="http://schemas.android.com/apk/res/com.android.launcher3" android:id="@+id/sliding_layout" android:layout_width="match_parent" @@ -45,4 +45,4 @@ <include layout="@layout/settings_pane" /> -</com.android.launcher3.SlidingUpPanelLayout> +</com.android.launcher3.OverviewPanel> |