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

Commit a8ef3b7a authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Removed urlBarResourceId." into pi-dev am: 3a31f6c5 

am: e40a0838

Change-Id: I13688d0b8ce95910eae74e814030b78e28054be8
parents 07554170 e40a0838

api/current.txt

+2 −3
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ package android { 
    field public static final int textEditSidePasteWindowLayout = 16843614; // 0x101035e

    field public static final int textEditSuggestionItemLayout = 16843636; // 0x1010374

    field public static final int textFilterEnabled = 16843007; // 0x10100ff

    field public static final int textFontWeight = 16844166; // 0x1010586

    field public static final int textFontWeight = 16844165; // 0x1010585

    field public static final int textIsSelectable = 16843542; // 0x1010316

    field public static final int textOff = 16843045; // 0x1010125

    field public static final int textOn = 16843044; // 0x1010124
@@ -1469,7 +1469,6 @@ package android { 
    field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344

    field public static final int unselectedAlpha = 16843278; // 0x101020e

    field public static final int updatePeriodMillis = 16843344; // 0x1010250

    field public static final int urlBarResourceId = 16844164; // 0x1010584

    field public static final int use32bitAbi = 16844053; // 0x1010515

    field public static final int useDefaultMargins = 16843641; // 0x1010379

    field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310
@@ -1549,7 +1548,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

    field public static final int windowLayoutInDisplayCutoutMode = 16844167; // 0x1010587

    field public static final int windowLayoutInDisplayCutoutMode = 16844166; // 0x1010586

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ package android { 
    field public static final int isVrOnly = 16844152; // 0x1010578

    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566

    field public static final int userRestriction = 16844165; // 0x1010585

    field public static final int userRestriction = 16844164; // 0x1010584

  }



  public static final class R.raw {

core/java/android/service/autofill/AutofillServiceInfo.java

+0 −8
Original line number Diff line number Diff line
@@ -198,14 +198,6 @@ public final class AutofillServiceInfo { 
                    } else {

                        maxVersionCode = Long.MAX_VALUE;

                    }

                    if (true) { // TODO(b/74445943): remove block after P DP2 is branched

                        final String urlBarResourceId = cpAttributes.getString(

                                R.styleable.AutofillService_CompatibilityPackage_urlBarResourceId);

                        if (urlBarResourceId != null) {

                            Log.e(TAG, "Service is using deprecated attribute 'urlBarResourceId'");

                        }

                    }



                    if (compatibilityPackages == null) {

                        compatibilityPackages = new ArrayMap<>();

                    }

core/res/res/values/attrs.xml

+0 −2
Original line number Diff line number Diff line
@@ -7987,8 +7987,6 @@ 
             android.content.pm.PackageInfo#getLongVersionCode()} for the target package.

        -->

        <attr name="maxLongVersionCode" format="string" />

        <!-- TODO(b/74445943): STOPSHIP (urlBarResourceId should be removed after P DP2 is branched)-->

        <attr name="urlBarResourceId" format="string" />

    </declare-styleable>



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

core/res/res/values/public.xml

+0 −2
Original line number Diff line number Diff line
@@ -2869,8 +2869,6 @@ 
      <public name="outlineSpotShadowColor" />

      <public name="outlineAmbientShadowColor" />

      <public name="maxLongVersionCode" />

      <!-- TODO(b/74445943): STOPSHIP (urlBarResourceId should be removed after P DP2 is branched)-->

      <public name="urlBarResourceId" />

      <!-- @hide @SystemApi -->

      <public name="userRestriction" />

      <public name="textFontWeight" />