Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60add06f authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 4224790f: Merge "Animate the action bar\'s Up chevron as it shows and hides." into jb-mr1-dev 

* commit '4224790f':
  Animate the action bar's Up chevron as it shows and hides.
parents fb5dfb70 4224790f

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.internal.view.menu.MenuPresenter; 
import com.android.internal.view.menu.MenuView;

import com.android.internal.view.menu.MenuView;

import com.android.internal.view.menu.SubMenuBuilder;

import com.android.internal.view.menu.SubMenuBuilder;





import android.animation.LayoutTransition;

import android.app.ActionBar;

import android.app.ActionBar;

import android.app.ActionBar.OnNavigationListener;

import android.app.ActionBar.OnNavigationListener;

import android.app.Activity;

import android.app.Activity;
@@ -1271,12 +1272,19 @@ public class ActionBarView extends AbsActionBarView { 
        private ImageView mIconView;

        private ImageView mIconView;

        private int mUpWidth;

        private int mUpWidth;





        private static final long DEFAULT_TRANSITION_DURATION = 150;



        public HomeView(Context context) {

        public HomeView(Context context) {

            this(context, null);

            this(context, null);

        }

        }





        public HomeView(Context context, AttributeSet attrs) {

        public HomeView(Context context, AttributeSet attrs) {

            super(context, attrs);

            super(context, attrs);

            LayoutTransition t = getLayoutTransition();

            if (t != null) {

                // Set a lower duration than the default

                t.setDuration(DEFAULT_TRANSITION_DURATION);

            }

        }

        }





        public void setUp(boolean isUp) {

        public void setUp(boolean isUp) {

core/res/res/layout/action_bar_home.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ 
      class="com.android.internal.widget.ActionBarView$HomeView"

      class="com.android.internal.widget.ActionBarView$HomeView"

      android:layout_width="wrap_content"

      android:layout_width="wrap_content"

      android:layout_height="match_parent"

      android:layout_height="match_parent"

      android:background="?android:attr/actionBarItemBackground" >

      android:background="?android:attr/actionBarItemBackground"

      android:animateLayoutChanges="true">

    <ImageView android:id="@android:id/up"

    <ImageView android:id="@android:id/up"

               android:src="?android:attr/homeAsUpIndicator"

               android:src="?android:attr/homeAsUpIndicator"

               android:layout_gravity="center_vertical|start"

               android:layout_gravity="center_vertical|start"