diff options
Diffstat (limited to 'res/layout-sw720dp')
-rw-r--r-- | res/layout-sw720dp/external_widget_drop_list_item.xml | 39 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 30 | ||||
-rw-r--r-- | res/layout-sw720dp/market_button.xml | 36 | ||||
-rw-r--r-- | res/layout-sw720dp/qsb.xml | 72 |
4 files changed, 14 insertions, 163 deletions
diff --git a/res/layout-sw720dp/external_widget_drop_list_item.xml b/res/layout-sw720dp/external_widget_drop_list_item.xml deleted file mode 100644 index 48e333b3a..000000000 --- a/res/layout-sw720dp/external_widget_drop_list_item.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - - android:layout_width="match_parent" - android:layout_height="64dp"> - <ImageView - android:id="@+id/provider_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginStart="20dp" - android:maxWidth="32dp" - android:maxHeight="32dp" - android:scaleType="fitCenter" - android:src="@mipmap/ic_launcher_application" /> - <TextView - android:id="@+id/provider" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="5dp" - android:gravity="center_vertical" - android:textSize="18sp" /> -</LinearLayout> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 62615411f..960ccf330 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -15,20 +15,20 @@ --> <!-- 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" + xmlns:launcher="http://schemas.android.com/apk/res-auto" 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"> <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" @@ -66,20 +66,18 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" /> - <com.android.launcher3.DrawableStateProxyView - android:id="@+id/voice_button_proxy" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_gravity="top|end" - android:clickable="true" - android:onClick="onClickVoiceButton" - android:importantForAccessibility="no" - launcher:sourceViewId="@+id/voice_button" /> - <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> </com.android.launcher3.DragLayer> -</FrameLayout> + + <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/market_button.xml b/res/layout-sw720dp/market_button.xml deleted file mode 100644 index 7eaeafac3..000000000 --- a/res/layout-sw720dp/market_button.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/MarketButton" - android:onClick="onClickAppMarketButton" - android:gravity="center" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:drawablePadding="10dp" - android:background="@drawable/tab_widget_indicator_selector" - android:text="@string/market" - android:contentDescription="@string/market" - android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" - android:textStyle="bold" - android:textSize="14sp" - android:textAllCaps="true" - android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" - android:shadowDx="0.0" - android:shadowDy="0.0" - android:shadowRadius="2.0" - android:focusable="true" - android:clickable="true" /> diff --git a/res/layout-sw720dp/qsb.xml b/res/layout-sw720dp/qsb.xml deleted file mode 100644 index 4c9963dfb..000000000 --- a/res/layout-sw720dp/qsb.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/search_frame"> - <!-- Global search icon --> - <com.android.launcher3.HolographicLinearLayout - style="@style/SearchButton.WithPaddingStart" - launcher:sourceImageViewId="@+id/search_button" - android:id="@+id/search_button_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" - android:layout_toStartOf="@+id/voice_button_container" - android:onClick="onClickSearchButton" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_search_button"> - <ImageView - android:id="@+id/search_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - android:scaleType="fitCenter" - android:src="@drawable/ic_home_search_normal_holo" - android:adjustViewBounds="true" /> - </com.android.launcher3.HolographicLinearLayout> - - <!-- Voice search icon --> - <com.android.launcher3.HolographicLinearLayout - style="@style/SearchButton" - launcher:sourceImageViewId="@+id/voice_button" - android:id="@+id/voice_button_container" - android:layout_width="@dimen/app_icon_size" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:layout_centerVertical="true" - android:layout_alignParentEnd="true" - android:paddingEnd="8dp" - android:paddingRight="8dp" - android:onClick="onClickVoiceButton" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_voice_search_button"> - <ImageView - android:id="@+id/voice_button" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="end" - android:scaleType="fitCenter" - android:src="@drawable/ic_home_voice_search_holo" - android:adjustViewBounds="true" /> - </com.android.launcher3.HolographicLinearLayout> -</RelativeLayout> |