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

Commit 1d935abd authored by Justin Mattson's avatar Justin Mattson Committed by Android (Google) Code Review
Browse files

Merge "Put annotations in the right place" into lmp-dev

parents bce81bd0 87ce1d2b

core/res/res/values/public.xml

+0 −2
Original line number Diff line number Diff line
@@ -2497,8 +2497,6 @@ 


  <public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />



  <!-- @SystemApi -->

  <!-- @hide -->

  <public type="style" name="Theme.Leanback.FormWizard"/>



  <!-- An interpolator which accelerates fast but decelerates slowly. -->

core/res/res/values/themes_leanback.xml

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ 
        <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>

    </style>



    <!-- Setup and form wizard themes -->



    <!-- Setup and form wizard themes @hide @SystemApi-->

    <style name="Theme.Leanback.FormWizard" parent="Theme.Material.NoActionBar">

        <item name="windowBackground">@drawable/background_leanback_setup</item>

        <item name="colorBackgroundCacheHint">@null</item>