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

Commit d922ae01 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Add Holo theme for IMEs. 

Also clean up theme selection code to get rid of duplication.

Change-Id: Idf7b21db70ee83fce24756ead877169bd08b77a9
parent 1e02ebd2

api/11.xml

+261 −121
Original line number Diff line number Diff line
@@ -7616,6 +7616,17 @@ 
 visibility="public"

>

</field>

<field name="queryHint"

 type="int"

 transient="false"

 volatile="false"

 value="16843610"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleSmallWindowLarge"

 type="int"

 transient="false"
@@ -14860,7 +14871,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974053"

 value="16974054"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14871,7 +14882,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974055"

 value="16974056"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14882,7 +14893,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974054"

 value="16974055"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14893,7 +14904,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974056"

 value="16974057"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14904,7 +14915,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974058"

 value="16974059"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14915,7 +14926,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974057"

 value="16974058"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15234,7 +15245,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973952"

 value="16973953"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15245,7 +15256,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973953"

 value="16973954"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15439,6 +15450,17 @@ 
 visibility="public"

>

</field>

<field name="Theme_Holo_InputMethod"

 type="int"

 transient="false"

 volatile="false"

 value="16973952"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Theme_Holo_Light"

 type="int"

 transient="false"
@@ -15828,7 +15850,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973954"

 value="16973955"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15839,7 +15861,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973956"

 value="16973957"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15850,7 +15872,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973960"

 value="16973961"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15861,7 +15883,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973959"

 value="16973960"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15927,7 +15949,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974068"

 value="16974069"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16015,7 +16037,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974060"

 value="16974061"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16037,7 +16059,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973961"

 value="16973962"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16070,7 +16092,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973962"

 value="16973963"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16081,7 +16103,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974004"

 value="16974005"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16092,7 +16114,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973999"

 value="16974000"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16103,7 +16125,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974003"

 value="16974004"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16114,7 +16136,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974000"

 value="16974001"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16125,7 +16147,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974001"

 value="16974002"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16136,7 +16158,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974002"

 value="16974003"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16147,7 +16169,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973968"

 value="16973969"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16158,7 +16180,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973963"

 value="16973964"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16169,7 +16191,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974050"

 value="16974051"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16180,7 +16202,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973965"

 value="16973966"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16191,7 +16213,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973964"

 value="16973965"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16202,7 +16224,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973966"

 value="16973967"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16213,7 +16235,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974069"

 value="16974070"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16224,7 +16246,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973969"

 value="16973970"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16235,7 +16257,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973986"

 value="16973987"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16246,7 +16268,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973990"

 value="16973991"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16257,7 +16279,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973994"

 value="16973995"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16268,7 +16290,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973995"

 value="16973996"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16279,7 +16301,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973971"

 value="16973972"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16290,7 +16312,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974063"

 value="16974064"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16301,7 +16323,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973972"

 value="16973973"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16312,7 +16334,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973973"

 value="16973974"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16323,7 +16345,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973988"

 value="16973989"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16334,7 +16356,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973974"

 value="16973975"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16345,7 +16367,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974064"

 value="16974065"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16356,7 +16378,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974062"

 value="16974063"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16367,7 +16389,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974005"

 value="16974006"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16378,7 +16400,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974049"

 value="16974050"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16389,7 +16411,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974045"

 value="16974046"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16400,7 +16422,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974048"

 value="16974049"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16411,7 +16433,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974046"

 value="16974047"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16422,7 +16444,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974047"

 value="16974048"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16433,7 +16455,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974011"

 value="16974012"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16444,7 +16466,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974006"

 value="16974007"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16455,7 +16477,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974008"

 value="16974009"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16466,7 +16488,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974007"

 value="16974008"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16477,7 +16499,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974009"

 value="16974010"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16488,7 +16510,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974070"

 value="16974071"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16499,7 +16521,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974012"

 value="16974013"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16510,7 +16532,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974032"

 value="16974033"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16521,7 +16543,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974036"

 value="16974037"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16532,7 +16554,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974040"

 value="16974041"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16543,7 +16565,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974041"

 value="16974042"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16554,7 +16576,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974014"

 value="16974015"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16565,7 +16587,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974066"

 value="16974067"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16576,7 +16598,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974015"

 value="16974016"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16587,7 +16609,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974016"

 value="16974017"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16598,7 +16620,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974034"

 value="16974035"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16609,7 +16631,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974017"

 value="16974018"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16620,7 +16642,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974067"

 value="16974068"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16631,7 +16653,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974065"

 value="16974066"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16642,7 +16664,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974043"

 value="16974044"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16653,7 +16675,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974018"

 value="16974019"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16664,7 +16686,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974013"

 value="16974014"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16675,7 +16697,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974044"

 value="16974045"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16686,7 +16708,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974019"

 value="16974020"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16697,7 +16719,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974020"

 value="16974021"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16708,7 +16730,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974021"

 value="16974022"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16719,7 +16741,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974025"

 value="16974026"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16730,7 +16752,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974024"

 value="16974025"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16741,7 +16763,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974027"

 value="16974028"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16752,7 +16774,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974022"

 value="16974023"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16763,7 +16785,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974026"

 value="16974027"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16774,7 +16796,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974023"

 value="16974024"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16785,7 +16807,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974029"

 value="16974030"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16796,7 +16818,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974030"

 value="16974031"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16807,7 +16829,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974031"

 value="16974032"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16818,7 +16840,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974033"

 value="16974034"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16829,7 +16851,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974028"

 value="16974029"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16840,7 +16862,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974035"

 value="16974036"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16851,7 +16873,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974052"

 value="16974053"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16862,7 +16884,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974037"

 value="16974038"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16873,7 +16895,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974010"

 value="16974011"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16884,7 +16906,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974042"

 value="16974043"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16895,7 +16917,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974038"

 value="16974039"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16906,7 +16928,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974039"

 value="16974040"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16917,7 +16939,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973997"

 value="16973998"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16928,7 +16950,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973975"

 value="16973976"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16939,7 +16961,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973970"

 value="16973971"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16950,7 +16972,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973998"

 value="16973999"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16961,7 +16983,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973976"

 value="16973977"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16972,7 +16994,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973977"

 value="16973978"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16983,7 +17005,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973978"

 value="16973979"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -16994,7 +17016,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973981"

 value="16973982"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17005,7 +17027,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973979"

 value="16973980"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17016,7 +17038,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973980"

 value="16973981"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17027,7 +17049,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973983"

 value="16973984"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17038,7 +17060,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973984"

 value="16973985"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17049,7 +17071,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973985"

 value="16973986"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17060,7 +17082,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973987"

 value="16973988"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17071,7 +17093,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973982"

 value="16973983"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17082,7 +17104,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973989"

 value="16973990"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17093,7 +17115,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974051"

 value="16974052"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17104,7 +17126,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973991"

 value="16973992"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17115,7 +17137,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973967"

 value="16973968"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17126,7 +17148,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973996"

 value="16973997"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17137,7 +17159,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973992"

 value="16973993"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17148,7 +17170,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973993"

 value="16973994"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17170,7 +17192,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974061"

 value="16974062"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17181,7 +17203,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16974059"

 value="16974060"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17214,7 +17236,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973957"

 value="16973958"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17269,7 +17291,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973958"

 value="16973959"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -17412,7 +17434,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973955"

 value="16973956"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -37232,6 +37254,17 @@ 
 visibility="public"

