| commit | b5941170b8a9028ba970c58ec7bf2c45a27e969e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:49 2020 +0000 |
| tree | 88fc8661237a3feef49be553c71f1bc9d65317d7 | |
| parent | 00274210aee1cba35f0a0875395d256ebe5f4a6c [diff] | |
| parent | cc38b2532ca3da9a852f6005eac7d89283562f07 [diff] |
[automerger skipped] Merge Android R am: f9f607e877 -s ours am: cc38b2532c -s ours am skip reason: Change-Id Iaf511a01e9a73da3d82251eae2ea49f39f78627d with SHA-1 de477966df is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1422428 Change-Id: Ia70fd5cf48e941d0b02564b509552839df18f189
diff --git a/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java b/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java index 22a0a32..e08f523 100644 --- a/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java +++ b/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java
@@ -191,7 +191,7 @@ // Copied from com.android.internal.view.menu.MenuPopHelper.measureContentWidth() private int measureContentWidth(@NonNull ListAdapter adapter) { - // Menus don't tend to be long, so this shouldn't be a problem + // Menus don't tend to be long, so this is shouldn't be a problem int maxWidth = 0; View itemView = null; int itemType = 0;