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

Commit c70ca2aa authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "edgeEffectType is an S feature and must be moved."

parents 492b5f1d a77c3124

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ package android { 
    field public static final int dropDownWidth = 16843362; // 0x1010262

    field public static final int duplicateParentState = 16842985; // 0x10100e9

    field public static final int duration = 16843160; // 0x1010198

    field public static final int edgeEffectType = 16844352; // 0x1010640

    field public static final int edgeEffectType = 16844329; // 0x1010629

    field public static final int editTextBackground = 16843602; // 0x1010352

    field public static final int editTextColor = 16843601; // 0x1010351

    field public static final int editTextPreferenceStyle = 16842898; // 0x1010092

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -3063,6 +3063,7 @@ 
    <public name="hotwordDetectionService" />

    <public name="previewLayout" />

    <public name="clipToOutline" />

    <public name="edgeEffectType" />

  </public-group>



  <public-group type="drawable" first-id="0x010800b5">
@@ -3144,7 +3145,6 @@ 
  <eat-comment />



  <public-group type="attr" first-id="0x01010640">

    <public name="edgeEffectType" />

  </public-group>



  <!-- ===============================================================