Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow nav bar height to vary between portrait and landscape." into jb-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-04-27 10:24:14 -07:00
committed by Android (Google) Code Review
parent f5d70fd2ad 9f65c4c34a
commit f8d0494bf6
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/dimens.xml
View File

@@ -34,8 +34,8 @@
<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>
<!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
<dimen name="navigation_bar_height_landscape">48dp</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 -->

1
core/res/res/values/public.xml
View File

@@ -1184,6 +1184,7 @@
<java-symbol type="bool" name="config_showNavigationBar" />
<java-symbol type="bool" name="target_honeycomb_needs_options_menu" />
<java-symbol type="dimen" name="navigation_bar_height" />
<java-symbol type="dimen" name="navigation_bar_height_landscape" />
<java-symbol type="dimen" name="navigation_bar_width" />
<java-symbol type="dimen" name="status_bar_height" />
<java-symbol type="drawable" name="ic_jog_dial_sound_off" />

21
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -977,16 +977,21 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mStatusBarHeight = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.status_bar_height);
mNavigationBarHeightForRotation[Surface.ROTATION_0] =
mNavigationBarHeightForRotation[Surface.ROTATION_90] =
mNavigationBarHeightForRotation[Surface.ROTATION_180] =
mNavigationBarHeightForRotation[Surface.ROTATION_270] =
// Height of the navigation bar when presented horizontally at bottom
mNavigationBarHeightForRotation[mPortraitRotation] =
mNavigationBarHeightForRotation[mUpsideDownRotation] =
mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.navigation_bar_height);
mNavigationBarWidthForRotation[Surface.ROTATION_0] =
mNavigationBarWidthForRotation[Surface.ROTATION_90] =
mNavigationBarWidthForRotation[Surface.ROTATION_180] =
mNavigationBarWidthForRotation[Surface.ROTATION_270] =
mNavigationBarHeightForRotation[mLandscapeRotation] =
mNavigationBarHeightForRotation[mSeascapeRotation] =
mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.navigation_bar_height_landscape);
// Width of the navigation bar when presented vertically along one side
mNavigationBarWidthForRotation[mPortraitRotation] =
mNavigationBarWidthForRotation[mUpsideDownRotation] =
mNavigationBarWidthForRotation[mLandscapeRotation] =
mNavigationBarWidthForRotation[mSeascapeRotation] =
mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.navigation_bar_width);