diff options
Diffstat (limited to 'res')
27 files changed, 0 insertions, 246 deletions
diff --git a/res/drawable-hdpi/ic_home_search_normal_holo.png b/res/drawable-hdpi/ic_home_search_normal_holo.png Binary files differdeleted file mode 100644 index 3f64d6823..000000000 --- a/res/drawable-hdpi/ic_home_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_voice_search_holo.png b/res/drawable-hdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index dae54464a..000000000 --- a/res/drawable-hdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/search_frame.9.png b/res/drawable-hdpi/search_frame.9.png Binary files differdeleted file mode 100644 index 15ca1f4e6..000000000 --- a/res/drawable-hdpi/search_frame.9.png +++ /dev/null diff --git a/res/drawable-land-hdpi/ic_home_voice_search_holo.png b/res/drawable-land-hdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index 5a7fc99e4..000000000 --- a/res/drawable-land-hdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-land-mdpi/ic_home_voice_search_holo.png b/res/drawable-land-mdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index ee7dde52c..000000000 --- a/res/drawable-land-mdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/ic_home_voice_search_holo.png b/res/drawable-land-xhdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index 56bbbbb06..000000000 --- a/res/drawable-land-xhdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-land-xxhdpi/ic_home_voice_search_holo.png b/res/drawable-land-xxhdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index 6ea7368be..000000000 --- a/res/drawable-land-xxhdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_search_normal_holo.png b/res/drawable-mdpi/ic_home_search_normal_holo.png Binary files differdeleted file mode 100644 index 7367c380c..000000000 --- a/res/drawable-mdpi/ic_home_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_voice_search_holo.png b/res/drawable-mdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index f211a7b9c..000000000 --- a/res/drawable-mdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/search_frame.9.png b/res/drawable-mdpi/search_frame.9.png Binary files differdeleted file mode 100644 index 058905bdb..000000000 --- a/res/drawable-mdpi/search_frame.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_search_normal_holo.png b/res/drawable-xhdpi/ic_home_search_normal_holo.png Binary files differdeleted file mode 100644 index 0fe1cd133..000000000 --- a/res/drawable-xhdpi/ic_home_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_voice_search_holo.png b/res/drawable-xhdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index 1fc5cc8bb..000000000 --- a/res/drawable-xhdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/search_frame.9.png b/res/drawable-xhdpi/search_frame.9.png Binary files differdeleted file mode 100644 index 32a07143e..000000000 --- a/res/drawable-xhdpi/search_frame.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_search_normal_holo.png b/res/drawable-xxhdpi/ic_home_search_normal_holo.png Binary files differdeleted file mode 100644 index a9523d3cc..000000000 --- a/res/drawable-xxhdpi/ic_home_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_voice_search_holo.png b/res/drawable-xxhdpi/ic_home_voice_search_holo.png Binary files differdeleted file mode 100644 index c9c0b50bd..000000000 --- a/res/drawable-xxhdpi/ic_home_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/search_bg_panel.9.png b/res/drawable-xxhdpi/search_bg_panel.9.png Binary files differdeleted file mode 100644 index 85cae17bc..000000000 --- a/res/drawable-xxhdpi/search_bg_panel.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/search_frame.9.png b/res/drawable-xxhdpi/search_frame.9.png Binary files differdeleted file mode 100644 index f297bf19c..000000000 --- a/res/drawable-xxhdpi/search_frame.9.png +++ /dev/null diff --git a/res/layout-land/qsb.xml b/res/layout-land/qsb.xml deleted file mode 100644 index d56e380d0..000000000 --- a/res/layout-land/qsb.xml +++ /dev/null @@ -1,50 +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. ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <!-- Global search icon --> - <com.android.launcher3.HolographicImageView - style="@style/SearchButton" - android:id="@+id/search_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:scaleType="center" - android:src="@drawable/ic_home_search_normal_holo" - android:adjustViewBounds="true" - android:onClick="onClickSearchButton" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_search_button" /> - - <!-- Voice search icon --> - <com.android.launcher3.HolographicImageView - style="@style/SearchButton" - android:id="@+id/voice_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:scaleType="center" - android:src="@drawable/ic_home_voice_search_holo" - android:adjustViewBounds="true" - android:onClick="onClickVoiceButton" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_voice_search_button" /> -</LinearLayout> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index c72c56177..e8bac4b36 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -78,18 +78,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> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index e07cfd441..6364f09ab 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -82,16 +82,6 @@ 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" diff --git a/res/layout-sw720dp/qsb.xml b/res/layout-sw720dp/qsb.xml deleted file mode 100644 index 0afc2d2f9..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" - 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> diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml index 71c4bfa66..11d2a1f82 100644 --- a/res/values-v17/styles.xml +++ b/res/values-v17/styles.xml @@ -3,7 +3,4 @@ <style name="PagedViewWidgetImageView"> <item name="android:paddingStart">@dimen/app_widget_preview_padding_left</item> </style> - <style name="SearchButton.WithPaddingStart"> - <item name="android:paddingStart">8dp</item> - </style> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 74f942c92..0dc34641a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,13 +18,6 @@ <resources> - <!-- DrawableStateProxyView specific attributes. These attributes are used to customize - a DrawableStateProxyView view in XML files. --> - <declare-styleable name="DrawableStateProxyView"> - <!-- The source view to delegate touch presses events to. --> - <attr name="sourceViewId" format="integer" /> - </declare-styleable> - <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> <attr name="windowSize" format="integer" /> @@ -76,13 +69,6 @@ <attr name="strokeWidth" format="float" /> </declare-styleable> - <!-- HolographicLinearLayout specific attributes. --> - <declare-styleable name="HolographicLinearLayout"> - <!-- The source view to generate and apply the drawable states to/from --> - <attr name="sourceImageViewId" format="integer" /> - <attr name="stateHotwordOn" format="boolean" /> - </declare-styleable> - <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e324f6355..b92eae20e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -51,9 +51,6 @@ <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> - <!-- External toolbar icon size (for bounds) --> - <dimen name="toolbar_external_icon_width">36dp</dimen> - <dimen name="toolbar_external_icon_height">36dp</dimen> <!-- AllApps/Customize/AppsCustomize --> <!-- The height of the tab bar - if this changes, we should update the diff --git a/res/values/strings.xml b/res/values/strings.xml index 581e9aa80..efebe06f7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -132,10 +132,6 @@ s --> <!-- Label for the info icon. [CHAR_LIMIT=20] --> <string name="info_target_label">App info</string> - <!-- Accessibility: Search button --> - <string name="accessibility_search_button">Search</string> - <!-- Accessibility: Voice Search button --> - <string name="accessibility_voice_search_button">Voice Search</string> <!-- Accessibility: AllApps button --> <string name="accessibility_all_apps_button">Apps</string> <!-- Accessibility: Delete button --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2ffb0b901..e4a7b76ec 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -51,8 +51,6 @@ <item name="customShadows">false</item> </style> - <style name="SearchDropTargetBar"></style> - <style name="SearchButton"></style> <style name="DropTargetButtonContainer"> @@ -109,8 +107,4 @@ <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item> </style> - <style name="SearchButton.WithPaddingStart"> - <item name="android:paddingLeft">8dp</item> - </style> - </resources> |
