diff options
author | Xavier Ducrohet <xav@android.com> | 2012-02-06 14:57:22 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2012-02-06 15:11:12 -0800 |
commit | 7396348dfcfb45b7ad055f4c18cabbe5e8270d26 (patch) | |
tree | 66b6607b253b5197e19194bd423f2e4cedd2836b /tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java | |
parent | 0afa7e2d95a1ae047ceddf2ca67f05c67ac30770 (diff) | |
download | frameworks_base-7396348dfcfb45b7ad055f4c18cabbe5e8270d26.zip frameworks_base-7396348dfcfb45b7ad055f4c18cabbe5e8270d26.tar.gz frameworks_base-7396348dfcfb45b7ad055f4c18cabbe5e8270d26.tar.bz2 |
Setup ActionBars in layoutlib the same way the platform does it.
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).
This ensures that the icon is properly positionned and sized like
on devices.
Change-Id: I57432afa82d257bb043247001320b368045d7f55
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java')
-rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index 451edd2..5df2a21 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -474,7 +474,7 @@ public final class Matrix_Delegate { } Matrix_Delegate other = sManager.getDelegate(other_matrix); - if (d == null) { + if (other == null) { return false; } @@ -570,7 +570,7 @@ public final class Matrix_Delegate { } Matrix_Delegate other = sManager.getDelegate(other_matrix); - if (d == null) { + if (other == null) { return false; } |