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

Commit 43aef164 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Move Documents action bar update even later. 

At some point Activity started restoring the Toolbar/ActionBar title
during onPostCreate(), which would clobber some of the setup we just
finished doing.  To fix, move our update to be even later in the
restore lifecycle.

Also fix grid item widths for small screen devices.

Bug: 17428127
Change-Id: I258121b6a6eec5924f92b02290a67d3ae7dd9cf6
parent 88d2a3c0

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() {