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

Commit 8fb120b6 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "add ViewGroup's layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev

parents 938e8b67 dc74caa7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ package android { 
    field public static final int layout = 16842994; // 0x10100f2

    field public static final int layoutAnimation = 16842988; // 0x10100ec

    field public static final int layoutDirection = 16843698; // 0x10103b2

    field public static final int layoutMode = 16843738; // 0x10103da

    field public static final int layout_above = 16843140; // 0x1010184

    field public static final int layout_alignBaseline = 16843142; // 0x1010186

    field public static final int layout_alignBottom = 16843146; // 0x101018a

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2046,6 +2046,7 @@ 
  <public type="attr" name="canRequestTouchExplorationMode" id="0x010103d7" />

  <public type="attr" name="canRequestEnhancedWebAccessibility" id="0x010103d8" />

  <public type="attr" name="canRequestFilterKeyEvents" id="0x010103d9" />

  <public type="attr" name="layoutMode" id="0x010103da" />



  <public type="style" name="Theme.Holo.NoActionBar.Overscan" id="0x010301dd" />

  <public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" id="0x010301de" />