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

Commit e3d14feb authored by Todd Lee's avatar Todd Lee
Browse files

Revert addition of material shape resources. 

In discussion with material/shape team the consensus is that
a more flexible/scalable path forward should rely on material
token generation rather than framework resources directly.

Bug: b/324928718
Test: m update-api & presubmits
Change-Id: I887d26e54fa78f5a5279995791d49edfe66cd22e
parent 6b8d8a46

core/api/current.txt

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

    field public static final int system_app_widget_background_radius = 17104904; // 0x1050008

    field public static final int system_app_widget_inner_radius = 17104905; // 0x1050009

    field public static final int system_corner_radius_large;

    field public static final int system_corner_radius_medium;

    field public static final int system_corner_radius_small;

    field public static final int system_corner_radius_xlarge;

    field public static final int system_corner_radius_xsmall;

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

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

  }

core/res/res/values/dimens_material.xml

+0 −7
Original line number Diff line number Diff line
@@ -204,11 +204,4 @@ 
    <dimen name="progress_bar_size_small">16dip</dimen>

    <dimen name="progress_bar_size_medium">48dp</dimen>

    <dimen name="progress_bar_size_large">76dp</dimen>



    <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes-->

    <dimen name="system_corner_radius_xsmall">4dp</dimen>

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

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

    <dimen name="system_corner_radius_large">26dp</dimen>

    <dimen name="system_corner_radius_xlarge">36dp</dimen>

</resources>

core/res/res/values/public-staging.xml

+5 −5
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ 


  <staging-public-group type="dimen" first-id="0x01b90000">

    <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes-->

    <public name="system_corner_radius_xsmall" />

    <public name="system_corner_radius_small" />

    <public name="system_corner_radius_medium" />

    <public name="system_corner_radius_large" />

    <public name="system_corner_radius_xlarge" />

    <public name="removed_system_corner_radius_xsmall" />

    <public name="removed_system_corner_radius_small" />

    <public name="removed_system_corner_radius_medium" />

    <public name="removed_system_corner_radius_large" />

    <public name="removed_system_corner_radius_xlarge" />

  </staging-public-group>



  <staging-public-group type="color" first-id="0x01b80000">

core/res/res/values/symbols.xml

+0 −7
Original line number Diff line number Diff line
@@ -5356,11 +5356,4 @@ 
  <java-symbol type="drawable" name="ic_satellite_alt_24px" />



  <java-symbol type="bool" name="config_watchlistUseFileHashesCache" />



  <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes-->

  <java-symbol type="dimen" name="system_corner_radius_xsmall" />

  <java-symbol type="dimen" name="system_corner_radius_small" />

  <java-symbol type="dimen" name="system_corner_radius_medium" />

  <java-symbol type="dimen" name="system_corner_radius_large" />

  <java-symbol type="dimen" name="system_corner_radius_xlarge" />

</resources>