drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c112118a: Merge "move resources" into honeycomb-mr2

Browse Source 
* commit 'c112118a9091aa69ea70fea7c23f1e078ee87908':
  move resources
This commit is contained in:
Joe Onorato
2011-05-25 15:23:26 -07:00
committed by Android Git Automerger
parent 05e13b9edd c112118a90
commit a2a605a958
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
core/res/res/layout-xlarge/status_bar_latest_event_content.xml → core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
View File

0
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml → core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
View File

0
core/res/res/layout-xlarge/status_bar_latest_event_ticker.xml → core/res/res/layout-sw600dp/status_bar_latest_event_ticker.xml
View File

0
core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml → core/res/res/layout-sw600dp/status_bar_latest_event_ticker_large_icon.xml
View File

28
core/res/res/values-sw600dp/dimens.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/dimens.xml
**
** Copyright 2006, 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 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>
</resources>

0
core/res/res/values-xlarge/styles.xml → core/res/res/values-sw600dp/styles.xml
View File

7
core/res/res/values-xlarge/dimens.xml
View File

@ -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">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 -->