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

Commit ce7a0e6c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 

* commit '7038c390':
  Move Documents action bar update even later.
parents 0d05788f 7038c390

packages/DocumentsUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
    <dimen name="icon_size">40dp</dimen>

    <dimen name="root_icon_size">24dp</dimen>



    <dimen name="grid_width">160dp</dimen>

    <dimen name="grid_width">152dp</dimen>

    <dimen name="grid_height">176dp</dimen>



    <dimen name="grid_item_width">160dp</dimen>

    <dimen name="grid_item_width">152dp</dimen>

    <dimen name="grid_item_height">176dp</dimen>

    <dimen name="grid_item_padding">4dp</dimen>

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ public class DocumentsActivity extends Activity { 
        if (mDrawerToggle != null) {

            mDrawerToggle.syncState();

        }

        updateActionBar();

    }



    public void setRootsDrawerOpen(boolean open) {
@@ -724,7 +725,6 @@ public class DocumentsActivity extends Activity { 
    @Override

    protected void onRestoreInstanceState(Bundle state) {

        super.onRestoreInstanceState(state);

        updateActionBar();

    }



    private BaseAdapter mStackAdapter = new BaseAdapter() {