diff options
author | Mike LeBeau <mlebeau@android.com> | 2009-07-20 23:34:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-20 23:34:17 -0700 |
commit | 4f7b7c3cc60087d722591cbee5078552f4aa7a5a (patch) | |
tree | 22aa3eb373f99506553fe6d9d2b537ec61267762 | |
parent | c08411cec9da9ae408b77e05bad3930e6e5f32b4 (diff) | |
parent | eb1eab1214dbe0b25355e7bde4279fca804af9f7 (diff) | |
download | frameworks_base-4f7b7c3cc60087d722591cbee5078552f4aa7a5a.zip frameworks_base-4f7b7c3cc60087d722591cbee5078552f4aa7a5a.tar.gz frameworks_base-4f7b7c3cc60087d722591cbee5078552f4aa7a5a.tar.bz2 |
am eb1eab12: Remove unused search dialog layout files.
Merge commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7'
* commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7':
Remove unused search dialog layout files.
-rw-r--r-- | core/res/res/layout/search_dropdown_app_selector.xml | 44 | ||||
-rw-r--r-- | core/res/res/layout/search_dropdown_item_2line.xml | 59 | ||||
-rw-r--r-- | core/res/res/layout/search_dropdown_item_icons_1line.xml | 54 |
3 files changed, 0 insertions, 157 deletions
diff --git a/core/res/res/layout/search_dropdown_app_selector.xml b/core/res/res/layout/search_dropdown_app_selector.xml deleted file mode 100644 index f86645f..0000000 --- a/core/res/res/layout/search_dropdown_app_selector.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/layout/search_dropdown_app_selector.xml -** -** Copyright 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. -*/ ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:gravity="center_vertical" - android:baselineAligned="false" - > - - <ImageView android:id="@+id/search_app_icon1" - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_gravity="center_vertical" - android:scaleType="fitCenter" - android:src="@android:drawable/ic_search_category_default" /> - - <TextView android:id="@+id/search_app_text1" - style="?android:attr/dropDownItemStyle" - android:singleLine="true" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_gravity="center_vertical" /> - -</LinearLayout> diff --git a/core/res/res/layout/search_dropdown_item_2line.xml b/core/res/res/layout/search_dropdown_item_2line.xml deleted file mode 100644 index 5546b6636..0000000 --- a/core/res/res/layout/search_dropdown_item_2line.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml -** -** Copyright 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. -*/ ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="?android:attr/searchResultListItemHeight" - android:orientation="horizontal" - android:gravity="center_vertical" - android:baselineAligned="false" - > - - <TwoLineListItem - android:paddingTop="1dip" - android:paddingBottom="1dip" - android:gravity="center_vertical" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:mode="twoLine" > - - <TextView - android:id="@android:id/text1" - style="?android:attr/dropDownItemStyle" - android:textAppearance="?android:attr/textAppearanceSearchResultTitle" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> - - <TextView - android:id="@android:id/text2" - style="?android:attr/dropDownItemStyle" - android:textAppearance="?android:attr/textAppearanceSearchResultSubtitle" - android:textColor="?android:attr/textColorSecondaryInverse" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@android:id/text1" - android:layout_alignLeft="@android:id/text1" /> - - </TwoLineListItem> - -</LinearLayout> diff --git a/core/res/res/layout/search_dropdown_item_icons_1line.xml b/core/res/res/layout/search_dropdown_item_icons_1line.xml deleted file mode 100644 index 4f65d74..0000000 --- a/core/res/res/layout/search_dropdown_item_icons_1line.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml -** -** Copyright 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. -*/ ---> - - <!-- NOTE: The appearance of the inner text element must match the appearance --> - <!-- of the text element in apps/common/res/layout/simple_dropdown_item_1line.xml --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingLeft="4dip" - android:paddingRight="2dip" - android:layout_width="fill_parent" - android:layout_height="?android:attr/searchResultListItemHeight" - android:orientation="horizontal" - android:gravity="center_vertical" - android:baselineAligned="false" - > - - <ImageView android:id="@android:id/icon1" - android:layout_width="48dip" - android:layout_height="48dip" - android:layout_gravity="center_vertical" - android:scaleType="centerInside" /> - - <TextView android:id="@android:id/text1" - style="?android:attr/dropDownItemStyle" - android:textAppearance="?android:attr/textAppearanceSearchResultTitle" - android:singleLine="true" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1" /> - - <ImageView android:id="@android:id/icon2" - android:layout_width="48dip" - android:layout_height="48dip" - android:layout_gravity="center_vertical" - android:scaleType="centerInside" /> - -</LinearLayout> |