>

</field>

<field name="USES_ENCRYPTED_STORAGE"

 type="int"

 transient="false"

 volatile="false"

 value="7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USES_POLICY_EXPIRE_PASSWORD"

 type="int"

 transient="false"
@@ -37795,6 +37828,19 @@ 
<parameter name="admin" type="android.content.ComponentName">

</parameter>

</method>

<method name="getStorageEncryption"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="admin" type="android.content.ComponentName">

</parameter>

</method>

<method name="hasGrantedPolicy"

 return="boolean"

 abstract="false"
@@ -38070,6 +38116,21 @@ 
<parameter name="quality" type="int">

</parameter>

</method>

<method name="setStorageEncryption"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="admin" type="android.content.ComponentName">

</parameter>

<parameter name="encrypt" type="boolean">

</parameter>

</method>

<method name="wipeData"

 return="void"

 abstract="false"
@@ -38105,6 +38166,72 @@ 
 visibility="public"

>

</field>

<field name="ACTION_START_ENCRYPTION"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.app.action.START_ENCRYPTION&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ENCRYPTION_STATUS_ACTIVATING"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ENCRYPTION_STATUS_ACTIVE"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ENCRYPTION_STATUS_INACTIVE"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ENCRYPTION_STATUS_REQUESTED"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ENCRYPTION_STATUS_UNSUPPORTED"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_ADD_EXPLANATION"

 type="java.lang.String"

 transient="false"
@@ -86104,6 +86231,19 @@ 
<parameter name="texName" type="int">

</parameter>

</constructor>

<method name="getTransformMatrix"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="mtx" type="float[]">

</parameter>

</method>

<method name="setOnFrameAvailableListener"

 return="void"

 abstract="false"
@@ -167047,7 +167187,7 @@ 
</parameter>

<parameter name="type" type="android.renderscript.Type">

</parameter>

<parameter name="mc" type="android.renderscript.Allocation.MipmapControl">

