diff options
Diffstat (limited to 'libraries/ActionBarSherlock/res/values')
6 files changed, 55 insertions, 106 deletions
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> |