diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-12 18:03:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 18:03:49 +0000 |
commit | db19e3fcb16f54a64b1a0b78cea408fe746b018f (patch) | |
tree | 42ac859a9e6d5306e17bd3f3c9f482caec500bc9 /res/values | |
parent | a72683009e0d51614e5b3028c18a1e479febcf1f (diff) | |
parent | b155bbb375c6bfed14f79def122d69c7659434f7 (diff) | |
download | android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.tar.gz android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.tar.bz2 android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.zip |
am b155bbb3: Merge "Using the default search widget in Launcher3" into ub-now-queens
* commit 'b155bbb375c6bfed14f79def122d69c7659434f7':
Using the default search widget in Launcher3
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 14 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 6 |
4 files changed, 0 insertions, 27 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index a52bbe23f..3331cdec4 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,13 +18,6 @@ <resources> - <!-- DrawableStateProxyView specific attributes. These attributes are used to customize - a DrawableStateProxyView view in XML files. --> - <declare-styleable name="DrawableStateProxyView"> - <!-- The source view to delegate touch presses events to. --> - <attr name="sourceViewId" format="integer" /> - </declare-styleable> - <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> <attr name="windowSize" format="integer" /> @@ -76,13 +69,6 @@ <attr name="strokeWidth" format="float" /> </declare-styleable> - <!-- HolographicLinearLayout specific attributes. --> - <declare-styleable name="HolographicLinearLayout"> - <!-- The source view to generate and apply the drawable states to/from --> - <attr name="sourceImageViewId" format="integer" /> - <attr name="stateHotwordOn" format="boolean" /> - </declare-styleable> - <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 493f29c69..f12cb57ba 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -43,9 +43,6 @@ <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> - <!-- External toolbar icon size (for bounds) --> - <dimen name="toolbar_external_icon_width">36dp</dimen> - <dimen name="toolbar_external_icon_height">36dp</dimen> <!-- AllApps/Customize/AppsCustomize --> <!-- The height of the tab bar - if this changes, we should update the diff --git a/res/values/strings.xml b/res/values/strings.xml index c5f17ac63..4af1f7347 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -132,10 +132,6 @@ s --> <!-- Label for the info icon. [CHAR_LIMIT=20] --> <string name="info_target_label">App info</string> - <!-- Accessibility: Search button --> - <string name="accessibility_search_button">Search</string> - <!-- Accessibility: Voice Search button --> - <string name="accessibility_voice_search_button">Voice Search</string> <!-- Accessibility: AllApps button --> <string name="accessibility_all_apps_button">Apps</string> <!-- Accessibility: Delete button --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 15415c7c6..77798f174 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -51,8 +51,6 @@ <item name="customShadows">false</item> </style> - <style name="SearchDropTargetBar"></style> - <style name="SearchButton"></style> <style name="DropTargetButtonContainer"> @@ -97,8 +95,4 @@ <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item> </style> - <style name="SearchButton.WithPaddingStart"> - <item name="android:paddingLeft">8dp</item> - </style> - </resources> |