diff options
author | Daniel Sandler <dsandler@android.com> | 2012-04-23 04:48:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 04:48:35 -0700 |
commit | 03c63ebebbc5945c724719a26445b168785c42e7 (patch) | |
tree | 613b012f10ce12ac251bf0f27173c97af3b57370 /core | |
parent | eb65757d24a97450fed160d66e86a4a62c392c5c (diff) | |
parent | 4a066c5c77109431f50806fc29179d28f1472871 (diff) | |
download | frameworks_base-03c63ebebbc5945c724719a26445b168785c42e7.zip frameworks_base-03c63ebebbc5945c724719a26445b168785c42e7.tar.gz frameworks_base-03c63ebebbc5945c724719a26445b168785c42e7.tar.bz2 |
Merge "Update SystemUI for sw600dp devices."
Diffstat (limited to 'core')
-rw-r--r-- | core/res/res/layout-sw720dp/status_bar_latest_event_ticker.xml (renamed from core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml) | 0 | ||||
-rw-r--r-- | core/res/res/layout-sw720dp/status_bar_latest_event_ticker_large_icon.xml (renamed from core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml) | 0 | ||||
-rw-r--r-- | core/res/res/values-large/dimens.xml | 7 | ||||
-rw-r--r-- | core/res/res/values-sw600dp/dimens.xml | 10 | ||||
-rw-r--r-- | core/res/res/values-sw720dp/dimens.xml | 25 | ||||
-rw-r--r-- | core/res/res/values/dimens.xml | 7 |
6 files changed, 34 insertions, 15 deletions
diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker.xml index 269e086..269e086 100644 --- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml +++ b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker.xml diff --git a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker_large_icon.xml index 69eac92..69eac92 100644 --- a/core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml +++ b/core/res/res/layout-sw720dp/status_bar_latest_event_ticker_large_icon.xml diff --git a/core/res/res/values-large/dimens.xml b/core/res/res/values-large/dimens.xml index 4f49135..864675a 100644 --- a/core/res/res/values-large/dimens.xml +++ b/core/res/res/values-large/dimens.xml @@ -17,13 +17,6 @@ */ --> <resources> - <!-- Height of the status bar --> - <dimen name="status_bar_height">48dip</dimen> - <!-- Width and height of a single notification icon in the status bar --> - <dimen name="status_bar_icon_size">32dip</dimen> - <!-- Size of the giant number (unread count) in the notifications --> - <dimen name="status_bar_content_number_size">48sp</dimen> - <!-- Default height of a key in the password keyboard for alpha --> <dimen name="password_keyboard_key_height_alpha">75dip</dimen> <!-- Default height of a key in the password keyboard for numeric --> diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml index 13acdd6..4514760 100644 --- a/core/res/res/values-sw600dp/dimens.xml +++ b/core/res/res/values-sw600dp/dimens.xml @@ -18,13 +18,6 @@ */ --> <resources> - <!-- Height of the status bar --> - <dimen name="status_bar_height">48dip</dimen> - <!-- Width and height of a single notification icon in the status bar --> - <dimen name="status_bar_icon_size">24dip</dimen> - <!-- Size of the giant number (unread count) in the notifications --> - <dimen name="status_bar_content_number_size">48sp</dimen> - <!-- 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. --> @@ -82,5 +75,8 @@ (the screen is in landscape). This may be either a fraction or a dimension.--> <item type="dimen" name="dialog_fixed_height_minor">90%</item> + <!-- Height of the bottom navigation bar in portrait; on sw600dp devices + this is a bit taller --> + <dimen name="navigation_bar_height_portrait">56dp</dimen> </resources> diff --git a/core/res/res/values-sw720dp/dimens.xml b/core/res/res/values-sw720dp/dimens.xml new file mode 100644 index 0000000..cac5aab --- /dev/null +++ b/core/res/res/values-sw720dp/dimens.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2012, 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> + <!-- Height of the bottom navigation bar in portrait; on sw720dp devices + this is the same as the height in landscape --> + <dimen name="navigation_bar_height_portrait">@dimen/navigation_bar_height</dimen> +</resources> + + diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index ef80160..392116f 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -34,16 +34,22 @@ <dimen name="status_bar_height">25dip</dimen> <!-- Height of the bottom navigation / system bar. --> <dimen name="navigation_bar_height">48dp</dimen> + <!-- Height of the bottom navigation bar in portrait --> + <dimen name="navigation_bar_height_portrait">@dimen/navigation_bar_height</dimen> <!-- Width of the navigation bar when it is placed vertically on the screen --> <dimen name="navigation_bar_width">42dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">24dip</dimen> <!-- Size of the giant number (unread count) in the notifications --> <dimen name="status_bar_content_number_size">48sp</dimen> + <!-- Height of the system bar (combined status & navigation); used by + SystemUI internally, not respected by the window manager. --> + <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen> <!-- Height of notification icons in the system bar --> <dimen name="system_bar_icon_size">32dip</dimen> <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. --> <dimen name="status_bar_edge_ignore">5dp</dimen> + <!-- Size of the fastscroll hint letter --> <dimen name="fastscroll_overlay_size">104dp</dimen> <!-- Width of the fastscroll thumb --> @@ -221,5 +227,4 @@ action bar tabs from becoming too wide on a wide screen when only a few are present. --> <dimen name="action_bar_stacked_tab_max_width">180dp</dimen> - </resources> |