Skip to content

Commit 4224790

Browse files
adampAndroid (Google) Code Review
authored andcommitted
Merge "Animate the action bar's Up chevron as it shows and hides." into jb-mr1-dev
2 parents b14c215 + fd75eef commit 4224790

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

core/java/com/android/internal/widget/ActionBarView.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.android.internal.view.menu.MenuView;
2727
import com.android.internal.view.menu.SubMenuBuilder;
2828

29+
import android.animation.LayoutTransition;
2930
import android.app.ActionBar;
3031
import android.app.ActionBar.OnNavigationListener;
3132
import android.app.Activity;
@@ -1271,12 +1272,19 @@ private static class HomeView extends FrameLayout {
12711272
private ImageView mIconView;
12721273
private int mUpWidth;
12731274

1275+
private static final long DEFAULT_TRANSITION_DURATION = 150;
1276+
12741277
public HomeView(Context context) {
12751278
this(context, null);
12761279
}
12771280

12781281
public HomeView(Context context, AttributeSet attrs) {
12791282
super(context, attrs);
1283+
LayoutTransition t = getLayoutTransition();
1284+
if (t != null) {
1285+
// Set a lower duration than the default
1286+
t.setDuration(DEFAULT_TRANSITION_DURATION);
1287+
}
12801288
}
12811289

12821290
public void setUp(boolean isUp) {

core/res/res/layout/action_bar_home.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
class="com.android.internal.widget.ActionBarView$HomeView"
1919
android:layout_width="wrap_content"
2020
android:layout_height="match_parent"
21-
android:background="?android:attr/actionBarItemBackground" >
21+
android:background="?android:attr/actionBarItemBackground"
22+
android:animateLayoutChanges="true">
2223
<ImageView android:id="@android:id/up"
2324
android:src="?android:attr/homeAsUpIndicator"
2425
android:layout_gravity="center_vertical|start"

0 commit comments

Comments
 (0)