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

Commit 0c2918f4 authored by Ian Parkinson's avatar Ian Parkinson
Browse files

Use View.generateViewId if available

Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
parent 4b8d11fc
Loading
Loading
Loading
Loading
+13 −12
Original line number Diff line number Diff line
@@ -689,12 +689,12 @@ public class Launcher extends Activity
        }
    }

    /**
     * Copied from View -- the View version of the method isn't called
     * anywhere else in our process and only exists for API level 17+,
     * so it's ok to keep our own version with no API requirement.
     */
    public static int generateViewId() {
        if (Build.VERSION.SDK_INT >= 17) {
            return View.generateViewId();
        } else {
            // View.generateViewId() is not available. The following fallback logic is a copy
            // of its implementation.
            for (;;) {
                final int result = sNextGeneratedId.get();
                // aapt-generated IDs have the high byte nonzero; clamp to the range under that.
@@ -705,6 +705,7 @@ public class Launcher extends Activity
                }
            }
        }
    }

    public int getViewIdForItem(ItemInfo info) {
        // This cast is safe given the > 2B range for int.