diff options
Diffstat (limited to 'libraries/ActionBarSherlock/res')
35 files changed, 68 insertions, 254 deletions
diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png Binary files differdeleted file mode 100644 index 79e56f522..000000000 --- a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png Binary files differdeleted file mode 100644 index e029f210b..000000000 --- a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png Binary files differnew file mode 100644 index 000000000..83f36a94c --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png Binary files differnew file mode 100644 index 000000000..a3cc21e6b --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png Binary files differindex 4be72f108..bf8bd6670 100644 --- a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png +++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png diff --git a/libraries/ActionBarSherlock/res/drawable-hdpi/abs__toast_frame.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__toast_frame.9.png Binary files differnew file mode 100644 index 000000000..ad2cb5a96 --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__toast_frame.9.png diff --git a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png Binary files differdeleted file mode 100644 index fb3660eab..000000000 --- a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png Binary files differdeleted file mode 100644 index f18050ea5..000000000 --- a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png Binary files differnew file mode 100644 index 000000000..844c99c22 --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png diff --git a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png Binary files differnew file mode 100644 index 000000000..86c170e97 --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png diff --git a/libraries/ActionBarSherlock/res/drawable-mdpi/abs__toast_frame.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__toast_frame.9.png Binary files differnew file mode 100644 index 000000000..b9105deee --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__toast_frame.9.png diff --git a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png Binary files differdeleted file mode 100644 index f4970ad1c..000000000 --- a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png Binary files differdeleted file mode 100644 index 172fc3b5e..000000000 --- a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png +++ /dev/null diff --git a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png Binary files differnew file mode 100644 index 000000000..d8faf900a --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png diff --git a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png Binary files differnew file mode 100644 index 000000000..e7c7280ad --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png diff --git a/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__toast_frame.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__toast_frame.9.png Binary files differnew file mode 100644 index 000000000..9f39a7746 --- /dev/null +++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__toast_frame.9.png diff --git a/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml index 040df44ab..ab4fa28d8 100644 --- a/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml +++ b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml @@ -21,6 +21,7 @@ This is an optimized layout for a screen with the Action Bar enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:fitsSystemWindows="true" + android:splitMotionEvents="false" android:layout_width="fill_parent" android:layout_height="fill_parent"> <com.actionbarsherlock.internal.widget.ActionBarContainer diff --git a/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml index c64ef141b..0ab3ae65c 100644 --- a/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml +++ b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml @@ -20,7 +20,8 @@ the Action Bar enabled overlaying application content. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:splitMotionEvents="false"> <com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content" android:layout_width="fill_parent" android:layout_height="fill_parent" /> 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" diff --git a/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml index 35910333b..d3a64c7d0 100644 --- a/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml +++ b/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml @@ -32,5 +32,5 @@ <dimen name="abs__action_bar_subtitle_bottom_margin">9dip</dimen> <!-- Minimum width for an action button in the menu area of an action bar --> - <dimen name="action_button_min_width">64dip</dimen> + <dimen name="abs__action_button_min_width">64dip</dimen> </resources> diff --git a/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml deleted file mode 100644 index 63b12f7f3..000000000 --- a/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/dimens.xml -** -** Copyright 2006, 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. -*/ ---> -<resources> - <!-- The platform's desired minimum size for a dialog's width when it - is along the major axis (that is the screen is landscape). This may - be either a fraction or a dimension. --> - <item type="dimen" name="abs__dialog_min_width_major">55%</item> - <!-- The platform's desired minimum size for a dialog's width when it - is along the minor axis (that is the screen is portrait). This may - be either a fraction or a dimension. --> - <item type="dimen" name="abs__dialog_min_width_minor">80%</item> -</resources> diff --git a/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml index f67853817..175a47fec 100644 --- a/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml +++ b/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml @@ -34,5 +34,5 @@ <integer name="abs__max_action_buttons">5</integer> <!-- Minimum width for an action button in the menu area of an action bar --> - <dimen name="action_button_min_width">64dip</dimen> + <dimen name="abs__action_button_min_width">64dip</dimen> </resources> diff --git a/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml b/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml index 5fac1ab58..75e317b4a 100644 --- a/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml +++ b/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml @@ -26,9 +26,4 @@ <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> </style> - - <style name="Theme.Sherlock.Dialog" parent="android:Theme.Holo.Dialog"> - </style> - <style name="Theme.Sherlock.Light.Dialog" parent="android:Theme.Holo.Light.Dialog"> - </style> </resources> diff --git a/libraries/ActionBarSherlock/res/values/abs__attrs.xml b/libraries/ActionBarSherlock/res/values/abs__attrs.xml index 32631ca8d..af5873d90 100644 --- a/libraries/ActionBarSherlock/res/values/abs__attrs.xml +++ b/libraries/ActionBarSherlock/res/values/abs__attrs.xml @@ -181,7 +181,7 @@ <!-- Drawable used as a background for activated items. --> <attr name="activatedBackgroundIndicator" format="reference" /> - <attr name="android:windowIsFloating" /> + <attr name="dropDownHintAppearance" format="reference" /> </declare-styleable> diff --git a/libraries/ActionBarSherlock/res/values/abs__colors.xml b/libraries/ActionBarSherlock/res/values/abs__colors.xml index 625c632ff..b189e727a 100644 --- a/libraries/ActionBarSherlock/res/values/abs__colors.xml +++ b/libraries/ActionBarSherlock/res/values/abs__colors.xml @@ -21,7 +21,4 @@ <color name="abs__bright_foreground_holo_light">@color/abs__background_holo_dark</color> <color name="abs__bright_foreground_disabled_holo_dark">#ff4c4c4c</color> <color name="abs__bright_foreground_disabled_holo_light">#ffb2b2b2</color> - <color name="abs__bright_foreground_inverse_holo_dark">@color/abs__bright_foreground_holo_light</color> - <color name="abs__bright_foreground_inverse_holo_light">@color/abs__bright_foreground_holo_dark</color> - <color name="abs__holo_blue_light">#ff33b5e5</color> </resources> diff --git a/libraries/ActionBarSherlock/res/values/abs__dimens.xml b/libraries/ActionBarSherlock/res/values/abs__dimens.xml index 831289e07..9ded21978 100644 --- a/libraries/ActionBarSherlock/res/values/abs__dimens.xml +++ b/libraries/ActionBarSherlock/res/values/abs__dimens.xml @@ -36,18 +36,6 @@ <!-- Minimum width for an action button in the menu area of an action bar --> <dimen name="abs__action_button_min_width">56dip</dimen> - <!-- Dialog title height --> - <dimen name="abs__alert_dialog_title_height">64dip</dimen> - - <!-- The platform's desired minimum size for a dialog's width when it - is along the major axis (that is the screen is landscape). This may - be either a fraction or a dimension. --> - <item type="dimen" name="abs__dialog_min_width_major">65%</item> - <!-- The platform's desired minimum size for a dialog's width when it - is along the minor axis (that is the screen is portrait). This may - be either a fraction or a dimension. --> - <item type="dimen" name="abs__dialog_min_width_minor">95%</item> - <!-- Text padding for dropdown items --> <dimen name="abs__dropdownitem_text_padding_left">8dip</dimen> diff --git a/libraries/ActionBarSherlock/res/values/abs__strings.xml b/libraries/ActionBarSherlock/res/values/abs__strings.xml index 06a2a2af4..cf0235922 100644 --- a/libraries/ActionBarSherlock/res/values/abs__strings.xml +++ b/libraries/ActionBarSherlock/res/values/abs__strings.xml @@ -29,10 +29,6 @@ <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] --> <string name="abs__activity_chooser_view_see_all">See all...</string> - <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] --> - <string name="abs__activity_chooser_view_dialog_title_default">Select activity</string> - <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] --> - <string name="abs__share_action_provider_share_with">Share with...</string> <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] --> <string name="abs__activitychooserview_choose_application">Choose an application</string> <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] --> diff --git a/libraries/ActionBarSherlock/res/values/abs__styles.xml b/libraries/ActionBarSherlock/res/values/abs__styles.xml index 45a18c183..f86c1b823 100644 --- a/libraries/ActionBarSherlock/res/values/abs__styles.xml +++ b/libraries/ActionBarSherlock/res/values/abs__styles.xml @@ -302,25 +302,6 @@ - <style name="DialogWindowTitle.Sherlock" parent="Widget"> - <item name="android:maxLines">1</item> - <item name="android:scrollHorizontally">true</item> - <item name="android:textAppearance">@style/TextAppearance.Sherlock.DialogWindowTitle</item> - <item name="android:minHeight">@dimen/abs__alert_dialog_title_height</item> - <item name="android:paddingLeft">16dip</item> - <item name="android:paddingRight">16dip</item> - </style> - <style name="DialogWindowTitle.Sherlock.Light" parent="Widget"> - <item name="android:maxLines">1</item> - <item name="android:scrollHorizontally">true</item> - <item name="android:textAppearance">@style/TextAppearance.Sherlock.Light.DialogWindowTitle</item> - <item name="android:minHeight">@dimen/abs__alert_dialog_title_height</item> - <item name="android:paddingLeft">16dip</item> - <item name="android:paddingRight">16dip</item> - </style> - - - <style name="TextAppearance.Sherlock.Widget.ActionBar.Menu" parent="Widget"> <item name="android:textSize">12sp</item> <item name="android:textStyle">bold</item> @@ -387,15 +368,6 @@ <item name="android:textStyle">normal</item> </style> - <style name="TextAppearance.Sherlock.DialogWindowTitle" parent="Widget"> - <item name="android:textSize">22sp</item> - <item name="android:textColor">@color/abs__holo_blue_light</item> - </style> - <style name="TextAppearance.Sherlock.Light.DialogWindowTitle" parent="Widget"> - <item name="android:textSize">22sp</item> - <item name="android:textColor">@color/abs__holo_blue_light</item> - </style> - <style name="Sherlock.__TextAppearance.Small" parent="Widget"> <item name="android:textSize">14sp</item> <item name="android:textColor">?android:attr/textColorSecondary</item> @@ -409,4 +381,32 @@ <item name="android:textColor">?textColorPrimary</item> <item name="android:textSize">14sp</item> </style> + + <style name="TextAppearance.Sherlock" parent="@android:style/TextAppearance"/> + + <style name="TextAppearance.Sherlock.SearchResult"> + <item name="android:textStyle">normal</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textColorHint">?android:attr/textColorHint</item> + </style> + + <style name="TextAppearance.Sherlock.SearchResult.Title"> + <item name="android:textSize">18sp</item> + </style> + + <style name="TextAppearance.Sherlock.SearchResult.Subtitle"> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorSecondary</item> + </style> + + <style name="TextAppearance.Sherlock.Light.SearchResult" parent="TextAppearance.Sherlock.SearchResult"/> + + <style name="TextAppearance.Sherlock.Light.SearchResult.Title"> + <item name="android:textSize">18sp</item> + </style> + + <style name="TextAppearance.Sherlock.Light.SearchResult.Subtitle"> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorSecondary</item> + </style> </resources> diff --git a/libraries/ActionBarSherlock/res/values/abs__themes.xml b/libraries/ActionBarSherlock/res/values/abs__themes.xml index 634fa798b..6215e048f 100644 --- a/libraries/ActionBarSherlock/res/values/abs__themes.xml +++ b/libraries/ActionBarSherlock/res/values/abs__themes.xml @@ -9,8 +9,6 @@ </style> <style name="Sherlock.__Theme.DarkActionBar" parent="Theme.Sherlock.Light"> </style> - <style name="Sherlock.__Theme.Dialog" parent="android:Theme.Dialog"> - </style> <style name="Theme.Sherlock" parent="Sherlock.__Theme"> <!-- Action bar styles (from Theme.Holo) --> @@ -62,6 +60,8 @@ <item name="textAppearanceSmall">@style/TextAppearance.Sherlock.Small</item> <item name="textAppearanceLargePopupMenu">@style/TextAppearance.Sherlock.Widget.PopupMenu.Large</item> <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Sherlock.Widget.PopupMenu.Small</item> + <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Sherlock.SearchResult.Title</item> + <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Sherlock.SearchResult.Subtitle</item> <item name="popupMenuStyle">@style/Widget.Sherlock.PopupMenu</item> <!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.ListPopupWindow</item> @@ -74,8 +74,12 @@ <item name="searchViewGoIcon">@drawable/abs__ic_go</item> <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search</item> <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.SearchAutoCompleteTextView</item> - <item name="android:dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item> + <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item> + <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_dark</item> + <item name="searchViewEditQueryBackground">?selectableItemBackground</item> + <item name="searchResultListItemHeight">58dp</item> + <item name="windowNoTitle">false</item> <item name="windowActionBar">true</item> <item name="windowActionModeOverlay">false</item> <item name="windowContentOverlay">@null</item> @@ -130,6 +134,8 @@ <item name="textAppearanceSmall">@style/TextAppearance.Sherlock.Light.Small</item> <item name="textAppearanceLargePopupMenu">@style/TextAppearance.Sherlock.Light.Widget.PopupMenu.Large</item> <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Sherlock.Light.Widget.PopupMenu.Small</item> + <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Sherlock.Light.SearchResult.Title</item> + <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Sherlock.Light.SearchResult.Subtitle</item> <item name="popupMenuStyle">@style/Widget.Sherlock.Light.PopupMenu</item> <!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.Light.ListPopupWindow</item> @@ -142,8 +148,12 @@ <item name="searchViewGoIcon">@drawable/abs__ic_go_search_api_holo_light</item> <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search_api_holo_light</item> <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.Light.SearchAutoCompleteTextView</item> - <item name="android:dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item> + <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item> + <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_light</item> + <item name="searchViewEditQueryBackground">?selectableItemBackground</item> + <item name="searchResultListItemHeight">58dp</item> + <item name="windowNoTitle">false</item> <item name="windowActionBar">true</item> <item name="windowActionModeOverlay">false</item> <item name="windowContentOverlay">@null</item> @@ -171,6 +181,18 @@ <item name="actionModePopupWindowStyle">@style/Widget.Sherlock.PopupWindow.ActionMode</item> <item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_dark</item> + + <!-- We want the dark action bar SearchView stuff --> + <item name="searchDropdownBackground">@drawable/abs__search_dropdown_dark</item> + <item name="searchViewTextField">@drawable/abs__textfield_searchview_holo_dark</item> + <item name="searchViewTextFieldRight">@drawable/abs__textfield_searchview_right_holo_dark</item> + <item name="searchViewCloseIcon">@drawable/abs__ic_clear</item> + <item name="searchViewSearchIcon">@drawable/abs__ic_search</item> + <item name="searchViewGoIcon">@drawable/abs__ic_go</item> + <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search</item> + <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.SearchAutoCompleteTextView</item> + <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item> + <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_dark</item> </style> @@ -182,58 +204,4 @@ <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> - - - <style name="Theme.Sherlock.Dialog" parent="android:Theme"> - <item name="android:windowFrame">@null</item> - <item name="android:windowTitleStyle">@style/DialogWindowTitle.Sherlock</item> - <item name="android:windowBackground">@drawable/abs__dialog_full_holo_dark</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> - <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> - - <item name="android:windowActionBar">false</item> - <item name="android:windowActionModeOverlay">true</item> - <item name="android:windowCloseOnTouchOutside">true</item> - <item name="android:windowNoTitle">true</item> - <item name="android:backgroundDimAmount">0.6</item> - - <item name="android:colorBackgroundCacheHint">@null</item> - - <item name="android:textColorPrimary">@color/abs__primary_text_holo_dark</item> - <item name="android:textColorPrimaryInverse">@color/abs__primary_text_holo_light</item> - - <item name="windowMinWidthMajor">@dimen/abs__dialog_min_width_major</item> - <item name="windowMinWidthMinor">@dimen/abs__dialog_min_width_minor</item> - - <item name="windowActionBar">false</item> - <item name="windowContentOverlay">@null</item> - </style> - <style name="Theme.Sherlock.Light.Dialog" parent="android:Theme.Light"> - <item name="android:windowFrame">@null</item> - <item name="android:windowTitleStyle">@style/DialogWindowTitle.Sherlock.Light</item> - <item name="android:windowBackground">@drawable/abs__dialog_full_holo_light</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> - <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> - - <item name="android:windowActionBar">false</item> - <item name="android:windowActionModeOverlay">true</item> - <item name="android:windowCloseOnTouchOutside">true</item> - <item name="android:windowNoTitle">true</item> - <item name="android:backgroundDimAmount">0.6</item> - - <item name="android:colorBackgroundCacheHint">@null</item> - - <item name="android:textColorPrimary">@color/abs__primary_text_holo_light</item> - <item name="android:textColorPrimaryInverse">@color/abs__primary_text_holo_dark</item> - - <item name="windowMinWidthMajor">@dimen/abs__dialog_min_width_major</item> - <item name="windowMinWidthMinor">@dimen/abs__dialog_min_width_minor</item> - - <item name="windowActionBar">false</item> - <item name="windowContentOverlay">@null</item> - </style> </resources> |
