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

* commit 'ce7a0e6cc7cd90cc5019f9b150a0295347f38406':
  Move Documents action bar update even later.
This commit is contained in:
Jeff Sharkey
2014-11-25 17:50:06 +00:00
committed by Android Git Automerger
2 changed files with 3 additions and 3 deletions

View File

@@ -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>

View File

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