diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-06 10:12:54 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-11-11 10:17:56 -0800 |
commit | 594d76dc66cb5666830b62594909fed187987d42 (patch) | |
tree | ac26bc16ce77b73747c10846577019e03f592111 /res/layout-port | |
parent | 8dfe2da6985d38f23fd3426101574c093f509907 (diff) | |
download | android_packages_apps_Trebuchet-594d76dc66cb5666830b62594909fed187987d42.tar.gz android_packages_apps_Trebuchet-594d76dc66cb5666830b62594909fed187987d42.tar.bz2 android_packages_apps_Trebuchet-594d76dc66cb5666830b62594909fed187987d42.zip |
Using the default search widget in Launcher3
> Removing all logic related to search and voice overlays
from Launcher3
> Using the widget provided by global search provider on the
homescreen
> Removing VoiceButtonProxy, as it is not being used anymore
Change-Id: Ie8b09b44f7213c8fa11bce685914442e4884295d
Diffstat (limited to 'res/layout-port')
-rw-r--r-- | res/layout-port/launcher.xml | 12 | ||||
-rw-r--r-- | res/layout-port/qsb.xml | 72 |
2 files changed, 0 insertions, 84 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9e4c24515..af30a32e5 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -66,18 +66,6 @@ android:id="@+id/search_drop_target_bar" layout="@layout/search_drop_target_bar" /> - <!-- This is the search bar voice button proxy view. It allows us to have a larger - touch target than the microphone constrained by the search bar bounds. --> - <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" diff --git a/res/layout-port/qsb.xml b/res/layout-port/qsb.xml deleted file mode 100644 index 0afc2d2f9..000000000 --- a/res/layout-port/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" - 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> |