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

Commit 1829a4b4 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"

parents fa436298 519c1f64

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -253,10 +253,13 @@ package android { 
    field public static final int actionModeCloseDrawable = 16843484; // 0x10102dc

    field public static final int actionModeCopyDrawable = 16843538; // 0x1010312

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

    field public static final int actionModeFindDrawable = 16843898; // 0x101047a

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

    field public static final int actionModeSelectAllDrawable = 16843646; // 0x101037e

    field public static final int actionModeShareDrawable = 16843897; // 0x1010479

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

    field public static final int actionModeStyle = 16843668; // 0x1010394

    field public static final int actionModeWebSearchDrawable = 16843899; // 0x101047b

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

    field public static final int actionProviderClass = 16843657; // 0x1010389

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

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -568,6 +568,9 @@ 
  <public type="attr" name="listChoiceIndicatorMultiple" id="0x0101021a" />

  <public type="attr" name="versionCode" id="0x0101021b" />

  <public type="attr" name="versionName" id="0x0101021c" />

  <public type="attr" name="actionModeShareDrawable" id="0x01010479" />

  <public type="attr" name="actionModeFindDrawable" id="0x0101047a" />

  <public type="attr" name="actionModeWebSearchDrawable" id="0x0101047b" />



  <public type="id" name="background" id="0x01020000" />

  <public type="id" name="checkbox" id="0x01020001" />