Update ActionBarSherlock
This commit is contained in:
Dominik Schürmann
@@ -74,6 +74,9 @@
|
||||
<!-- Small Button style. -->
|
||||
<attr name="buttonStyleSmall" format="reference" />
|
||||
|
||||
<!-- Background drawable for standalone items that need focus/pressed states. -->
|
||||
<attr name="selectableItemBackground" format="reference" />
|
||||
|
||||
|
||||
|
||||
<!-- This Drawable is overlaid over the foreground of the Window's content area, usually
|
||||
@@ -97,6 +100,40 @@
|
||||
<attr name="spinnerItemStyle" format="reference" />
|
||||
<attr name="spinnerDropDownItemStyle" format="reference" />
|
||||
|
||||
<!-- ============================ -->
|
||||
<!-- SearchView styles and assets -->
|
||||
<!-- ============================ -->
|
||||
<eat-comment />
|
||||
<!-- SearchView AutoCompleteTextView style -->
|
||||
<attr name="searchAutoCompleteTextView" format="reference" />
|
||||
<!-- SearchView dropdown background -->
|
||||
<attr name="searchDropdownBackground" format="reference" />
|
||||
<!-- SearchView close button icon -->
|
||||
<attr name="searchViewCloseIcon" format="reference" />
|
||||
<!-- SearchView Go button icon -->
|
||||
<attr name="searchViewGoIcon" format="reference" />
|
||||
<!-- SearchView Search icon -->
|
||||
<attr name="searchViewSearchIcon" format="reference" />
|
||||
<!-- SearchView Voice button icon -->
|
||||
<attr name="searchViewVoiceIcon" format="reference" />
|
||||
<!-- SearchView query refinement icon -->
|
||||
<attr name="searchViewEditQuery" format="reference" />
|
||||
<!-- SearchView query refinement icon background -->
|
||||
<attr name="searchViewEditQueryBackground" format="reference" />
|
||||
<!-- SearchView text field background for the left section -->
|
||||
<attr name="searchViewTextField" format="reference" />
|
||||
<!-- SearchView text field background for the right section -->
|
||||
<attr name="searchViewTextFieldRight" format="reference" />
|
||||
<!-- Text color for urls in search suggestions, used by things like global search and the browser. @hide -->
|
||||
<attr name="textColorSearchUrl" format="reference|color" />
|
||||
<!-- The list item height for search results. @hide -->
|
||||
<attr name="searchResultListItemHeight" format="dimension" />
|
||||
<!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. -->
|
||||
<attr name="textAppearanceSearchResultTitle" format="reference" />
|
||||
<!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. -->
|
||||
<attr name="textAppearanceSearchResultSubtitle" format="reference" />
|
||||
|
||||
|
||||
<!-- =========== -->
|
||||
<!-- List styles -->
|
||||
<!-- =========== -->
|
||||
@@ -144,9 +181,6 @@
|
||||
<!-- Drawable used as a background for activated items. -->
|
||||
<attr name="activatedBackgroundIndicator" format="reference" />
|
||||
|
||||
<!-- Specified if we are forcing an action item overflow menu. -->
|
||||
<attr name="absForceOverflow" format="boolean" />
|
||||
|
||||
<attr name="android:windowIsFloating" />
|
||||
</declare-styleable>
|
||||
|
||||
@@ -377,4 +411,22 @@
|
||||
<!-- Gravity setting for positioning the currently selected item. -->
|
||||
<attr name="android:gravity" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="SherlockSearchView">
|
||||
<!-- The default state of the SearchView. If true, it will be iconified when not in
|
||||
use and expanded when clicked. -->
|
||||
<attr name="iconifiedByDefault" format="boolean"/>
|
||||
<!-- An optional maximum width of the SearchView. -->
|
||||
<attr name="android:maxWidth" />
|
||||
<!-- An optional query hint string to be displayed in the empty query field. -->
|
||||
<attr name="queryHint" format="string" />
|
||||
<!-- The IME options to set on the query text field. -->
|
||||
<attr name="android:imeOptions" />
|
||||
<!-- The input type to set on the query text field. -->
|
||||
<attr name="android:inputType" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="SherlockView">
|
||||
<attr name="android:focusable"/>
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
||||
@@ -30,15 +30,15 @@
|
||||
<dimen name="abs__action_bar_subtitle_top_margin">-3dp</dimen>
|
||||
<!-- Bottom margin for action bar subtitles -->
|
||||
<dimen name="abs__action_bar_subtitle_bottom_margin">5dip</dimen>
|
||||
|
||||
|
||||
<integer name="abs__max_action_buttons">2</integer>
|
||||
|
||||
<!-- 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. -->
|
||||
@@ -47,4 +47,21 @@
|
||||
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>
|
||||
|
||||
<!-- Text padding for dropdown items -->
|
||||
<dimen name="abs__dropdownitem_text_padding_right">8dip</dimen>
|
||||
|
||||
<!-- Width of the icon in a dropdown list -->
|
||||
<dimen name="abs__dropdownitem_icon_width">32dip</dimen>
|
||||
|
||||
|
||||
<!-- Minimum width of the search view text entry area. -->
|
||||
<dimen name="abs__search_view_text_min_width">160dip</dimen>
|
||||
|
||||
<!-- Preferred width of the search view. -->
|
||||
<dimen name="abs__search_view_preferred_width">320dip</dimen>
|
||||
</resources>
|
||||
|
||||
@@ -39,4 +39,15 @@
|
||||
<string name="abs__shareactionprovider_share_with">Share with</string>
|
||||
<!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__shareactionprovider_share_with_application">Share with <xliff:g id="application_name" example="Bluetooth">%s</xliff:g></string>
|
||||
|
||||
<!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__searchview_description_search">Search</string>
|
||||
<!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__searchview_description_query">Search query</string>
|
||||
<!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__searchview_description_clear">Clear query</string>
|
||||
<!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__searchview_description_submit">Submit query</string>
|
||||
<!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
|
||||
<string name="abs__searchview_description_voice">Voice search</string>
|
||||
</resources>
|
||||
|
||||
@@ -182,6 +182,7 @@
|
||||
<item name="android:divider">?attr/dividerVertical</item>
|
||||
<item name="android:showDividers">middle</item>
|
||||
<item name="android:dividerPadding">6dip</item>
|
||||
<item name="android:minHeight">?attr/actionBarSize</item>
|
||||
</style>
|
||||
<style name="Widget.Sherlock.ActivityChooserView" parent="Sherlock.__Widget.ActivityChooserView">
|
||||
</style>
|
||||
@@ -279,6 +280,28 @@
|
||||
|
||||
|
||||
|
||||
<style name="Sherlock.__Widget.SearchAutoCompleteTextView" parent="Widget">
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="android:focusableInTouchMode">true</item>
|
||||
<item name="android:clickable">true</item>
|
||||
<item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
|
||||
<item name="android:textColor">?attr/textColorPrimary</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:completionHintView">@layout/abs__simple_dropdown_hint</item>
|
||||
<item name="android:completionThreshold">2</item>
|
||||
<item name="android:dropDownWidth">wrap_content</item>
|
||||
</style>
|
||||
<style name="Widget.Sherlock.SearchAutoCompleteTextView" parent="Sherlock.__Widget.SearchAutoCompleteTextView">
|
||||
<item name="android:dropDownSelector">@drawable/abs__list_selector_holo_dark</item>
|
||||
<item name="android:popupBackground">@drawable/abs__menu_dropdown_panel_holo_dark</item>
|
||||
</style>
|
||||
<style name="Widget.Sherlock.Light.SearchAutoCompleteTextView" parent="Sherlock.__Widget.SearchAutoCompleteTextView">
|
||||
<item name="android:dropDownSelector">@drawable/abs__list_selector_holo_light</item>
|
||||
<item name="android:popupBackground">@drawable/abs__menu_dropdown_panel_holo_light</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
<style name="DialogWindowTitle.Sherlock" parent="Widget">
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:scrollHorizontally">true</item>
|
||||
@@ -381,4 +404,9 @@
|
||||
</style>
|
||||
<style name="TextAppearance.Sherlock.Light.Small" parent="TextAppearance.Sherlock.Small">
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Sherlock.Widget.DropDownHint" parent="Widget">
|
||||
<item name="android:textColor">?textColorPrimary</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</style>
|
||||
<style name="Sherlock.__Theme.Dialog" parent="android:Theme.Dialog">
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Sherlock" parent="Sherlock.__Theme">
|
||||
<!-- Action bar styles (from Theme.Holo) -->
|
||||
<item name="actionDropDownStyle">@style/Widget.Sherlock.Spinner.DropDown.ActionBar</item>
|
||||
@@ -29,41 +29,53 @@
|
||||
<item name="actionBarSize">@dimen/abs__action_bar_default_height</item>
|
||||
<!-- Internal --><item name="actionModePopupWindowStyle">@style/Widget.Sherlock.PopupWindow.ActionMode</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Action bar styles (defaults from Theme) -->
|
||||
<item name="actionBarSplitStyle">?attr/actionBarStyle</item>
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.Sherlock.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?attr/textColorPrimary</item>
|
||||
<item name="actionBarDivider">?attr/dividerVertical</item>
|
||||
<item name="actionBarItemBackground">@drawable/abs__item_background_holo_dark</item>
|
||||
<item name="actionBarItemBackground">?attr/selectableItemBackground</item>
|
||||
|
||||
<item name="buttonStyleSmall">@style/Widget.Sherlock.Button.Small</item>
|
||||
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abs__item_background_holo_dark</item>
|
||||
|
||||
<item name="activatedBackgroundIndicator">@drawable/abs__activated_background_holo_dark</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_dark</item>
|
||||
<item name="activityChooserViewStyle">@style/Widget.Sherlock.ActivityChooserView</item>
|
||||
|
||||
|
||||
<item name="homeAsUpIndicator">@drawable/abs__ic_ab_back_holo_dark</item>
|
||||
|
||||
|
||||
<item name="dividerVertical">@drawable/abs__list_divider_holo_dark</item>
|
||||
|
||||
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.Sherlock.DropDownItem.Spinner</item>
|
||||
<item name="spinnerItemStyle">@style/Widget.Sherlock.TextView.SpinnerItem</item>
|
||||
|
||||
|
||||
<item name="textColorPrimary">@color/abs__primary_text_holo_dark</item>
|
||||
<item name="textColorPrimaryDisableOnly">@color/abs__primary_text_disable_only_holo_dark</item>
|
||||
<item name="textColorPrimaryInverse">@color/abs__primary_text_holo_light</item>
|
||||
|
||||
|
||||
<!-- Internal --><item name="dropdownListPreferredItemHeight">48dip</item>
|
||||
<item name="dropDownListViewStyle">@style/Widget.Sherlock.ListView.DropDown</item>
|
||||
|
||||
<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="popupMenuStyle">@style/Widget.Sherlock.PopupMenu</item>
|
||||
<!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.ListPopupWindow</item>
|
||||
|
||||
|
||||
<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="android:dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item>
|
||||
|
||||
<item name="windowActionBar">true</item>
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="windowContentOverlay">@null</item>
|
||||
@@ -85,41 +97,53 @@
|
||||
<item name="actionBarSize">@dimen/abs__action_bar_default_height</item>
|
||||
<!-- Internal --><item name="actionModePopupWindowStyle">@style/Widget.Sherlock.Light.PopupWindow.ActionMode</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Action bar styles (defaults from Theme) -->
|
||||
<item name="actionBarSplitStyle">?attr/actionBarStyle</item>
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.Sherlock.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?attr/textColorPrimary</item>
|
||||
<item name="actionBarDivider">?attr/dividerVertical</item>
|
||||
<item name="actionBarItemBackground">@drawable/abs__item_background_holo_light</item>
|
||||
<item name="actionBarItemBackground">?attr/selectableItemBackground</item>
|
||||
|
||||
<item name="buttonStyleSmall">@style/Widget.Sherlock.Light.Button.Small</item>
|
||||
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abs__item_background_holo_light</item>
|
||||
|
||||
<item name="activatedBackgroundIndicator">@drawable/abs__activated_background_holo_light</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_light</item>
|
||||
<item name="activityChooserViewStyle">@style/Widget.Sherlock.Light.ActivityChooserView</item>
|
||||
|
||||
|
||||
<item name="homeAsUpIndicator">@drawable/abs__ic_ab_back_holo_light</item>
|
||||
|
||||
|
||||
<item name="dividerVertical">@drawable/abs__list_divider_holo_light</item>
|
||||
|
||||
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.Sherlock.Light.DropDownItem.Spinner</item>
|
||||
<item name="spinnerItemStyle">@style/Widget.Sherlock.TextView.SpinnerItem</item>
|
||||
|
||||
|
||||
<item name="textColorPrimary">@color/abs__primary_text_holo_light</item>
|
||||
<item name="textColorPrimaryDisableOnly">@color/abs__primary_text_disable_only_holo_light</item>
|
||||
<item name="textColorPrimaryInverse">@color/abs__primary_text_holo_dark</item>
|
||||
|
||||
|
||||
<!-- Internal --><item name="dropdownListPreferredItemHeight">48dip</item>
|
||||
<item name="dropDownListViewStyle">@style/Widget.Sherlock.Light.ListView.DropDown</item>
|
||||
|
||||
<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="popupMenuStyle">@style/Widget.Sherlock.Light.PopupMenu</item>
|
||||
<!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.Light.ListPopupWindow</item>
|
||||
|
||||
|
||||
<item name="searchDropdownBackground">@drawable/abs__search_dropdown_light</item>
|
||||
<item name="searchViewTextField">@drawable/abs__textfield_searchview_holo_light</item>
|
||||
<item name="searchViewTextFieldRight">@drawable/abs__textfield_searchview_right_holo_light</item>
|
||||
<item name="searchViewCloseIcon">@drawable/abs__ic_clear_holo_light</item>
|
||||
<item name="searchViewSearchIcon">@drawable/abs__ic_search_api_holo_light</item>
|
||||
<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="windowActionBar">true</item>
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="windowContentOverlay">@null</item>
|
||||
@@ -145,11 +169,11 @@
|
||||
<item name="actionModeStyle">@style/Widget.Sherlock.Light.ActionMode.Inverse</item>
|
||||
<item name="actionModeCloseButtonStyle">@style/Widget.Sherlock.ActionButton.CloseMode</item>
|
||||
<item name="actionModePopupWindowStyle">@style/Widget.Sherlock.PopupWindow.ActionMode</item>
|
||||
|
||||
|
||||
<item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_dark</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
|
||||
<style name="Theme.Sherlock.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
@@ -158,19 +182,8 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Sherlock.ForceOverflow">
|
||||
<item name="absForceOverflow">true</item>
|
||||
</style>
|
||||
<style name="Theme.Sherlock.Light.ForceOverflow">
|
||||
<item name="absForceOverflow">true</item>
|
||||
</style>
|
||||
<style name="Theme.Sherlock.Light.DarkActionBar.ForceOverflow">
|
||||
<item name="absForceOverflow">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>
|
||||
@@ -179,21 +192,21 @@
|
||||
<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>
|
||||
@@ -205,21 +218,21 @@
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user