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

Commit 55046687 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

fix issues in current.xml (bad merge earlier) 

Change-Id: I9be4dbe04c126db7fc92f116aa73bba6c96042cf
parent 5661490a

api/current.xml

+132 −330
Original line number Diff line number Diff line
@@ -1768,24 +1768,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="adapter"

 type="int"

 transient="false"

 volatile="false"

 value="16843454"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="addStatesFromChildren"

|||||||

<field name="addStatesFromChildren"

=======

<field name="kraken_resource_pad9"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -2000,24 +1983,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="as"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="author"

|||||||

<field name="author"

=======

<field name="kraken_resource_pad9"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -2166,6 +2132,17 @@ 
 visibility="public"

>

</field>

<field name="adapter"

 type="int"

 transient="false"

 volatile="false"

 value="16843454"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="addStatesFromChildren"

 type="int"

 transient="false"
@@ -2375,6 +2352,17 @@ 
 visibility="public"

>

</field>

<field name="as"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="author"

 type="int"

 transient="false"
@@ -2683,24 +2671,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="column"

 type="int"

 transient="false"

 volatile="false"

 value="16843463"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="columnDelay"

|||||||

<field name="columnDelay"

=======

<field name="candidatesTextStyleSpans"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -3052,6 +3023,17 @@ 
 visibility="public"

>

</field>

<field name="column"

 type="int"

 transient="false"

 volatile="false"

 value="16843463"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="columnDelay"

 type="int"

 transient="false"
@@ -3866,24 +3848,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="from"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fromAlpha"

|||||||

<field name="fromAlpha"

=======

<field name="expandableListPreferredChildPaddingLeft"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -3905,24 +3870,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="fromValue"

 type="int"

 transient="false"

 volatile="false"

 value="16843461"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fromXDelta"

|||||||

<field name="fromXDelta"

=======

<field name="expandableListPreferredItemIndicatorRight"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -4252,6 +4200,17 @@ 
 visibility="public"

>

</field>

<field name="from"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fromAlpha"

 type="int"

 transient="false"
@@ -4274,6 +4233,17 @@ 
 visibility="public"

>

</field>

<field name="fromValue"

 type="int"

 transient="false"

 volatile="false"

 value="16843461"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fromXDelta"

 type="int"

 transient="false"
@@ -5891,50 +5861,6 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad56"

 type="int"

 transient="false"

 volatile="false"

 value="16843465"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad57"

 type="int"

 transient="false"

 volatile="false"

 value="16843464"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad58"

 type="int"

 transient="false"

 volatile="false"

 value="16843463"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad59"

 type="int"

 transient="false"

 volatile="false"

 value="16843462"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad6"

 type="int"

 transient="false"
@@ -5946,94 +5872,6 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad60"

 type="int"

 transient="false"

 volatile="false"

 value="16843461"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad61"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad62"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad63"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad64"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad65"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad66"

 type="int"

 transient="false"

 volatile="false"

 value="16843455"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad67"

 type="int"

 transient="false"

 volatile="false"

 value="16843454"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad7"

 type="int"

 transient="false"
@@ -7310,24 +7148,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="selection"

 type="int"

 transient="false"

 volatile="false"

 value="16843455"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="settingsActivity"

|||||||

<field name="settingsActivity"

=======

<field name="phoneNumber"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -7514,24 +7335,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="sortOrder"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="soundEffectsEnabled"

|||||||

<field name="soundEffectsEnabled"

=======

<field name="process"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -8433,6 +8237,17 @@ 
 visibility="public"

>

</field>

<field name="selection"

 type="int"

 transient="false"

 volatile="false"

 value="16843455"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="settingsActivity"

 type="int"

 transient="false"
@@ -8620,6 +8435,17 @@ 
 visibility="public"

>

</field>

<field name="sortOrder"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="soundEffectsEnabled"

 type="int"

 transient="false"
@@ -8719,24 +8545,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="to"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="toAlpha"

|||||||

<field name="toAlpha"

=======

<field name="startOffset"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -8758,24 +8567,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="toValue"

 type="int"

 transient="false"

 volatile="false"

 value="16843462"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="toXDelta"

|||||||

<field name="toXDelta"

=======

<field name="stateNotNeeded"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -8951,24 +8743,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="uri"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="useLevel"

|||||||

<field name="useLevel"

=======

<field name="state_window_focused"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -9518,35 +9293,7 @@ 
 visibility="public"

>

</field>

<<<<<<< HEAD

<field name="withClass"

 type="int"

 transient="false"

 volatile="false"

 value="16843465"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="withExpression"

 type="int"

 transient="false"

 volatile="false"

 value="16843464"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="writePermission"

|||||||

<field name="writePermission"

=======

<field name="textColorHintInverse"

>>>>>>> goog/kraken-plus-aosp

 type="int"

 transient="false"

 volatile="false"
@@ -9887,6 +9634,17 @@ 
 visibility="public"

>

</field>

<field name="to"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="toAlpha"

 type="int"

 transient="false"
@@ -9909,6 +9667,17 @@ 
 visibility="public"

>

</field>

<field name="toValue"

 type="int"

 transient="false"

 volatile="false"

 value="16843462"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="toXDelta"

 type="int"

 transient="false"
@@ -10085,6 +9854,17 @@ 
 visibility="public"

>

</field>

<field name="uri"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="useLevel"

 type="int"

 transient="false"
@@ -10635,6 +10415,28 @@ 
 visibility="public"

>

</field>

<field name="withClass"

 type="int"

 transient="false"

 volatile="false"

 value="16843465"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="withExpression"

 type="int"

 transient="false"

 volatile="false"

 value="16843464"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="writePermission"

 type="int"

 transient="false"