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

Commit c27cc947 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Make the theme attribute actionModeStyle public."

parents 6dd005b4 00db5195

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ package android { 
    field public static final int actionModeCutDrawable = 16843537; // 0x1010311

    field public static final int actionModeCutDrawable = 16843537; // 0x1010311

    field public static final int actionModePasteDrawable = 16843539; // 0x1010313

    field public static final int actionModePasteDrawable = 16843539; // 0x1010313

    field public static final int actionModeSelectAllDrawable = 16843647; // 0x101037f

    field public static final int actionModeSelectAllDrawable = 16843647; // 0x101037f

    field public static final int actionModeStyle = 16843688; // 0x10103a8

    field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6

    field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6

    field public static final int actionProviderClass = 16843677; // 0x101039d

    field public static final int actionProviderClass = 16843677; // 0x101039d

    field public static final int actionViewClass = 16843516; // 0x10102fc

    field public static final int actionViewClass = 16843516; // 0x10102fc

core/res/res/values/public.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -1787,6 +1787,11 @@ 
  <public type="attr" name="colorActivatedHighlight" />

  <public type="attr" name="colorActivatedHighlight" />

  <public type="attr" name="colorMultiSelectHighlight" />

  <public type="attr" name="colorMultiSelectHighlight" />





  <public type="attr" name="drawableStart" />

  <public type="attr" name="drawableEnd" />



  <public type="attr" name="actionModeStyle" />



  <public type="style" name="TextAppearance.SuggestionHighlight" />

  <public type="style" name="TextAppearance.SuggestionHighlight" />

  <public type="style" name="Theme.Holo.SplitActionBarWhenNarrow" />

  <public type="style" name="Theme.Holo.SplitActionBarWhenNarrow" />

  <public type="style" name="Theme.Holo.Light.SplitActionBarWhenNarrow" />

  <public type="style" name="Theme.Holo.Light.SplitActionBarWhenNarrow" />
@@ -1826,7 +1831,4 @@ 
  <public type="color" name="holo_purple" />

  <public type="color" name="holo_purple" />

  <public type="color" name="holo_blue_bright" />

  <public type="color" name="holo_blue_bright" />





  <public type="attr" name="drawableStart" />

  <public type="attr" name="drawableEnd" />



</resources>
 
</resources>