diff options
| author | Adam Powell <adamp@google.com> | 2010-11-03 12:06:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-03 12:06:44 -0700 |
| commit | 01f706260b710bbd4e8aeb123ed8013ebafa09b3 (patch) | |
| tree | 421c3b5527fddee9314ab9c0a84b69fddd85a81a | |
| parent | e0c0504c7ea508b89329d4492dea9cd97c88af42 (diff) | |
| parent | 13fd8de5cd6fe238c61f31b9d3fb737ed65c7581 (diff) | |
| download | frameworks_base-01f706260b710bbd4e8aeb123ed8013ebafa09b3.zip frameworks_base-01f706260b710bbd4e8aeb123ed8013ebafa09b3.tar.gz frameworks_base-01f706260b710bbd4e8aeb123ed8013ebafa09b3.tar.bz2 | |
Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public"
| -rw-r--r-- | api/current.xml | 38 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 32 insertions, 8 deletions
diff --git a/api/current.xml b/api/current.xml index fba69cf..07f298e 100644 --- a/api/current.xml +++ b/api/current.xml @@ -14275,7 +14275,7 @@ type="int" transient="false" volatile="false" - value="16973949" + value="16973951" static="true" final="true" deprecated="not deprecated" @@ -14286,7 +14286,7 @@ type="int" transient="false" volatile="false" - value="16973950" + value="16973952" static="true" final="true" deprecated="not deprecated" @@ -14436,6 +14436,17 @@ visibility="public" > </field> +<field name="Theme_Holo_Dialog_Alert" + type="int" + transient="false" + volatile="false" + value="16973945" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_Holo_Extended" type="int" transient="false" @@ -14469,6 +14480,17 @@ visibility="public" > </field> +<field name="Theme_Holo_Light_Dialog_Alert" + type="int" + transient="false" + volatile="false" + value="16973946" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_Holo_Light_Extended" type="int" transient="false" @@ -14781,7 +14803,7 @@ type="int" transient="false" volatile="false" - value="16973948" + value="16973950" static="true" final="true" deprecated="not deprecated" @@ -14792,7 +14814,7 @@ type="int" transient="false" volatile="false" - value="16973947" + value="16973949" static="true" final="true" deprecated="not deprecated" @@ -14946,7 +14968,7 @@ type="int" transient="false" volatile="false" - value="16973951" + value="16973953" static="true" final="true" deprecated="not deprecated" @@ -15012,7 +15034,7 @@ type="int" transient="false" volatile="false" - value="16973945" + value="16973947" static="true" final="true" deprecated="not deprecated" @@ -15067,7 +15089,7 @@ type="int" transient="false" volatile="false" - value="16973946" + value="16973948" static="true" final="true" deprecated="not deprecated" @@ -245543,7 +245565,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index f905725..fd7e984 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1404,6 +1404,8 @@ <public type="style" name="Theme.Holo.Light.Dialog" /> <public type="style" name="Theme.Holo.Extended" /> <public type="style" name="Theme.Holo.Light.Extended" /> + <public type="style" name="Theme.Holo.Dialog.Alert" /> + <public type="style" name="Theme.Holo.Light.Dialog.Alert" /> <public type="style" name="Widget.ListPopupWindow" /> <public type="style" name="Widget.PopupMenu" /> |