diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-11-25 17:55:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 17:55:56 +0000 |
| commit | db81f23e228c3647caba50b7c47ae1e886d58fb1 (patch) | |
| tree | 00cbd4caff6097af1b82ac1698e61df56ae46967 /packages/DocumentsUI | |
| parent | d8eb415d618130516e9ba8c2228973f11a00f856 (diff) | |
| parent | 44952282e8e170483eef30f18c74fa3995cad0c9 (diff) | |
| download | frameworks_base-db81f23e228c3647caba50b7c47ae1e886d58fb1.zip frameworks_base-db81f23e228c3647caba50b7c47ae1e886d58fb1.tar.gz frameworks_base-db81f23e228c3647caba50b7c47ae1e886d58fb1.tar.bz2 | |
am 44952282: am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev
* commit '44952282e8e170483eef30f18c74fa3995cad0c9':
Move Documents action bar update even later.
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/DocumentsUI/res/values/dimens.xml b/packages/DocumentsUI/res/values/dimens.xml index d4d7ede..06f65e2 100644 --- a/packages/DocumentsUI/res/values/dimens.xml +++ b/packages/DocumentsUI/res/values/dimens.xml @@ -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> diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 219de38..8778f11 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -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() { |