diff options
author | Adam Powell <adamp@google.com> | 2011-08-19 11:46:59 -0700 |
---|---|---|
committer | Adam Powell <adamp@google.com> | 2011-08-19 12:18:13 -0700 |
commit | bfcdfaf919cdb67897a6e24afc8f14b2c810596a (patch) | |
tree | b935134b1e0dd91da9d53ed3ea20bd8348f26340 /core/res/res | |
parent | fb75e3b352ed2a47369c3c9466effe8cc2d04277 (diff) | |
download | frameworks_base-bfcdfaf919cdb67897a6e24afc8f14b2c810596a.zip frameworks_base-bfcdfaf919cdb67897a6e24afc8f14b2c810596a.tar.gz frameworks_base-bfcdfaf919cdb67897a6e24afc8f14b2c810596a.tar.bz2 |
Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items
Fix a bug where action menus were not updating after configuration
changes.
Change-Id: Iaeed7d924a7b8b40849fd8e1826ed1c8f4079c94
Diffstat (limited to 'core/res/res')
-rw-r--r-- | core/res/res/values-w360dp/dimens.xml (renamed from core/res/res/values-port/dimens.xml) | 2 | ||||
-rw-r--r-- | core/res/res/values-w500dp/dimens.xml | 24 | ||||
-rw-r--r-- | core/res/res/values-w600dp/dimens.xml | 24 | ||||
-rw-r--r-- | core/res/res/values/dimens.xml | 2 |
4 files changed, 50 insertions, 2 deletions
diff --git a/core/res/res/values-port/dimens.xml b/core/res/res/values-w360dp/dimens.xml index bf0a342..0f5d656 100644 --- a/core/res/res/values-port/dimens.xml +++ b/core/res/res/values-w360dp/dimens.xml @@ -20,5 +20,5 @@ <!-- The maximum number of action buttons that should be permitted within an action bar/action mode. This will be used to determine how many showAsAction="ifRoom" items can fit. "always" items can override this. --> - <integer name="max_action_buttons">2</integer> + <integer name="max_action_buttons">3</integer> </resources> diff --git a/core/res/res/values-w500dp/dimens.xml b/core/res/res/values-w500dp/dimens.xml new file mode 100644 index 0000000..68841ca --- /dev/null +++ b/core/res/res/values-w500dp/dimens.xml @@ -0,0 +1,24 @@ +<?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. +*/ +--> +<resources> + <!-- The maximum number of action buttons that should be permitted within + an action bar/action mode. This will be used to determine how many + showAsAction="ifRoom" items can fit. "always" items can override this. --> + <integer name="max_action_buttons">4</integer> +</resources> diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/values-w600dp/dimens.xml new file mode 100644 index 0000000..83c45b5 --- /dev/null +++ b/core/res/res/values-w600dp/dimens.xml @@ -0,0 +1,24 @@ +<?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. +*/ +--> +<resources> + <!-- The maximum number of action buttons that should be permitted within + an action bar/action mode. This will be used to determine how many + showAsAction="ifRoom" items can fit. "always" items can override this. --> + <integer name="max_action_buttons">5</integer> +</resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 83e8693..c522c1e 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -28,7 +28,7 @@ <!-- The maximum number of action buttons that should be permitted within an action bar/action mode. This will be used to determine how many showAsAction="ifRoom" items can fit. "always" items can override this. --> - <integer name="max_action_buttons">3</integer> + <integer name="max_action_buttons">2</integer> <dimen name="toast_y_offset">64dip</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height">25dip</dimen> |