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

Commit 0e9e03f5 authored by Adam Powell's avatar Adam Powell
Browse files

resolved conflicts for merge of a7d01a75 to master 

Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
parents 2b2c31f6 a7d01a75

api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -1516,12 +1516,13 @@ package android { 
    field public static final int Theme_Holo_Light_Dialog_NoActionBar = 16973941; // 0x1030075

    field public static final int Theme_Holo_Light_Dialog_NoActionBar_MinWidth = 16973942; // 0x1030076

    field public static final int Theme_Holo_Light_NoActionBar = 16974064; // 0x10300f0

    field public static final int Theme_Holo_Light_NoActionBar_Fullscreen = 16974065; // 0x10300f1

    field public static final int Theme_Holo_Light_Panel = 16973948; // 0x103007c

    field public static final int Theme_Holo_Light_SplitActionBarWhenNarrow = 16974067; // 0x10300f3

    field public static final int Theme_Holo_Light_SplitActionBarWhenNarrow = 16974068; // 0x10300f4

    field public static final int Theme_Holo_NoActionBar = 16973932; // 0x103006c

    field public static final int Theme_Holo_NoActionBar_Fullscreen = 16973933; // 0x103006d

    field public static final int Theme_Holo_Panel = 16973947; // 0x103007b

    field public static final int Theme_Holo_SplitActionBarWhenNarrow = 16974066; // 0x10300f2

    field public static final int Theme_Holo_SplitActionBarWhenNarrow = 16974067; // 0x10300f3

    field public static final int Theme_Holo_Wallpaper = 16973949; // 0x103007d

    field public static final int Theme_Holo_Wallpaper_NoTitleBar = 16973950; // 0x103007e

    field public static final int Theme_InputMethod = 16973908; // 0x1030054

core/res/res/values/public.xml

+4 −1
Original line number Diff line number Diff line
@@ -1657,6 +1657,9 @@ 
  <public type="attr" name="compatibleWidthLimitDp" />

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



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

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



<!-- ===============================================================

     Resources added in version 13 of the platform (Ice Cream Sandwich)

     =============================================================== -->
@@ -1666,7 +1669,6 @@ 
  <public type="attr" name="state_drag_hovered" />

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



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

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

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

  <public type="style" name="Theme.Holo.Light.SplitActionBarWhenNarrow" />
@@ -1704,4 +1706,5 @@ 
  <public type="attr" name="notificationTimeout" />

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

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



</resources>