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

Commit b15d26c9 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille Committed by Automerger Merge Worker
Browse files

Merge "Remove system_app_widget_internal_padding resource" into sc-dev am: 94cd7cbb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14441818

Change-Id: Ibdb36b2d3f4e678fd812a96cb50da7fb87274d2a
parents 860c2e17 94cd7cbb

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,6 @@ package android { 
    field public static final int notification_large_icon_width = 17104901; // 0x1050005

    field public static final int system_app_widget_background_radius;

    field public static final int system_app_widget_inner_radius;

    field public static final int system_app_widget_internal_padding;

    field public static final int thumbnail_height = 17104897; // 0x1050001

    field public static final int thumbnail_width = 17104898; // 0x1050002

  }

core/api/removed.txt

+8 −0
Original line number Diff line number Diff line 
// Signature format: 2.0

package android {



  public static final class R.dimen {

    field public static final int __removed_system_app_widget_internal_padding;

  }



}



package android.app {



  public class Notification implements android.os.Parcelable {

core/res/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ 
    <dimen name="system_app_widget_background_radius">16dp</dimen>

    <!-- System-provided radius for inner views on app widgets. The resolved value of this resource may change at runtime. -->

    <dimen name="system_app_widget_inner_radius">8dp</dimen>

    <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. -->

    <dimen name="system_app_widget_internal_padding">16dp</dimen>

    <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed -->

    <dimen name="__removed_system_app_widget_internal_padding">16dp</dimen>



</resources>

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -3184,7 +3184,7 @@ 
    <!-- System-provided dimensions for app widgets. -->

    <public name="system_app_widget_background_radius" />

    <public name="system_app_widget_inner_radius" />

    <public name="system_app_widget_internal_padding" />

    <public name="__removed_system_app_widget_internal_padding" />

  </staging-public-group>



  <staging-public-group type="bool" first-id="0x01110007">