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

Commit 556a4d23 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix build."

parents a217d69d a8af4ab2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ package android { 
    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074

    field public static final int listViewWhiteStyle = 16842869; // 0x1010075

    field public static final int lockTaskMode = 16844013; // 0x10104ed

    field public static final int lockTaskMode = 16844015; // 0x10104ef

    field public static final int logo = 16843454; // 0x10102be

    field public static final int longClickable = 16842982; // 0x10100e6

    field public static final int loopViews = 16843527; // 0x1010307

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ package android { 
    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074

    field public static final int listViewWhiteStyle = 16842869; // 0x1010075

    field public static final int lockTaskMode = 16844013; // 0x10104ed

    field public static final int lockTaskMode = 16844015; // 0x10104ef

    field public static final int logo = 16843454; // 0x10102be

    field public static final int longClickable = 16842982; // 0x10100e6

    field public static final int loopViews = 16843527; // 0x1010307

core/res/res/values/public.xml

+2 −1
Original line number Diff line number Diff line
@@ -2653,7 +2653,6 @@ 
  <public type="attr" name="colorBackgroundFloating" />

  <public type="attr" name="extractNativeLibs" />

  <public type="attr" name="usesCleartextTraffic" />

  <public type="attr" name="lockTaskMode" />



  <!--IntentFilter auto verification -->

  <public type="attr" name="autoVerify" />
@@ -2664,4 +2663,6 @@ 


  <!-- Animation -->

  <public type="attr" name="durationScaleHint" />



  <public type="attr" name="lockTaskMode" />

</resources>