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

Commit 0419ab9e authored by Adam Powell's avatar Adam Powell
Browse files

resolved conflicts for merge of fb339016 to master 

Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
parents 599b1029 fb339016

api/current.txt

+11 −2
Original line number Diff line number Diff line
@@ -1523,11 +1523,11 @@ package android { 
    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 = 16974068; // 0x10300f4

    field public static final int Theme_Holo_Light_SplitActionBarWhenNarrow = 16974077; // 0x10300fd

    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 = 16974067; // 0x10300f3

    field public static final int Theme_Holo_SplitActionBarWhenNarrow = 16974076; // 0x10300fc

    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
@@ -1552,6 +1552,9 @@ package android { 
    field public static final int Widget = 16973842; // 0x1030012

    field public static final int Widget_AbsListView = 16973843; // 0x1030013

    field public static final int Widget_ActionBar = 16973954; // 0x1030082

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

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

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

    field public static final int Widget_ActionButton = 16973956; // 0x1030084

    field public static final int Widget_ActionButton_CloseMode = 16973960; // 0x1030088

    field public static final int Widget_ActionButton_Overflow = 16973959; // 0x1030087
@@ -1575,6 +1578,9 @@ package android { 
    field public static final int Widget_GridView = 16973874; // 0x1030032

    field public static final int Widget_Holo = 16973962; // 0x103008a

    field public static final int Widget_Holo_ActionBar = 16974004; // 0x10300b4

    field public static final int Widget_Holo_ActionBar_TabBar = 16974071; // 0x10300f7

    field public static final int Widget_Holo_ActionBar_TabText = 16974070; // 0x10300f6

    field public static final int Widget_Holo_ActionBar_TabView = 16974069; // 0x10300f5

    field public static final int Widget_Holo_ActionButton = 16973999; // 0x10300af

    field public static final int Widget_Holo_ActionButton_CloseMode = 16974003; // 0x10300b3

    field public static final int Widget_Holo_ActionButton_Overflow = 16974000; // 0x10300b0
@@ -1600,6 +1606,9 @@ package android { 
    field public static final int Widget_Holo_ImageButton = 16973974; // 0x1030096

    field public static final int Widget_Holo_Light = 16974005; // 0x10300b5

    field public static final int Widget_Holo_Light_ActionBar = 16974049; // 0x10300e1

    field public static final int Widget_Holo_Light_ActionBar_TabBar = 16974074; // 0x10300fa

    field public static final int Widget_Holo_Light_ActionBar_TabText = 16974073; // 0x10300f9

    field public static final int Widget_Holo_Light_ActionBar_TabView = 16974072; // 0x10300f8

    field public static final int Widget_Holo_Light_ActionButton = 16974045; // 0x10300dd

    field public static final int Widget_Holo_Light_ActionButton_CloseMode = 16974048; // 0x10300e0

    field public static final int Widget_Holo_Light_ActionButton_Overflow = 16974046; // 0x10300de

core/res/res/values/public.xml

+10 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,16 @@ 
  <public type="style" name="Theme.Holo.Light.NoActionBar" />

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



  <public type="style" name="Widget.ActionBar.TabView" />

  <public type="style" name="Widget.ActionBar.TabText" />

  <public type="style" name="Widget.ActionBar.TabBar" />

  <public type="style" name="Widget.Holo.ActionBar.TabView" />

  <public type="style" name="Widget.Holo.ActionBar.TabText" />

  <public type="style" name="Widget.Holo.ActionBar.TabBar" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabView" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabText" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabBar" />



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

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

     =============================================================== -->

core/res/res/values/styles.xml

+11 −11
Original line number Diff line number Diff line
@@ -1132,17 +1132,17 @@ 
        <item name="android:src">?android:attr/actionModeCloseDrawable</item>

    </style>



    <style name="Widget.ActionBarView_TabView">

    <style name="Widget.ActionBar.TabView" parent="Widget">

        <item name="android:gravity">center_horizontal</item>

        <item name="android:background">@drawable/minitab_lt</item>

        <item name="android:paddingLeft">4dip</item>

        <item name="android:paddingRight">4dip</item>

    </style>



    <style name="Widget.ActionBarView_TabBar">

    <style name="Widget.ActionBar.TabBar" parent="Widget">

    </style>



    <style name="Widget.ActionBarView_TabText">

    <style name="Widget.ActionBar.TabText" parent="Widget">

        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView.PopupMenu</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textSize">18sp</item>
@@ -1797,22 +1797,22 @@ 
    <style name="Widget.Holo.ActionButton.TextButton" parent="Widget.Holo.ButtonBar.Button">

    </style>



    <style name="Widget.Holo.ActionBarView_TabView" parent="Widget.ActionBarView_TabView">

    <style name="Widget.Holo.ActionBar.TabView" parent="Widget.ActionBar.TabView">

        <item name="android:background">@drawable/tab_indicator_holo</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

    </style>



    <style name="Widget.Holo.Tab" parent="Widget.Holo.ActionBarView_TabView">

    <style name="Widget.Holo.Tab" parent="Widget.Holo.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.ActionBarView_TabBar" parent="Widget.ActionBarView_TabBar">

    <style name="Widget.Holo.ActionBar.TabBar" parent="Widget.ActionBar.TabBar">

        <item name="android:divider">?android:attr/dividerVertical</item>

        <item name="android:showDividers">middle</item>

        <item name="android:dividerPadding">8dip</item>

    </style>



    <style name="Widget.Holo.ActionBarView_TabText" parent="Widget.ActionBarView_TabText">

    <style name="Widget.Holo.ActionBar.TabText" parent="Widget.ActionBar.TabText">

        <item name="android:textAppearance">@style/TextAppearance.Holo.Medium</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">18sp</item>
@@ -2131,16 +2131,16 @@ 
        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabView" parent="Widget.Holo.ActionBarView_TabView">

    <style name="Widget.Holo.Light.ActionBar.TabView" parent="Widget.Holo.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.Light.Tab" parent="Widget.Holo.Light.ActionBarView_TabView">

    <style name="Widget.Holo.Light.Tab" parent="Widget.Holo.Light.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabBar" parent="Widget.Holo.ActionBarView_TabBar">

    <style name="Widget.Holo.Light.ActionBar.TabBar" parent="Widget.Holo.ActionBar.TabBar">

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabText" parent="Widget.Holo.ActionBarView_TabText">

    <style name="Widget.Holo.Light.ActionBar.TabText" parent="Widget.Holo.ActionBar.TabText">

    </style>



    <style name="Widget.Holo.Light.ActionMode" parent="Widget.Holo.ActionMode">

core/res/res/values/themes.xml

+9 −9
Original line number Diff line number Diff line
@@ -272,9 +272,9 @@ 
        <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_dark</item>

        <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_dark</item>

        <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search</item>

        <item name="actionBarTabStyle">@style/Widget.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.ActionBar</item>
@@ -1021,9 +1021,9 @@ 
        <item name="actionOverflowButtonStyle">@android:style/Widget.Holo.ActionButton.Overflow</item>

        <item name="actionModeBackground">@android:drawable/cab_background_holo_dark</item>

        <item name="actionModeCloseDrawable">@android:drawable/cab_ic_close_holo</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.Holo.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.ActionBar</item>
@@ -1310,9 +1310,9 @@ 
        <item name="actionOverflowButtonStyle">@android:style/Widget.Holo.Light.ActionButton.Overflow</item>

        <item name="actionModeBackground">@android:drawable/cab_background_holo_light</item>

        <item name="actionModeCloseDrawable">@android:drawable/cab_ic_close_holo</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.Light.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.Light.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.Light.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.Light.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.Light.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.Light.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.Holo.Light.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.Light.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.Light.ActionBar</item>