diff options
Diffstat (limited to 'libraries/ActionBarSherlock/res/layout')
7 files changed, 8 insertions, 111 deletions
diff --git a/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml index 0d51220c9..9d8f759bc 100644 --- a/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml +++ b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<com.actionbarsherlock.internal.widget.IcsLinearLayout +<com.actionbarsherlock.internal.widget.TabsLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="?attr/actionBarTabBarStyle" -/>
\ No newline at end of file +/> diff --git a/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml deleted file mode 100644 index ab2b0ee6c..000000000 --- a/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ - -This is an optimized layout for a screen, with the minimum set of features -enabled. ---> - -<com.actionbarsherlock.internal.widget.FakeDialogPhoneWindow xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:fitsSystemWindows="true"> - <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="@dimen/abs__alert_dialog_title_height" - android:paddingLeft="16dip" - android:paddingRight="16dip" - android:gravity="center_vertical|left" /> - <View android:id="@+id/abs__titleDivider" - android:layout_width="fill_parent" - android:layout_height="2dip" - android:background="@color/abs__holo_blue_light" /> - <FrameLayout - android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" - android:orientation="vertical" - android:foreground="?attr/windowContentOverlay"> - <FrameLayout android:id="@+id/abs__content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> - </FrameLayout> -</com.actionbarsherlock.internal.widget.FakeDialogPhoneWindow> diff --git a/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml deleted file mode 100644 index 147f36fe8..000000000 --- a/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<com.actionbarsherlock.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="?attr/listPreferredItemHeightSmall"> - - <!-- Icon will be inserted here. --> - - <!-- The title and summary have some gap between them, and this 'group' should be centered vertically. --> - <RelativeLayout - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="?attr/listPreferredItemPaddingLeft" - android:layout_marginRight="?attr/listPreferredItemPaddingRight" - android:duplicateParentState="true"> - - <TextView - android:id="@+id/abs__title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:textAppearance="?attr/textAppearanceListItemSmall" - android:singleLine="true" - android:duplicateParentState="true" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - - <TextView - android:id="@+id/abs__shortcut" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/abs__title" - android:layout_alignParentLeft="true" - android:textAppearance="?attr/textAppearanceSmall" - android:singleLine="true" - android:duplicateParentState="true" /> - - </RelativeLayout> - - <!-- Checkbox, and/or radio button will be inserted here. --> - -</com.actionbarsherlock.internal.view.menu.ListMenuItemView> diff --git a/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml index 1fb82fe9a..68dc7dfe5 100644 --- a/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml +++ b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml @@ -22,7 +22,8 @@ This is an optimized layout for a screen with the Action Bar enabled. android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:splitMotionEvents="false"> <com.actionbarsherlock.internal.widget.ActionBarContainer android:id="@+id/abs__action_bar_container" android:layout_width="fill_parent" diff --git a/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml index 0961ef561..45cd7239f 100644 --- a/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml +++ b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml @@ -22,7 +22,8 @@ the Action Bar enabled overlaying application content. <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:splitMotionEvents="false"> <com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/libraries/ActionBarSherlock/res/layout/abs__search_view.xml b/libraries/ActionBarSherlock/res/layout/abs__search_view.xml index 6ba319121..55d2c7345 100644 --- a/libraries/ActionBarSherlock/res/layout/abs__search_view.xml +++ b/libraries/ActionBarSherlock/res/layout/abs__search_view.xml @@ -40,7 +40,7 @@ <ImageView android:id="@+id/abs__search_button" - style="?android:attr/actionButtonStyle" + style="?attr/actionButtonStyle" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" diff --git a/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml index 8fc0eb12c..0088e14a7 100644 --- a/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml +++ b/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml @@ -19,7 +19,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:textAppearance="?android:attr/dropDownHintAppearance" + android:textAppearance="?attr/dropDownHintAppearance" android:singleLine="true" android:layout_marginLeft="3dip" android:layout_marginTop="3dip" |