<parameter name="mips" type="android.renderscript.Allocation.MipmapControl">

</parameter>

<parameter name="usage" type="int">

</parameter>
@@ -260040,7 +260180,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

api/current.xml

+130 −119

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ContextImpl.java

+6 −26
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
package android.app;



import com.android.internal.policy.PolicyManager;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParserException;



import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -35,14 +32,7 @@ import android.content.ReceiverCallNotAllowedException; 
import android.content.ServiceConnection;

import android.content.SharedPreferences;

import android.content.pm.ApplicationInfo;

import android.content.pm.ComponentInfo;

import android.content.pm.FeatureInfo;

import android.content.pm.IPackageDataObserver;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.IPackageInstallObserver;

import android.content.pm.IPackageMoveObserver;

import android.content.pm.IPackageManager;

import android.content.pm.IPackageStatsObserver;

import android.content.pm.PackageManager;

import android.content.res.AssetManager;

import android.content.res.Resources;
@@ -80,14 +70,12 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.Vibrator;

import android.os.FileUtils.FileStatus;

import android.os.storage.StorageManager;

import android.telephony.TelephonyManager;

import android.content.ClipboardManager;

import android.util.AndroidRuntimeException;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.WindowManagerImpl;

import android.view.accessibility.AccessibilityManager;

import android.view.inputmethod.InputMethodManager;
@@ -104,9 +92,6 @@ import java.io.IOException; 
import java.io.InputStream;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;



class ReceiverRestrictedContext extends ContextWrapper {

    ReceiverRestrictedContext(Context base) {
@@ -354,10 +339,10 @@ class ContextImpl extends Context { 
                    final Context outerContext = ctx.getOuterContext();

                    return new NotificationManager(

                        new ContextThemeWrapper(outerContext,

                                outerContext.getApplicationInfo().targetSdkVersion >=

                                    Build.VERSION_CODES.HONEYCOMB

                                ? com.android.internal.R.style.Theme_Holo_Dialog

                                : com.android.internal.R.style.Theme_Dialog),

                                Resources.selectSystemTheme(0,

                                        outerContext.getApplicationInfo().targetSdkVersion,

                                        com.android.internal.R.style.Theme_Dialog,

                                        com.android.internal.R.style.Theme_Holo_Dialog)),

                        ctx.mMainThread.getHandler());

                }});
@@ -492,13 +477,8 @@ class ContextImpl extends Context { 
    @Override

    public Resources.Theme getTheme() {

        if (mTheme == null) {

            if (mThemeResource == 0) {

                final Context outerContext = getOuterContext();

                mThemeResource = (outerContext.getApplicationInfo().targetSdkVersion

                        >= Build.VERSION_CODES.HONEYCOMB)

                                ? com.android.internal.R.style.Theme_Holo

                                : com.android.internal.R.style.Theme;

            }

            mThemeResource = Resources.selectDefaultTheme(mThemeResource,

                    getOuterContext().getApplicationInfo().targetSdkVersion);

            mTheme = mResources.newTheme();

            mTheme.applyStyle(mThemeResource, true);

        }

core/java/android/content/res/Resources.java

+17 −0
Original line number Diff line number Diff line
@@ -115,6 +115,23 @@ public class Resources { 
        return (LongSparseArray<T>) EMPTY_ARRAY;

    }



    /** @hide */

    public static int selectDefaultTheme(int curTheme, int targetSdkVersion) {

        return selectSystemTheme(curTheme, targetSdkVersion,

                com.android.internal.R.style.Theme, com.android.internal.R.style.Theme_Holo);

    }

    

    /** @hide */

    public static int selectSystemTheme(int curTheme, int targetSdkVersion, int orig, int holo) {

        if (curTheme != 0) {

            return curTheme;

        }

        if (targetSdkVersion < Build.VERSION_CODES.HONEYCOMB) {

            return orig;

        }

        return holo;

    }

    

    /**

     * This exception is thrown by the resource APIs when a requested resource

     * can not be found.

core/java/android/inputmethodservice/InputMethodService.java

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; 
import android.app.Dialog;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.os.Bundle;
@@ -220,7 +221,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    

    InputMethodManager mImm;

    

    int mTheme = android.R.style.Theme_InputMethod;

    int mTheme = 0;

    

    LayoutInflater mInflater;

    TypedArray mThemeAttrs;
@@ -556,6 +557,9 @@ public class InputMethodService extends AbstractInputMethodService { 
    }

    

    @Override public void onCreate() {

        mTheme = Resources.selectSystemTheme(mTheme,

                getApplicationInfo().targetSdkVersion,

                android.R.style.Theme_InputMethod, android.R.style.Theme_Holo_InputMethod);

        super.setTheme(mTheme);

        super.onCreate();

        mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);