Merge "set sdk version to "Android 3.0" and api level to "Honeycomb"" into honeycomb
diff --git a/api/11.xml b/api/11.xml
index 6d12990..b087c20 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -1790,7 +1790,7 @@
type="int"
transient="false"
volatile="false"
- value="16843501"
+ value="16843499"
static="true"
final="true"
deprecated="not deprecated"
@@ -1812,7 +1812,7 @@
type="int"
transient="false"
volatile="false"
- value="16843510"
+ value="16843508"
static="true"
final="true"
deprecated="not deprecated"
@@ -1823,7 +1823,7 @@
type="int"
transient="false"
volatile="false"
- value="16843509"
+ value="16843507"
static="true"
final="true"
deprecated="not deprecated"
@@ -1834,7 +1834,7 @@
type="int"
transient="false"
volatile="false"
- value="16843511"
+ value="16843509"
static="true"
final="true"
deprecated="not deprecated"
@@ -1867,7 +1867,7 @@
type="int"
transient="false"
volatile="false"
- value="16843517"
+ value="16843515"
static="true"
final="true"
deprecated="not deprecated"
@@ -1889,7 +1889,7 @@
type="int"
transient="false"
volatile="false"
- value="16843513"
+ value="16843511"
static="true"
final="true"
deprecated="not deprecated"
@@ -1911,7 +1911,7 @@
type="int"
transient="false"
volatile="false"
- value="16843540"
+ value="16843538"
static="true"
final="true"
deprecated="not deprecated"
@@ -1922,7 +1922,7 @@
type="int"
transient="false"
volatile="false"
- value="16843539"
+ value="16843537"
static="true"
final="true"
deprecated="not deprecated"
@@ -1933,7 +1933,7 @@
type="int"
transient="false"
volatile="false"
- value="16843541"
+ value="16843539"
static="true"
final="true"
deprecated="not deprecated"
@@ -1944,7 +1944,7 @@
type="int"
transient="false"
volatile="false"
- value="16843512"
+ value="16843510"
static="true"
final="true"
deprecated="not deprecated"
@@ -1955,7 +1955,7 @@
type="int"
transient="false"
volatile="false"
- value="16843518"
+ value="16843516"
static="true"
final="true"
deprecated="not deprecated"
@@ -1966,7 +1966,7 @@
type="int"
transient="false"
volatile="false"
- value="16843519"
+ value="16843517"
static="true"
final="true"
deprecated="not deprecated"
@@ -2043,7 +2043,7 @@
type="int"
transient="false"
volatile="false"
- value="16843607"
+ value="16843605"
static="true"
final="true"
deprecated="not deprecated"
@@ -2065,7 +2065,7 @@
type="int"
transient="false"
volatile="false"
- value="16843531"
+ value="16843529"
static="true"
final="true"
deprecated="not deprecated"
@@ -2109,7 +2109,7 @@
type="int"
transient="false"
volatile="false"
- value="16843572"
+ value="16843570"
static="true"
final="true"
deprecated="not deprecated"
@@ -2142,7 +2142,7 @@
type="int"
transient="false"
volatile="false"
- value="16843553"
+ value="16843551"
static="true"
final="true"
deprecated="not deprecated"
@@ -2208,7 +2208,7 @@
type="int"
transient="false"
volatile="false"
- value="16843508"
+ value="16843506"
static="true"
final="true"
deprecated="not deprecated"
@@ -2274,7 +2274,7 @@
type="int"
transient="false"
volatile="false"
- value="16843548"
+ value="16843546"
static="true"
final="true"
deprecated="not deprecated"
@@ -2340,7 +2340,7 @@
type="int"
transient="false"
volatile="false"
- value="16843537"
+ value="16843535"
static="true"
final="true"
deprecated="not deprecated"
@@ -2450,7 +2450,7 @@
type="int"
transient="false"
volatile="false"
- value="16843550"
+ value="16843548"
static="true"
final="true"
deprecated="not deprecated"
@@ -2494,7 +2494,7 @@
type="int"
transient="false"
volatile="false"
- value="16843565"
+ value="16843563"
static="true"
final="true"
deprecated="not deprecated"
@@ -2582,7 +2582,7 @@
type="int"
transient="false"
volatile="false"
- value="16843526"
+ value="16843524"
static="true"
final="true"
deprecated="not deprecated"
@@ -2593,7 +2593,7 @@
type="int"
transient="false"
volatile="false"
- value="16843525"
+ value="16843523"
static="true"
final="true"
deprecated="not deprecated"
@@ -2626,7 +2626,7 @@
type="int"
transient="false"
volatile="false"
- value="16843569"
+ value="16843567"
static="true"
final="true"
deprecated="not deprecated"
@@ -2637,7 +2637,7 @@
type="int"
transient="false"
volatile="false"
- value="16843568"
+ value="16843566"
static="true"
final="true"
deprecated="not deprecated"
@@ -2703,7 +2703,7 @@
type="int"
transient="false"
volatile="false"
- value="16843598"
+ value="16843596"
static="true"
final="true"
deprecated="not deprecated"
@@ -3220,7 +3220,7 @@
type="int"
transient="false"
volatile="false"
- value="16843581"
+ value="16843579"
static="true"
final="true"
deprecated="not deprecated"
@@ -3275,7 +3275,7 @@
type="int"
transient="false"
volatile="false"
- value="16843595"
+ value="16843593"
static="true"
final="true"
deprecated="not deprecated"
@@ -3385,7 +3385,7 @@
type="int"
transient="false"
volatile="false"
- value="16843600"
+ value="16843598"
static="true"
final="true"
deprecated="not deprecated"
@@ -3451,7 +3451,7 @@
type="int"
transient="false"
volatile="false"
- value="16843530"
+ value="16843528"
static="true"
final="true"
deprecated="not deprecated"
@@ -3572,7 +3572,7 @@
type="int"
transient="false"
volatile="false"
- value="16843566"
+ value="16843564"
static="true"
final="true"
deprecated="not deprecated"
@@ -3583,7 +3583,7 @@
type="int"
transient="false"
volatile="false"
- value="16843564"
+ value="16843562"
static="true"
final="true"
deprecated="not deprecated"
@@ -3594,7 +3594,7 @@
type="int"
transient="false"
volatile="false"
- value="16843532"
+ value="16843530"
static="true"
final="true"
deprecated="not deprecated"
@@ -3825,7 +3825,7 @@
type="int"
transient="false"
volatile="false"
- value="16843604"
+ value="16843602"
static="true"
final="true"
deprecated="not deprecated"
@@ -3836,7 +3836,7 @@
type="int"
transient="false"
volatile="false"
- value="16843603"
+ value="16843601"
static="true"
final="true"
deprecated="not deprecated"
@@ -3946,7 +3946,7 @@
type="int"
transient="false"
volatile="false"
- value="16843534"
+ value="16843532"
static="true"
final="true"
deprecated="not deprecated"
@@ -4001,7 +4001,7 @@
type="int"
transient="false"
volatile="false"
- value="16843535"
+ value="16843533"
static="true"
final="true"
deprecated="not deprecated"
@@ -4199,7 +4199,7 @@
type="int"
transient="false"
volatile="false"
- value="16843575"
+ value="16843573"
static="true"
final="true"
deprecated="not deprecated"
@@ -4221,7 +4221,7 @@
type="int"
transient="false"
volatile="false"
- value="16843580"
+ value="16843578"
static="true"
final="true"
deprecated="not deprecated"
@@ -4232,7 +4232,7 @@
type="int"
transient="false"
volatile="false"
- value="16843577"
+ value="16843575"
static="true"
final="true"
deprecated="not deprecated"
@@ -4243,7 +4243,7 @@
type="int"
transient="false"
volatile="false"
- value="16843578"
+ value="16843576"
static="true"
final="true"
deprecated="not deprecated"
@@ -4254,7 +4254,7 @@
type="int"
transient="false"
volatile="false"
- value="16843611"
+ value="16843609"
static="true"
final="true"
deprecated="not deprecated"
@@ -4265,7 +4265,7 @@
type="int"
transient="false"
volatile="false"
- value="16843576"
+ value="16843574"
static="true"
final="true"
deprecated="not deprecated"
@@ -4276,7 +4276,7 @@
type="int"
transient="false"
volatile="false"
- value="16843579"
+ value="16843577"
static="true"
final="true"
deprecated="not deprecated"
@@ -4375,7 +4375,7 @@
type="int"
transient="false"
volatile="false"
- value="16843583"
+ value="16843581"
static="true"
final="true"
deprecated="not deprecated"
@@ -4430,7 +4430,7 @@
type="int"
transient="false"
volatile="false"
- value="16843589"
+ value="16843587"
static="true"
final="true"
deprecated="not deprecated"
@@ -4514,7 +4514,7 @@
visibility="public"
>
</field>
-<field name="fragmentNextEnterAnimation"
+<field name="fragmentFadeEnterAnimation"
type="int"
transient="false"
volatile="false"
@@ -4525,7 +4525,7 @@
visibility="public"
>
</field>
-<field name="fragmentNextExitAnimation"
+<field name="fragmentFadeExitAnimation"
type="int"
transient="false"
volatile="false"
@@ -4558,28 +4558,6 @@
visibility="public"
>
</field>
-<field name="fragmentPrevEnterAnimation"
- type="int"
- transient="false"
- volatile="false"
- value="16843499"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="fragmentPrevExitAnimation"
- type="int"
- transient="false"
- volatile="false"
- value="16843500"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="freezesText"
type="int"
transient="false"
@@ -4969,7 +4947,7 @@
type="int"
transient="false"
volatile="false"
- value="16843533"
+ value="16843531"
static="true"
final="true"
deprecated="not deprecated"
@@ -4980,7 +4958,7 @@
type="int"
transient="false"
volatile="false"
- value="16843551"
+ value="16843549"
static="true"
final="true"
deprecated="not deprecated"
@@ -5013,7 +4991,7 @@
type="int"
transient="false"
volatile="false"
- value="16843605"
+ value="16843603"
static="true"
final="true"
deprecated="not deprecated"
@@ -5068,7 +5046,7 @@
type="int"
transient="false"
volatile="false"
- value="16843516"
+ value="16843514"
static="true"
final="true"
deprecated="not deprecated"
@@ -5189,7 +5167,7 @@
type="int"
transient="false"
volatile="false"
- value="16843504"
+ value="16843502"
static="true"
final="true"
deprecated="not deprecated"
@@ -5200,7 +5178,7 @@
type="int"
transient="false"
volatile="false"
- value="16843502"
+ value="16843500"
static="true"
final="true"
deprecated="not deprecated"
@@ -5211,7 +5189,7 @@
type="int"
transient="false"
volatile="false"
- value="16843503"
+ value="16843501"
static="true"
final="true"
deprecated="not deprecated"
@@ -5321,7 +5299,7 @@
type="int"
transient="false"
volatile="false"
- value="16843546"
+ value="16843544"
static="true"
final="true"
deprecated="not deprecated"
@@ -5497,7 +5475,7 @@
type="int"
transient="false"
volatile="false"
- value="16843573"
+ value="16843571"
static="true"
final="true"
deprecated="not deprecated"
@@ -5596,7 +5574,7 @@
type="int"
transient="false"
volatile="false"
- value="16843567"
+ value="16843565"
static="true"
final="true"
deprecated="not deprecated"
@@ -5827,7 +5805,7 @@
type="int"
transient="false"
volatile="false"
- value="16843612"
+ value="16843610"
static="true"
final="true"
deprecated="not deprecated"
@@ -5860,7 +5838,7 @@
type="int"
transient="false"
volatile="false"
- value="16843606"
+ value="16843604"
static="true"
final="true"
deprecated="not deprecated"
@@ -6289,7 +6267,7 @@
type="int"
transient="false"
volatile="false"
- value="16843506"
+ value="16843504"
static="true"
final="true"
deprecated="not deprecated"
@@ -6333,7 +6311,7 @@
type="int"
transient="false"
volatile="false"
- value="16843527"
+ value="16843525"
static="true"
final="true"
deprecated="not deprecated"
@@ -6344,7 +6322,7 @@
type="int"
transient="false"
volatile="false"
- value="16843521"
+ value="16843519"
static="true"
final="true"
deprecated="not deprecated"
@@ -6432,7 +6410,7 @@
type="int"
transient="false"
volatile="false"
- value="16843529"
+ value="16843527"
static="true"
final="true"
deprecated="not deprecated"
@@ -6487,7 +6465,7 @@
type="int"
transient="false"
volatile="false"
- value="16843586"
+ value="16843584"
static="true"
final="true"
deprecated="not deprecated"
@@ -6641,7 +6619,7 @@
type="int"
transient="false"
volatile="false"
- value="16843585"
+ value="16843583"
static="true"
final="true"
deprecated="not deprecated"
@@ -6795,7 +6773,7 @@
type="int"
transient="false"
volatile="false"
- value="16843582"
+ value="16843580"
static="true"
final="true"
deprecated="not deprecated"
@@ -6927,7 +6905,7 @@
type="int"
transient="false"
volatile="false"
- value="16843552"
+ value="16843550"
static="true"
final="true"
deprecated="not deprecated"
@@ -7323,7 +7301,7 @@
type="int"
transient="false"
volatile="false"
- value="16843522"
+ value="16843520"
static="true"
final="true"
deprecated="not deprecated"
@@ -7477,7 +7455,7 @@
type="int"
transient="false"
volatile="false"
- value="16843547"
+ value="16843545"
static="true"
final="true"
deprecated="not deprecated"
@@ -7642,7 +7620,7 @@
type="int"
transient="false"
volatile="false"
- value="16843610"
+ value="16843608"
static="true"
final="true"
deprecated="not deprecated"
@@ -7961,7 +7939,7 @@
type="int"
transient="false"
volatile="false"
- value="16843560"
+ value="16843558"
static="true"
final="true"
deprecated="not deprecated"
@@ -7972,7 +7950,7 @@
type="int"
transient="false"
volatile="false"
- value="16843561"
+ value="16843559"
static="true"
final="true"
deprecated="not deprecated"
@@ -7983,7 +7961,7 @@
type="int"
transient="false"
volatile="false"
- value="16843562"
+ value="16843560"
static="true"
final="true"
deprecated="not deprecated"
@@ -8082,7 +8060,7 @@
type="int"
transient="false"
volatile="false"
- value="16843558"
+ value="16843556"
static="true"
final="true"
deprecated="not deprecated"
@@ -8093,7 +8071,7 @@
type="int"
transient="false"
volatile="false"
- value="16843559"
+ value="16843557"
static="true"
final="true"
deprecated="not deprecated"
@@ -8445,7 +8423,7 @@
type="int"
transient="false"
volatile="false"
- value="16843570"
+ value="16843568"
static="true"
final="true"
deprecated="not deprecated"
@@ -8478,7 +8456,7 @@
type="int"
transient="false"
volatile="false"
- value="16843536"
+ value="16843534"
static="true"
final="true"
deprecated="not deprecated"
@@ -8489,7 +8467,7 @@
type="int"
transient="false"
volatile="false"
- value="16843593"
+ value="16843591"
static="true"
final="true"
deprecated="not deprecated"
@@ -8500,7 +8478,7 @@
type="int"
transient="false"
volatile="false"
- value="16843588"
+ value="16843586"
static="true"
final="true"
deprecated="not deprecated"
@@ -8643,7 +8621,7 @@
type="int"
transient="false"
volatile="false"
- value="16843563"
+ value="16843561"
static="true"
final="true"
deprecated="not deprecated"
@@ -8665,7 +8643,7 @@
type="int"
transient="false"
volatile="false"
- value="16843584"
+ value="16843582"
static="true"
final="true"
deprecated="not deprecated"
@@ -8676,7 +8654,7 @@
type="int"
transient="false"
volatile="false"
- value="16843587"
+ value="16843585"
static="true"
final="true"
deprecated="not deprecated"
@@ -8742,7 +8720,7 @@
type="int"
transient="false"
volatile="false"
- value="16843596"
+ value="16843594"
static="true"
final="true"
deprecated="not deprecated"
@@ -8797,7 +8775,7 @@
type="int"
transient="false"
volatile="false"
- value="16843507"
+ value="16843505"
static="true"
final="true"
deprecated="not deprecated"
@@ -8819,7 +8797,7 @@
type="int"
transient="false"
volatile="false"
- value="16843597"
+ value="16843595"
static="true"
final="true"
deprecated="not deprecated"
@@ -8830,7 +8808,7 @@
type="int"
transient="false"
volatile="false"
- value="16843505"
+ value="16843503"
static="true"
final="true"
deprecated="not deprecated"
@@ -8929,7 +8907,7 @@
type="int"
transient="false"
volatile="false"
- value="16843549"
+ value="16843547"
static="true"
final="true"
deprecated="not deprecated"
@@ -8940,7 +8918,7 @@
type="int"
transient="false"
volatile="false"
- value="16843520"
+ value="16843518"
static="true"
final="true"
deprecated="not deprecated"
@@ -9072,7 +9050,7 @@
type="int"
transient="false"
volatile="false"
- value="16843599"
+ value="16843597"
static="true"
final="true"
deprecated="not deprecated"
@@ -9127,7 +9105,7 @@
type="int"
transient="false"
volatile="false"
- value="16843571"
+ value="16843569"
static="true"
final="true"
deprecated="not deprecated"
@@ -9193,7 +9171,7 @@
type="int"
transient="false"
volatile="false"
- value="16843515"
+ value="16843513"
static="true"
final="true"
deprecated="not deprecated"
@@ -9578,7 +9556,7 @@
type="int"
transient="false"
volatile="false"
- value="16843523"
+ value="16843521"
static="true"
final="true"
deprecated="not deprecated"
@@ -9655,7 +9633,7 @@
type="int"
transient="false"
volatile="false"
- value="16843524"
+ value="16843522"
static="true"
final="true"
deprecated="not deprecated"
@@ -9699,7 +9677,7 @@
type="int"
transient="false"
volatile="false"
- value="16843528"
+ value="16843526"
static="true"
final="true"
deprecated="not deprecated"
@@ -9721,7 +9699,7 @@
type="int"
transient="false"
volatile="false"
- value="16843601"
+ value="16843599"
static="true"
final="true"
deprecated="not deprecated"
@@ -9765,7 +9743,7 @@
type="int"
transient="false"
volatile="false"
- value="16843602"
+ value="16843600"
static="true"
final="true"
deprecated="not deprecated"
@@ -9908,7 +9886,7 @@
type="int"
transient="false"
volatile="false"
- value="16843543"
+ value="16843541"
static="true"
final="true"
deprecated="not deprecated"
@@ -9919,7 +9897,7 @@
type="int"
transient="false"
volatile="false"
- value="16843542"
+ value="16843540"
static="true"
final="true"
deprecated="not deprecated"
@@ -9941,7 +9919,7 @@
type="int"
transient="false"
volatile="false"
- value="16843544"
+ value="16843542"
static="true"
final="true"
deprecated="not deprecated"
@@ -10172,7 +10150,7 @@
type="int"
transient="false"
volatile="false"
- value="16843514"
+ value="16843512"
static="true"
final="true"
deprecated="not deprecated"
@@ -10326,7 +10304,7 @@
type="int"
transient="false"
volatile="false"
- value="16843554"
+ value="16843552"
static="true"
final="true"
deprecated="not deprecated"
@@ -10337,7 +10315,7 @@
type="int"
transient="false"
volatile="false"
- value="16843555"
+ value="16843553"
static="true"
final="true"
deprecated="not deprecated"
@@ -10348,7 +10326,7 @@
type="int"
transient="false"
volatile="false"
- value="16843556"
+ value="16843554"
static="true"
final="true"
deprecated="not deprecated"
@@ -10359,7 +10337,7 @@
type="int"
transient="false"
volatile="false"
- value="16843557"
+ value="16843555"
static="true"
final="true"
deprecated="not deprecated"
@@ -10403,7 +10381,7 @@
type="int"
transient="false"
volatile="false"
- value="16843590"
+ value="16843588"
static="true"
final="true"
deprecated="not deprecated"
@@ -10436,7 +10414,7 @@
type="int"
transient="false"
volatile="false"
- value="16843538"
+ value="16843536"
static="true"
final="true"
deprecated="not deprecated"
@@ -10579,7 +10557,7 @@
type="int"
transient="false"
volatile="false"
- value="16843574"
+ value="16843572"
static="true"
final="true"
deprecated="not deprecated"
@@ -10799,7 +10777,7 @@
type="int"
transient="false"
volatile="false"
- value="16843594"
+ value="16843592"
static="true"
final="true"
deprecated="not deprecated"
@@ -10810,7 +10788,7 @@
type="int"
transient="false"
volatile="false"
- value="16843591"
+ value="16843589"
static="true"
final="true"
deprecated="not deprecated"
@@ -10821,7 +10799,7 @@
type="int"
transient="false"
volatile="false"
- value="16843592"
+ value="16843590"
static="true"
final="true"
deprecated="not deprecated"
@@ -10942,7 +10920,7 @@
type="int"
transient="false"
volatile="false"
- value="16843545"
+ value="16843543"
static="true"
final="true"
deprecated="not deprecated"
@@ -11030,7 +11008,7 @@
type="int"
transient="false"
volatile="false"
- value="16843608"
+ value="16843606"
static="true"
final="true"
deprecated="not deprecated"
@@ -11041,7 +11019,7 @@
type="int"
transient="false"
volatile="false"
- value="16843609"
+ value="16843607"
static="true"
final="true"
deprecated="not deprecated"
@@ -28602,17 +28580,6 @@
visibility="public"
>
</method>
-<method name="getCancelable"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="getDialog"
return="android.app.Dialog"
abstract="false"
@@ -28646,6 +28613,17 @@
visibility="public"
>
</method>
+<method name="isCancelable"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="onCancel"
return="void"
abstract="false"
@@ -28822,6 +28800,19 @@
<parameter name="request" type="android.app.DownloadManager.Request">
</parameter>
</method>
+<method name="getMaxBytesOverMobile"
+ return="java.lang.Long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="context" type="android.content.Context">
+</parameter>
+</method>
<method name="getMimeTypeForDownloadedFile"
return="java.lang.String"
abstract="false"
@@ -28835,6 +28826,19 @@
<parameter name="id" type="long">
</parameter>
</method>
+<method name="getRecommendedMaxBytesOverMobile"
+ return="java.lang.Long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="context" type="android.content.Context">
+</parameter>
+</method>
<method name="getUriForDownloadedFile"
return="android.net.Uri"
abstract="false"
@@ -30683,17 +30687,6 @@
visibility="public"
>
</method>
-<method name="countBackStackEntries"
- return="int"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="dump"
return="void"
abstract="true"
@@ -30763,7 +30756,7 @@
<parameter name="tag" type="java.lang.String">
</parameter>
</method>
-<method name="getBackStackEntry"
+<method name="getBackStackEntryAt"
return="android.app.FragmentManager.BackStackEntry"
abstract="true"
native="false"
@@ -30776,6 +30769,17 @@
<parameter name="index" type="int">
</parameter>
</method>
+<method name="getBackStackEntryCount"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getFragment"
return="android.app.Fragment"
abstract="true"
@@ -30791,17 +30795,6 @@
<parameter name="key" type="java.lang.String">
</parameter>
</method>
-<method name="openTransaction"
- return="android.app.FragmentTransaction"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="popBackStack"
return="void"
abstract="true"
@@ -30944,6 +30937,17 @@
visibility="public"
>
</method>
+<method name="getBreadCrumbShortTitleRes"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getBreadCrumbTitle"
return="java.lang.CharSequence"
abstract="true"
@@ -30955,6 +30959,17 @@
visibility="public"
>
</method>
+<method name="getBreadCrumbTitleRes"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getId"
return="int"
abstract="true"
@@ -31314,7 +31329,7 @@
visibility="public"
>
</field>
-<field name="TRANSIT_FRAGMENT_NEXT"
+<field name="TRANSIT_FRAGMENT_FADE"
type="int"
transient="false"
volatile="false"
@@ -31336,17 +31351,6 @@
visibility="public"
>
</field>
-<field name="TRANSIT_FRAGMENT_PREV"
- type="int"
- transient="false"
- volatile="false"
- value="8196"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="TRANSIT_NONE"
type="int"
transient="false"
@@ -33072,19 +33076,6 @@
<parameter name="callback" type="android.app.LoaderManager.LoaderCallbacks<D>">
</parameter>
</method>
-<method name="stopLoader"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="public"
->
-<parameter name="id" type="int">
-</parameter>
-</method>
</class>
<interface name="LoaderManager.LoaderCallbacks"
abstract="true"
@@ -43781,7 +43772,7 @@
visibility="public"
>
</method>
-<method name="onCancelled"
+<method name="onCanceled"
return="void"
abstract="false"
native="false"
@@ -43794,6 +43785,19 @@
<parameter name="data" type="D">
</parameter>
</method>
+<method name="onCancelled"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="deprecated"
+ visibility="public"
+>
+<parameter name="data" type="D">
+</parameter>
+</method>
<method name="onLoadInBackground"
return="D"
abstract="false"
@@ -44236,8 +44240,6 @@
</parameter>
<parameter name="mimeTypes" type="java.lang.String[]">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="item" type="android.content.ClipData.Item">
</parameter>
</constructor>
@@ -44250,8 +44252,6 @@
>
<parameter name="description" type="android.content.ClipDescription">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="item" type="android.content.ClipData.Item">
</parameter>
</constructor>
@@ -44290,18 +44290,7 @@
visibility="public"
>
</method>
-<method name="getIcon"
- return="android.graphics.Bitmap"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="getItem"
+<method name="getItemAt"
return="android.content.ClipData.Item"
abstract="false"
native="false"
@@ -44337,8 +44326,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="intent" type="android.content.Intent">
</parameter>
</method>
@@ -44354,8 +44341,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="text" type="java.lang.CharSequence">
</parameter>
</method>
@@ -44371,8 +44356,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
</method>
@@ -44390,8 +44373,6 @@
</parameter>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
</method>
@@ -50362,6 +50343,16 @@
>
<parameter name="context" type="android.content.Context">
</parameter>
+</constructor>
+<constructor name="CursorLoader"
+ type="android.content.CursorLoader"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="context" type="android.content.Context">
+</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
<parameter name="projection" type="java.lang.String[]">
@@ -50452,7 +50443,7 @@
visibility="public"
>
</method>
-<method name="onCancelled"
+<method name="onCanceled"
return="void"
abstract="false"
native="false"
@@ -57386,145 +57377,6 @@
>
</field>
</class>
-<class name="XmlDocumentProvider"
- extends="android.content.ContentProvider"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="XmlDocumentProvider"
- type="android.content.XmlDocumentProvider"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="delete"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-</method>
-<method name="getResourceXmlPullParser"
- return="org.xmlpull.v1.XmlPullParser"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="resourceUri" type="android.net.Uri">
-</parameter>
-</method>
-<method name="getType"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-</method>
-<method name="getUriXmlPullParser"
- return="org.xmlpull.v1.XmlPullParser"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="url" type="java.lang.String">
-</parameter>
-</method>
-<method name="insert"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="values" type="android.content.ContentValues">
-</parameter>
-</method>
-<method name="onCreate"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="query"
- return="android.database.Cursor"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="projection" type="java.lang.String[]">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-<parameter name="sortOrder" type="java.lang.String">
-</parameter>
-</method>
-<method name="update"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="values" type="android.content.ContentValues">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-</method>
-</class>
</package>
<package name="android.content.pm"
>
@@ -57794,17 +57646,6 @@
type="int"
transient="false"
volatile="false"
- value="1024"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="FLAG_IMMERSIVE"
- type="int"
- transient="false"
- volatile="false"
value="512"
static="true"
final="true"
diff --git a/api/current.xml b/api/current.xml
index 1309201..b087c20 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -1790,7 +1790,7 @@
type="int"
transient="false"
volatile="false"
- value="16843501"
+ value="16843499"
static="true"
final="true"
deprecated="not deprecated"
@@ -1812,7 +1812,7 @@
type="int"
transient="false"
volatile="false"
- value="16843510"
+ value="16843508"
static="true"
final="true"
deprecated="not deprecated"
@@ -1823,7 +1823,7 @@
type="int"
transient="false"
volatile="false"
- value="16843509"
+ value="16843507"
static="true"
final="true"
deprecated="not deprecated"
@@ -1834,7 +1834,7 @@
type="int"
transient="false"
volatile="false"
- value="16843511"
+ value="16843509"
static="true"
final="true"
deprecated="not deprecated"
@@ -1867,7 +1867,7 @@
type="int"
transient="false"
volatile="false"
- value="16843517"
+ value="16843515"
static="true"
final="true"
deprecated="not deprecated"
@@ -1889,7 +1889,7 @@
type="int"
transient="false"
volatile="false"
- value="16843513"
+ value="16843511"
static="true"
final="true"
deprecated="not deprecated"
@@ -1911,7 +1911,7 @@
type="int"
transient="false"
volatile="false"
- value="16843540"
+ value="16843538"
static="true"
final="true"
deprecated="not deprecated"
@@ -1922,7 +1922,7 @@
type="int"
transient="false"
volatile="false"
- value="16843539"
+ value="16843537"
static="true"
final="true"
deprecated="not deprecated"
@@ -1933,7 +1933,7 @@
type="int"
transient="false"
volatile="false"
- value="16843541"
+ value="16843539"
static="true"
final="true"
deprecated="not deprecated"
@@ -1944,7 +1944,7 @@
type="int"
transient="false"
volatile="false"
- value="16843512"
+ value="16843510"
static="true"
final="true"
deprecated="not deprecated"
@@ -1955,7 +1955,7 @@
type="int"
transient="false"
volatile="false"
- value="16843518"
+ value="16843516"
static="true"
final="true"
deprecated="not deprecated"
@@ -1966,7 +1966,7 @@
type="int"
transient="false"
volatile="false"
- value="16843519"
+ value="16843517"
static="true"
final="true"
deprecated="not deprecated"
@@ -2043,7 +2043,7 @@
type="int"
transient="false"
volatile="false"
- value="16843607"
+ value="16843605"
static="true"
final="true"
deprecated="not deprecated"
@@ -2065,7 +2065,7 @@
type="int"
transient="false"
volatile="false"
- value="16843531"
+ value="16843529"
static="true"
final="true"
deprecated="not deprecated"
@@ -2109,7 +2109,7 @@
type="int"
transient="false"
volatile="false"
- value="16843572"
+ value="16843570"
static="true"
final="true"
deprecated="not deprecated"
@@ -2142,7 +2142,7 @@
type="int"
transient="false"
volatile="false"
- value="16843553"
+ value="16843551"
static="true"
final="true"
deprecated="not deprecated"
@@ -2208,7 +2208,7 @@
type="int"
transient="false"
volatile="false"
- value="16843508"
+ value="16843506"
static="true"
final="true"
deprecated="not deprecated"
@@ -2274,7 +2274,7 @@
type="int"
transient="false"
volatile="false"
- value="16843548"
+ value="16843546"
static="true"
final="true"
deprecated="not deprecated"
@@ -2340,7 +2340,7 @@
type="int"
transient="false"
volatile="false"
- value="16843537"
+ value="16843535"
static="true"
final="true"
deprecated="not deprecated"
@@ -2450,7 +2450,7 @@
type="int"
transient="false"
volatile="false"
- value="16843550"
+ value="16843548"
static="true"
final="true"
deprecated="not deprecated"
@@ -2494,7 +2494,7 @@
type="int"
transient="false"
volatile="false"
- value="16843565"
+ value="16843563"
static="true"
final="true"
deprecated="not deprecated"
@@ -2582,7 +2582,7 @@
type="int"
transient="false"
volatile="false"
- value="16843526"
+ value="16843524"
static="true"
final="true"
deprecated="not deprecated"
@@ -2593,7 +2593,7 @@
type="int"
transient="false"
volatile="false"
- value="16843525"
+ value="16843523"
static="true"
final="true"
deprecated="not deprecated"
@@ -2626,7 +2626,7 @@
type="int"
transient="false"
volatile="false"
- value="16843569"
+ value="16843567"
static="true"
final="true"
deprecated="not deprecated"
@@ -2637,7 +2637,7 @@
type="int"
transient="false"
volatile="false"
- value="16843568"
+ value="16843566"
static="true"
final="true"
deprecated="not deprecated"
@@ -2703,7 +2703,7 @@
type="int"
transient="false"
volatile="false"
- value="16843598"
+ value="16843596"
static="true"
final="true"
deprecated="not deprecated"
@@ -3220,7 +3220,7 @@
type="int"
transient="false"
volatile="false"
- value="16843581"
+ value="16843579"
static="true"
final="true"
deprecated="not deprecated"
@@ -3275,7 +3275,7 @@
type="int"
transient="false"
volatile="false"
- value="16843595"
+ value="16843593"
static="true"
final="true"
deprecated="not deprecated"
@@ -3385,7 +3385,7 @@
type="int"
transient="false"
volatile="false"
- value="16843600"
+ value="16843598"
static="true"
final="true"
deprecated="not deprecated"
@@ -3451,7 +3451,7 @@
type="int"
transient="false"
volatile="false"
- value="16843530"
+ value="16843528"
static="true"
final="true"
deprecated="not deprecated"
@@ -3572,7 +3572,7 @@
type="int"
transient="false"
volatile="false"
- value="16843566"
+ value="16843564"
static="true"
final="true"
deprecated="not deprecated"
@@ -3583,7 +3583,7 @@
type="int"
transient="false"
volatile="false"
- value="16843564"
+ value="16843562"
static="true"
final="true"
deprecated="not deprecated"
@@ -3594,7 +3594,7 @@
type="int"
transient="false"
volatile="false"
- value="16843532"
+ value="16843530"
static="true"
final="true"
deprecated="not deprecated"
@@ -3825,7 +3825,7 @@
type="int"
transient="false"
volatile="false"
- value="16843604"
+ value="16843602"
static="true"
final="true"
deprecated="not deprecated"
@@ -3836,7 +3836,7 @@
type="int"
transient="false"
volatile="false"
- value="16843603"
+ value="16843601"
static="true"
final="true"
deprecated="not deprecated"
@@ -3946,7 +3946,7 @@
type="int"
transient="false"
volatile="false"
- value="16843534"
+ value="16843532"
static="true"
final="true"
deprecated="not deprecated"
@@ -4001,7 +4001,7 @@
type="int"
transient="false"
volatile="false"
- value="16843535"
+ value="16843533"
static="true"
final="true"
deprecated="not deprecated"
@@ -4199,7 +4199,7 @@
type="int"
transient="false"
volatile="false"
- value="16843575"
+ value="16843573"
static="true"
final="true"
deprecated="not deprecated"
@@ -4221,7 +4221,7 @@
type="int"
transient="false"
volatile="false"
- value="16843580"
+ value="16843578"
static="true"
final="true"
deprecated="not deprecated"
@@ -4232,7 +4232,7 @@
type="int"
transient="false"
volatile="false"
- value="16843577"
+ value="16843575"
static="true"
final="true"
deprecated="not deprecated"
@@ -4243,7 +4243,7 @@
type="int"
transient="false"
volatile="false"
- value="16843578"
+ value="16843576"
static="true"
final="true"
deprecated="not deprecated"
@@ -4254,7 +4254,7 @@
type="int"
transient="false"
volatile="false"
- value="16843611"
+ value="16843609"
static="true"
final="true"
deprecated="not deprecated"
@@ -4265,7 +4265,7 @@
type="int"
transient="false"
volatile="false"
- value="16843576"
+ value="16843574"
static="true"
final="true"
deprecated="not deprecated"
@@ -4276,7 +4276,7 @@
type="int"
transient="false"
volatile="false"
- value="16843579"
+ value="16843577"
static="true"
final="true"
deprecated="not deprecated"
@@ -4375,7 +4375,7 @@
type="int"
transient="false"
volatile="false"
- value="16843583"
+ value="16843581"
static="true"
final="true"
deprecated="not deprecated"
@@ -4430,7 +4430,7 @@
type="int"
transient="false"
volatile="false"
- value="16843589"
+ value="16843587"
static="true"
final="true"
deprecated="not deprecated"
@@ -4514,7 +4514,7 @@
visibility="public"
>
</field>
-<field name="fragmentNextEnterAnimation"
+<field name="fragmentFadeEnterAnimation"
type="int"
transient="false"
volatile="false"
@@ -4525,7 +4525,7 @@
visibility="public"
>
</field>
-<field name="fragmentNextExitAnimation"
+<field name="fragmentFadeExitAnimation"
type="int"
transient="false"
volatile="false"
@@ -4558,28 +4558,6 @@
visibility="public"
>
</field>
-<field name="fragmentPrevEnterAnimation"
- type="int"
- transient="false"
- volatile="false"
- value="16843499"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="fragmentPrevExitAnimation"
- type="int"
- transient="false"
- volatile="false"
- value="16843500"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="freezesText"
type="int"
transient="false"
@@ -4969,7 +4947,7 @@
type="int"
transient="false"
volatile="false"
- value="16843533"
+ value="16843531"
static="true"
final="true"
deprecated="not deprecated"
@@ -4980,7 +4958,7 @@
type="int"
transient="false"
volatile="false"
- value="16843551"
+ value="16843549"
static="true"
final="true"
deprecated="not deprecated"
@@ -5013,7 +4991,7 @@
type="int"
transient="false"
volatile="false"
- value="16843605"
+ value="16843603"
static="true"
final="true"
deprecated="not deprecated"
@@ -5068,7 +5046,7 @@
type="int"
transient="false"
volatile="false"
- value="16843516"
+ value="16843514"
static="true"
final="true"
deprecated="not deprecated"
@@ -5189,7 +5167,7 @@
type="int"
transient="false"
volatile="false"
- value="16843504"
+ value="16843502"
static="true"
final="true"
deprecated="not deprecated"
@@ -5200,7 +5178,7 @@
type="int"
transient="false"
volatile="false"
- value="16843502"
+ value="16843500"
static="true"
final="true"
deprecated="not deprecated"
@@ -5211,7 +5189,7 @@
type="int"
transient="false"
volatile="false"
- value="16843503"
+ value="16843501"
static="true"
final="true"
deprecated="not deprecated"
@@ -5321,7 +5299,7 @@
type="int"
transient="false"
volatile="false"
- value="16843546"
+ value="16843544"
static="true"
final="true"
deprecated="not deprecated"
@@ -5497,7 +5475,7 @@
type="int"
transient="false"
volatile="false"
- value="16843573"
+ value="16843571"
static="true"
final="true"
deprecated="not deprecated"
@@ -5596,7 +5574,7 @@
type="int"
transient="false"
volatile="false"
- value="16843567"
+ value="16843565"
static="true"
final="true"
deprecated="not deprecated"
@@ -5827,7 +5805,7 @@
type="int"
transient="false"
volatile="false"
- value="16843612"
+ value="16843610"
static="true"
final="true"
deprecated="not deprecated"
@@ -5860,7 +5838,7 @@
type="int"
transient="false"
volatile="false"
- value="16843606"
+ value="16843604"
static="true"
final="true"
deprecated="not deprecated"
@@ -6289,7 +6267,7 @@
type="int"
transient="false"
volatile="false"
- value="16843506"
+ value="16843504"
static="true"
final="true"
deprecated="not deprecated"
@@ -6333,7 +6311,7 @@
type="int"
transient="false"
volatile="false"
- value="16843527"
+ value="16843525"
static="true"
final="true"
deprecated="not deprecated"
@@ -6344,7 +6322,7 @@
type="int"
transient="false"
volatile="false"
- value="16843521"
+ value="16843519"
static="true"
final="true"
deprecated="not deprecated"
@@ -6432,7 +6410,7 @@
type="int"
transient="false"
volatile="false"
- value="16843529"
+ value="16843527"
static="true"
final="true"
deprecated="not deprecated"
@@ -6487,7 +6465,7 @@
type="int"
transient="false"
volatile="false"
- value="16843586"
+ value="16843584"
static="true"
final="true"
deprecated="not deprecated"
@@ -6641,7 +6619,7 @@
type="int"
transient="false"
volatile="false"
- value="16843585"
+ value="16843583"
static="true"
final="true"
deprecated="not deprecated"
@@ -6795,7 +6773,7 @@
type="int"
transient="false"
volatile="false"
- value="16843582"
+ value="16843580"
static="true"
final="true"
deprecated="not deprecated"
@@ -6927,7 +6905,7 @@
type="int"
transient="false"
volatile="false"
- value="16843552"
+ value="16843550"
static="true"
final="true"
deprecated="not deprecated"
@@ -7323,7 +7301,7 @@
type="int"
transient="false"
volatile="false"
- value="16843522"
+ value="16843520"
static="true"
final="true"
deprecated="not deprecated"
@@ -7477,7 +7455,7 @@
type="int"
transient="false"
volatile="false"
- value="16843547"
+ value="16843545"
static="true"
final="true"
deprecated="not deprecated"
@@ -7642,7 +7620,7 @@
type="int"
transient="false"
volatile="false"
- value="16843610"
+ value="16843608"
static="true"
final="true"
deprecated="not deprecated"
@@ -7961,7 +7939,7 @@
type="int"
transient="false"
volatile="false"
- value="16843560"
+ value="16843558"
static="true"
final="true"
deprecated="not deprecated"
@@ -7972,7 +7950,7 @@
type="int"
transient="false"
volatile="false"
- value="16843561"
+ value="16843559"
static="true"
final="true"
deprecated="not deprecated"
@@ -7983,7 +7961,7 @@
type="int"
transient="false"
volatile="false"
- value="16843562"
+ value="16843560"
static="true"
final="true"
deprecated="not deprecated"
@@ -8082,7 +8060,7 @@
type="int"
transient="false"
volatile="false"
- value="16843558"
+ value="16843556"
static="true"
final="true"
deprecated="not deprecated"
@@ -8093,7 +8071,7 @@
type="int"
transient="false"
volatile="false"
- value="16843559"
+ value="16843557"
static="true"
final="true"
deprecated="not deprecated"
@@ -8445,7 +8423,7 @@
type="int"
transient="false"
volatile="false"
- value="16843570"
+ value="16843568"
static="true"
final="true"
deprecated="not deprecated"
@@ -8478,7 +8456,7 @@
type="int"
transient="false"
volatile="false"
- value="16843536"
+ value="16843534"
static="true"
final="true"
deprecated="not deprecated"
@@ -8489,7 +8467,7 @@
type="int"
transient="false"
volatile="false"
- value="16843593"
+ value="16843591"
static="true"
final="true"
deprecated="not deprecated"
@@ -8500,7 +8478,7 @@
type="int"
transient="false"
volatile="false"
- value="16843588"
+ value="16843586"
static="true"
final="true"
deprecated="not deprecated"
@@ -8643,7 +8621,7 @@
type="int"
transient="false"
volatile="false"
- value="16843563"
+ value="16843561"
static="true"
final="true"
deprecated="not deprecated"
@@ -8665,7 +8643,7 @@
type="int"
transient="false"
volatile="false"
- value="16843584"
+ value="16843582"
static="true"
final="true"
deprecated="not deprecated"
@@ -8676,7 +8654,7 @@
type="int"
transient="false"
volatile="false"
- value="16843587"
+ value="16843585"
static="true"
final="true"
deprecated="not deprecated"
@@ -8742,7 +8720,7 @@
type="int"
transient="false"
volatile="false"
- value="16843596"
+ value="16843594"
static="true"
final="true"
deprecated="not deprecated"
@@ -8797,7 +8775,7 @@
type="int"
transient="false"
volatile="false"
- value="16843507"
+ value="16843505"
static="true"
final="true"
deprecated="not deprecated"
@@ -8819,7 +8797,7 @@
type="int"
transient="false"
volatile="false"
- value="16843597"
+ value="16843595"
static="true"
final="true"
deprecated="not deprecated"
@@ -8830,7 +8808,7 @@
type="int"
transient="false"
volatile="false"
- value="16843505"
+ value="16843503"
static="true"
final="true"
deprecated="not deprecated"
@@ -8929,7 +8907,7 @@
type="int"
transient="false"
volatile="false"
- value="16843549"
+ value="16843547"
static="true"
final="true"
deprecated="not deprecated"
@@ -8940,7 +8918,7 @@
type="int"
transient="false"
volatile="false"
- value="16843520"
+ value="16843518"
static="true"
final="true"
deprecated="not deprecated"
@@ -9072,7 +9050,7 @@
type="int"
transient="false"
volatile="false"
- value="16843599"
+ value="16843597"
static="true"
final="true"
deprecated="not deprecated"
@@ -9127,7 +9105,7 @@
type="int"
transient="false"
volatile="false"
- value="16843571"
+ value="16843569"
static="true"
final="true"
deprecated="not deprecated"
@@ -9193,7 +9171,7 @@
type="int"
transient="false"
volatile="false"
- value="16843515"
+ value="16843513"
static="true"
final="true"
deprecated="not deprecated"
@@ -9578,7 +9556,7 @@
type="int"
transient="false"
volatile="false"
- value="16843523"
+ value="16843521"
static="true"
final="true"
deprecated="not deprecated"
@@ -9655,7 +9633,7 @@
type="int"
transient="false"
volatile="false"
- value="16843524"
+ value="16843522"
static="true"
final="true"
deprecated="not deprecated"
@@ -9699,7 +9677,7 @@
type="int"
transient="false"
volatile="false"
- value="16843528"
+ value="16843526"
static="true"
final="true"
deprecated="not deprecated"
@@ -9721,7 +9699,7 @@
type="int"
transient="false"
volatile="false"
- value="16843601"
+ value="16843599"
static="true"
final="true"
deprecated="not deprecated"
@@ -9765,7 +9743,7 @@
type="int"
transient="false"
volatile="false"
- value="16843602"
+ value="16843600"
static="true"
final="true"
deprecated="not deprecated"
@@ -9908,7 +9886,7 @@
type="int"
transient="false"
volatile="false"
- value="16843543"
+ value="16843541"
static="true"
final="true"
deprecated="not deprecated"
@@ -9919,7 +9897,7 @@
type="int"
transient="false"
volatile="false"
- value="16843542"
+ value="16843540"
static="true"
final="true"
deprecated="not deprecated"
@@ -9941,7 +9919,7 @@
type="int"
transient="false"
volatile="false"
- value="16843544"
+ value="16843542"
static="true"
final="true"
deprecated="not deprecated"
@@ -10172,7 +10150,7 @@
type="int"
transient="false"
volatile="false"
- value="16843514"
+ value="16843512"
static="true"
final="true"
deprecated="not deprecated"
@@ -10326,7 +10304,7 @@
type="int"
transient="false"
volatile="false"
- value="16843554"
+ value="16843552"
static="true"
final="true"
deprecated="not deprecated"
@@ -10337,7 +10315,7 @@
type="int"
transient="false"
volatile="false"
- value="16843555"
+ value="16843553"
static="true"
final="true"
deprecated="not deprecated"
@@ -10348,7 +10326,7 @@
type="int"
transient="false"
volatile="false"
- value="16843556"
+ value="16843554"
static="true"
final="true"
deprecated="not deprecated"
@@ -10359,7 +10337,7 @@
type="int"
transient="false"
volatile="false"
- value="16843557"
+ value="16843555"
static="true"
final="true"
deprecated="not deprecated"
@@ -10403,7 +10381,7 @@
type="int"
transient="false"
volatile="false"
- value="16843590"
+ value="16843588"
static="true"
final="true"
deprecated="not deprecated"
@@ -10436,7 +10414,7 @@
type="int"
transient="false"
volatile="false"
- value="16843538"
+ value="16843536"
static="true"
final="true"
deprecated="not deprecated"
@@ -10579,7 +10557,7 @@
type="int"
transient="false"
volatile="false"
- value="16843574"
+ value="16843572"
static="true"
final="true"
deprecated="not deprecated"
@@ -10799,7 +10777,7 @@
type="int"
transient="false"
volatile="false"
- value="16843594"
+ value="16843592"
static="true"
final="true"
deprecated="not deprecated"
@@ -10810,7 +10788,7 @@
type="int"
transient="false"
volatile="false"
- value="16843591"
+ value="16843589"
static="true"
final="true"
deprecated="not deprecated"
@@ -10821,7 +10799,7 @@
type="int"
transient="false"
volatile="false"
- value="16843592"
+ value="16843590"
static="true"
final="true"
deprecated="not deprecated"
@@ -10942,7 +10920,7 @@
type="int"
transient="false"
volatile="false"
- value="16843545"
+ value="16843543"
static="true"
final="true"
deprecated="not deprecated"
@@ -11030,7 +11008,7 @@
type="int"
transient="false"
volatile="false"
- value="16843608"
+ value="16843606"
static="true"
final="true"
deprecated="not deprecated"
@@ -11041,7 +11019,7 @@
type="int"
transient="false"
volatile="false"
- value="16843609"
+ value="16843607"
static="true"
final="true"
deprecated="not deprecated"
@@ -28602,17 +28580,6 @@
visibility="public"
>
</method>
-<method name="getCancelable"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="getDialog"
return="android.app.Dialog"
abstract="false"
@@ -28646,6 +28613,17 @@
visibility="public"
>
</method>
+<method name="isCancelable"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="onCancel"
return="void"
abstract="false"
@@ -30709,17 +30687,6 @@
visibility="public"
>
</method>
-<method name="countBackStackEntries"
- return="int"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="dump"
return="void"
abstract="true"
@@ -30789,7 +30756,7 @@
<parameter name="tag" type="java.lang.String">
</parameter>
</method>
-<method name="getBackStackEntry"
+<method name="getBackStackEntryAt"
return="android.app.FragmentManager.BackStackEntry"
abstract="true"
native="false"
@@ -30802,6 +30769,17 @@
<parameter name="index" type="int">
</parameter>
</method>
+<method name="getBackStackEntryCount"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getFragment"
return="android.app.Fragment"
abstract="true"
@@ -30817,17 +30795,6 @@
<parameter name="key" type="java.lang.String">
</parameter>
</method>
-<method name="openTransaction"
- return="android.app.FragmentTransaction"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
<method name="popBackStack"
return="void"
abstract="true"
@@ -30970,6 +30937,17 @@
visibility="public"
>
</method>
+<method name="getBreadCrumbShortTitleRes"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getBreadCrumbTitle"
return="java.lang.CharSequence"
abstract="true"
@@ -30981,6 +30959,17 @@
visibility="public"
>
</method>
+<method name="getBreadCrumbTitleRes"
+ return="int"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getId"
return="int"
abstract="true"
@@ -31340,7 +31329,7 @@
visibility="public"
>
</field>
-<field name="TRANSIT_FRAGMENT_NEXT"
+<field name="TRANSIT_FRAGMENT_FADE"
type="int"
transient="false"
volatile="false"
@@ -31362,17 +31351,6 @@
visibility="public"
>
</field>
-<field name="TRANSIT_FRAGMENT_PREV"
- type="int"
- transient="false"
- volatile="false"
- value="8196"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="TRANSIT_NONE"
type="int"
transient="false"
@@ -33098,19 +33076,6 @@
<parameter name="callback" type="android.app.LoaderManager.LoaderCallbacks<D>">
</parameter>
</method>
-<method name="stopLoader"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="public"
->
-<parameter name="id" type="int">
-</parameter>
-</method>
</class>
<interface name="LoaderManager.LoaderCallbacks"
abstract="true"
@@ -43807,7 +43772,7 @@
visibility="public"
>
</method>
-<method name="onCancelled"
+<method name="onCanceled"
return="void"
abstract="false"
native="false"
@@ -43820,6 +43785,19 @@
<parameter name="data" type="D">
</parameter>
</method>
+<method name="onCancelled"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="deprecated"
+ visibility="public"
+>
+<parameter name="data" type="D">
+</parameter>
+</method>
<method name="onLoadInBackground"
return="D"
abstract="false"
@@ -44262,8 +44240,6 @@
</parameter>
<parameter name="mimeTypes" type="java.lang.String[]">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="item" type="android.content.ClipData.Item">
</parameter>
</constructor>
@@ -44276,8 +44252,6 @@
>
<parameter name="description" type="android.content.ClipDescription">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="item" type="android.content.ClipData.Item">
</parameter>
</constructor>
@@ -44316,18 +44290,7 @@
visibility="public"
>
</method>
-<method name="getIcon"
- return="android.graphics.Bitmap"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="getItem"
+<method name="getItemAt"
return="android.content.ClipData.Item"
abstract="false"
native="false"
@@ -44363,8 +44326,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="intent" type="android.content.Intent">
</parameter>
</method>
@@ -44380,8 +44341,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="text" type="java.lang.CharSequence">
</parameter>
</method>
@@ -44397,8 +44356,6 @@
>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
</method>
@@ -44416,8 +44373,6 @@
</parameter>
<parameter name="label" type="java.lang.CharSequence">
</parameter>
-<parameter name="icon" type="android.graphics.Bitmap">
-</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
</method>
@@ -50388,6 +50343,16 @@
>
<parameter name="context" type="android.content.Context">
</parameter>
+</constructor>
+<constructor name="CursorLoader"
+ type="android.content.CursorLoader"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="context" type="android.content.Context">
+</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
<parameter name="projection" type="java.lang.String[]">
@@ -50478,7 +50443,7 @@
visibility="public"
>
</method>
-<method name="onCancelled"
+<method name="onCanceled"
return="void"
abstract="false"
native="false"
@@ -57412,145 +57377,6 @@
>
</field>
</class>
-<class name="XmlDocumentProvider"
- extends="android.content.ContentProvider"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="XmlDocumentProvider"
- type="android.content.XmlDocumentProvider"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="delete"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-</method>
-<method name="getResourceXmlPullParser"
- return="org.xmlpull.v1.XmlPullParser"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="resourceUri" type="android.net.Uri">
-</parameter>
-</method>
-<method name="getType"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-</method>
-<method name="getUriXmlPullParser"
- return="org.xmlpull.v1.XmlPullParser"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="url" type="java.lang.String">
-</parameter>
-</method>
-<method name="insert"
- return="android.net.Uri"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="values" type="android.content.ContentValues">
-</parameter>
-</method>
-<method name="onCreate"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="query"
- return="android.database.Cursor"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="projection" type="java.lang.String[]">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-<parameter name="sortOrder" type="java.lang.String">
-</parameter>
-</method>
-<method name="update"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="uri" type="android.net.Uri">
-</parameter>
-<parameter name="values" type="android.content.ContentValues">
-</parameter>
-<parameter name="selection" type="java.lang.String">
-</parameter>
-<parameter name="selectionArgs" type="java.lang.String[]">
-</parameter>
-</method>
-</class>
</package>
<package name="android.content.pm"
>
@@ -57820,17 +57646,6 @@
type="int"
transient="false"
volatile="false"
- value="1024"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="FLAG_IMMERSIVE"
- type="int"
- transient="false"
- volatile="false"
value="512"
static="true"
final="true"
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 33b747c..1d217f0 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -267,6 +267,14 @@
return mIndex;
}
+ public int getBreadCrumbTitleRes() {
+ return mBreadCrumbTitleRes;
+ }
+
+ public int getBreadCrumbShortTitleRes() {
+ return mBreadCrumbShortTitleRes;
+ }
+
public CharSequence getBreadCrumbTitle() {
if (mBreadCrumbTitleRes != 0) {
return mManager.mActivity.getText(mBreadCrumbTitleRes);
diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java
index 6f25293..0bc89e7 100644
--- a/core/java/android/app/DialogFragment.java
+++ b/core/java/android/app/DialogFragment.java
@@ -295,7 +295,7 @@
/**
* Return the current value of {@link #setCancelable(boolean)}.
*/
- public boolean getCancelable() {
+ public boolean isCancelable() {
return mCancelable;
}
diff --git a/core/java/android/app/FragmentBreadCrumbs.java b/core/java/android/app/FragmentBreadCrumbs.java
index fb89099..72a8e9a 100644
--- a/core/java/android/app/FragmentBreadCrumbs.java
+++ b/core/java/android/app/FragmentBreadCrumbs.java
@@ -204,13 +204,13 @@
void updateCrumbs() {
FragmentManager fm = mActivity.getFragmentManager();
- int numEntries = fm.countBackStackEntries();
+ int numEntries = fm.getBackStackEntryCount();
int numPreEntries = getPreEntryCount();
int numViews = mContainer.getChildCount();
for (int i = 0; i < numEntries + numPreEntries; i++) {
BackStackEntry bse = i < numPreEntries
? getPreEntry(i)
- : fm.getBackStackEntry(i - numPreEntries);
+ : fm.getBackStackEntryAt(i - numPreEntries);
if (i < numViews) {
View v = mContainer.getChildAt(i);
Object tag = v.getTag();
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index e35ef87..bce240f 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -49,7 +49,7 @@
* Representation of an entry on the fragment back stack, as created
* with {@link FragmentTransaction#addToBackStack(String)
* FragmentTransaction.addToBackStack()}. Entries can later be
- * retrieved with {@link FragmentManager#getBackStackEntry(int)
+ * retrieved with {@link FragmentManager#getBackStackEntryAt(int)
* FragmentManager.getBackStackEntry()}.
*
* <p>Note that you should never hold on to a BackStackEntry object;
@@ -65,6 +65,18 @@
public int getId();
/**
+ * Return the full bread crumb title resource identifier for the entry,
+ * or 0 if it does not have one.
+ */
+ public int getBreadCrumbTitleRes();
+
+ /**
+ * Return the short bread crumb title resource identifier for the entry,
+ * or 0 if it does not have one.
+ */
+ public int getBreadCrumbShortTitleRes();
+
+ /**
* Return the full bread crumb title for the entry, or null if it
* does not have one.
*/
@@ -102,7 +114,8 @@
*/
public abstract FragmentTransaction beginTransaction();
- /** Old API */
+ /** @hide -- remove once prebuilts are in. */
+ @Deprecated
public FragmentTransaction openTransaction() {
return beginTransaction();
}
@@ -153,7 +166,9 @@
/**
* Pop the top state off the back stack. Returns true if there was one
- * to pop, else false.
+ * to pop, else false. This function is asynchronous -- it enqueues the
+ * request to pop, but the action will not be performed until the application
+ * returns to its event loop.
*/
public abstract void popBackStack();
@@ -168,6 +183,10 @@
/**
* Pop the last fragment transition from the manager's fragment
* back stack. If there is nothing to pop, false is returned.
+ * This function is asynchronous -- it enqueues the
+ * request to pop, but the action will not be performed until the application
+ * returns to its event loop.
+ *
* @param name If non-null, this is the name of a previous back state
* to look for; if found, all states up to that state will be popped. The
* {@link #POP_BACK_STACK_INCLUSIVE} flag can be used to control whether
@@ -186,6 +205,10 @@
/**
* Pop all back stack states up to the one with the given identifier.
+ * This function is asynchronous -- it enqueues the
+ * request to pop, but the action will not be performed until the application
+ * returns to its event loop.
+ *
* @param id Identifier of the stated to be popped. If no identifier exists,
* false is returned.
* The identifier is the number returned by
@@ -207,13 +230,13 @@
/**
* Return the number of entries currently in the back stack.
*/
- public abstract int countBackStackEntries();
+ public abstract int getBackStackEntryCount();
/**
* Return the BackStackEntry at index <var>index</var> in the back stack;
* entries start index 0 being the bottom of the stack.
*/
- public abstract BackStackEntry getBackStackEntry(int index);
+ public abstract BackStackEntry getBackStackEntryAt(int index);
/**
* Add a new listener for changes to the fragment back stack.
@@ -416,12 +439,12 @@
}
@Override
- public int countBackStackEntries() {
+ public int getBackStackEntryCount() {
return mBackStack != null ? mBackStack.size() : 0;
}
@Override
- public BackStackEntry getBackStackEntry(int index) {
+ public BackStackEntry getBackStackEntryAt(int index) {
return mBackStack.get(index);
}
@@ -1678,11 +1701,8 @@
case FragmentTransaction.TRANSIT_FRAGMENT_CLOSE:
rev = FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
break;
- case FragmentTransaction.TRANSIT_FRAGMENT_NEXT:
- rev = FragmentTransaction.TRANSIT_FRAGMENT_PREV;
- break;
- case FragmentTransaction.TRANSIT_FRAGMENT_PREV:
- rev = FragmentTransaction.TRANSIT_FRAGMENT_NEXT;
+ case FragmentTransaction.TRANSIT_FRAGMENT_FADE:
+ rev = FragmentTransaction.TRANSIT_FRAGMENT_FADE;
break;
}
return rev;
@@ -1702,15 +1722,10 @@
? com.android.internal.R.styleable.FragmentAnimation_fragmentCloseEnterAnimation
: com.android.internal.R.styleable.FragmentAnimation_fragmentCloseExitAnimation;
break;
- case FragmentTransaction.TRANSIT_FRAGMENT_NEXT:
+ case FragmentTransaction.TRANSIT_FRAGMENT_FADE:
animAttr = enter
- ? com.android.internal.R.styleable.FragmentAnimation_fragmentNextEnterAnimation
- : com.android.internal.R.styleable.FragmentAnimation_fragmentNextExitAnimation;
- break;
- case FragmentTransaction.TRANSIT_FRAGMENT_PREV:
- animAttr = enter
- ? com.android.internal.R.styleable.FragmentAnimation_fragmentPrevEnterAnimation
- : com.android.internal.R.styleable.FragmentAnimation_fragmentPrevExitAnimation;
+ ? com.android.internal.R.styleable.FragmentAnimation_fragmentFadeEnterAnimation
+ : com.android.internal.R.styleable.FragmentAnimation_fragmentFadeExitAnimation;
break;
}
return animAttr;
diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java
index 1b8debc..0cc774d 100644
--- a/core/java/android/app/FragmentTransaction.java
+++ b/core/java/android/app/FragmentTransaction.java
@@ -110,10 +110,9 @@
public static final int TRANSIT_FRAGMENT_OPEN = 1 | TRANSIT_ENTER_MASK;
/** Fragment is being removed from the stack */
public static final int TRANSIT_FRAGMENT_CLOSE = 2 | TRANSIT_EXIT_MASK;
- /** Fragment is being added in a 'next' operation*/
- public static final int TRANSIT_FRAGMENT_NEXT = 3 | TRANSIT_ENTER_MASK;
- /** Fragment is being removed in a 'previous' operation */
- public static final int TRANSIT_FRAGMENT_PREV = 4 | TRANSIT_EXIT_MASK;
+ /** Fragment should simply fade in or out; that is, no strong navigation associated
+ * with it except that it is appearing or disappearing for some reason. */
+ public static final int TRANSIT_FRAGMENT_FADE = 3 | TRANSIT_ENTER_MASK;
/**
* Set specific animation resources to run for the fragments that are
diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java
index cd5e3bb..ffe2a5d 100644
--- a/core/java/android/app/LoaderManager.java
+++ b/core/java/android/app/LoaderManager.java
@@ -159,14 +159,6 @@
public abstract void destroyLoader(int id);
/**
- * @deprecated Renamed to {@link #destroyLoader}.
- */
- @Deprecated
- public void stopLoader(int id) {
- destroyLoader(id);
- }
-
- /**
* Return the Loader with the given id or null if no matching Loader
* is found.
*/
diff --git a/core/java/android/content/AsyncTaskLoader.java b/core/java/android/content/AsyncTaskLoader.java
index c6b9e80..4cf356f 100644
--- a/core/java/android/content/AsyncTaskLoader.java
+++ b/core/java/android/content/AsyncTaskLoader.java
@@ -168,9 +168,14 @@
* Called if the task was canceled before it was completed. Gives the class a chance
* to properly dispose of the result.
*/
- public void onCancelled(D data) {
+ public void onCanceled(D data) {
+ onCancelled(data);
}
+ @Deprecated
+ public void onCancelled(D data) {
+ }
+
void executePendingTask() {
if (mCancellingTask == null && mTask != null) {
if (mTask.waiting) {
@@ -195,7 +200,7 @@
}
void dispatchOnCancelled(LoadTask task, D data) {
- onCancelled(data);
+ onCanceled(data);
if (mCancellingTask == task) {
if (DEBUG) Slog.v(TAG, "Cancelled task is now canceled!");
mLastLoadCompleteTime = SystemClock.uptimeMillis();
diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java
index 5939643..028149b 100644
--- a/core/java/android/content/BroadcastReceiver.java
+++ b/core/java/android/content/BroadcastReceiver.java
@@ -170,6 +170,16 @@
* State for a result that is pending for a broadcast receiver. Returned
* by {@link BroadcastReceiver#goAsync() goAsync()}
* while in {@link BroadcastReceiver#onReceive BroadcastReceiver.onReceive()}.
+ * This allows you to return from onReceive() without having the broadcast
+ * terminate; you must call {@link #finish()} once you are done with the
+ * broadcast. This allows you to process the broadcast off of the main
+ * thread of your app.
+ *
+ * <p>Note on threading: the state inside of this class is not itself
+ * thread-safe, however you can use it from any thread if you properly
+ * sure that you do not have races. Typically this means you will hand
+ * the entire object to another thread, which will be solely responsible
+ * for setting any results and finally calling {@link #finish()}.
*/
public static class PendingResult {
/** @hide */
diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java
index 6f4d098..d9c6b07 100644
--- a/core/java/android/content/ClipData.java
+++ b/core/java/android/content/ClipData.java
@@ -42,9 +42,9 @@
* {@link ClipDescription#getMimeType(int) getDescription().getMimeType(int)}
* must return correct MIME type(s) describing the data in the clip. For help
* in correctly constructing a clip with the correct MIME type, use
- * {@link #newPlainText(CharSequence, Bitmap, CharSequence)},
- * {@link #newUri(ContentResolver, CharSequence, Bitmap, Uri)}, and
- * {@link #newIntent(CharSequence, Bitmap, Intent)}.
+ * {@link #newPlainText(CharSequence, CharSequence)},
+ * {@link #newUri(ContentResolver, CharSequence, Uri)}, and
+ * {@link #newIntent(CharSequence, Intent)}.
*
* <p>Each Item instance can be one of three main classes of data: a simple
* CharSequence of text, a single Intent object, or a Uri. See {@link Item}
@@ -70,7 +70,7 @@
* "content:" URIs. A content URI allows the recipient of a ClippedData item
* to interact closely with the ContentProvider holding the data in order to
* negotiate the transfer of that data. The clip must also be filled in with
- * the available MIME types; {@link #newUri(ContentResolver, CharSequence, Bitmap, Uri)}
+ * the available MIME types; {@link #newUri(ContentResolver, CharSequence, Uri)}
* will take care of correctly doing this.
*
* <p>For example, here is the paste function of a simple NotePad application.
@@ -321,16 +321,14 @@
*
* @param label Label to show to the user describing this clip.
* @param mimeTypes An array of MIME types this data is available as.
- * @param icon Bitmap providing the user with an iconing representation of
- * the clip.
* @param item The contents of the first item in the clip.
*/
- public ClipData(CharSequence label, String[] mimeTypes, Bitmap icon, Item item) {
+ public ClipData(CharSequence label, String[] mimeTypes, Item item) {
mClipDescription = new ClipDescription(label, mimeTypes);
if (item == null) {
throw new NullPointerException("item is null");
}
- mIcon = icon;
+ mIcon = null;
mItems.add(item);
}
@@ -338,16 +336,14 @@
* Create a new clip.
*
* @param description The ClipDescription describing the clip contents.
- * @param icon Bitmap providing the user with an iconing representation of
- * the clip.
* @param item The contents of the first item in the clip.
*/
- public ClipData(ClipDescription description, Bitmap icon, Item item) {
+ public ClipData(ClipDescription description, Item item) {
mClipDescription = description;
if (item == null) {
throw new NullPointerException("item is null");
}
- mIcon = icon;
+ mIcon = null;
mItems.add(item);
}
@@ -356,13 +352,12 @@
* {@link ClipDescription#MIMETYPE_TEXT_PLAIN}.
*
* @param label User-visible label for the clip data.
- * @param icon Iconic representation of the clip data.
* @param text The actual text in the clip.
* @return Returns a new ClipData containing the specified data.
*/
- static public ClipData newPlainText(CharSequence label, Bitmap icon, CharSequence text) {
+ static public ClipData newPlainText(CharSequence label, CharSequence text) {
Item item = new Item(text);
- return new ClipData(label, MIMETYPES_TEXT_PLAIN, icon, item);
+ return new ClipData(label, MIMETYPES_TEXT_PLAIN, item);
}
/**
@@ -370,13 +365,12 @@
* {@link ClipDescription#MIMETYPE_TEXT_INTENT}.
*
* @param label User-visible label for the clip data.
- * @param icon Iconic representation of the clip data.
* @param intent The actual Intent in the clip.
* @return Returns a new ClipData containing the specified data.
*/
- static public ClipData newIntent(CharSequence label, Bitmap icon, Intent intent) {
+ static public ClipData newIntent(CharSequence label, Intent intent) {
Item item = new Item(intent);
- return new ClipData(label, MIMETYPES_TEXT_INTENT, icon, item);
+ return new ClipData(label, MIMETYPES_TEXT_INTENT, item);
}
/**
@@ -387,12 +381,11 @@
*
* @param resolver ContentResolver used to get information about the URI.
* @param label User-visible label for the clip data.
- * @param icon Iconic representation of the clip data.
* @param uri The URI in the clip.
* @return Returns a new ClipData containing the specified data.
*/
static public ClipData newUri(ContentResolver resolver, CharSequence label,
- Bitmap icon, Uri uri) {
+ Uri uri) {
Item item = new Item(uri);
String[] mimeTypes = null;
if ("content".equals(uri.getScheme())) {
@@ -417,24 +410,23 @@
if (mimeTypes == null) {
mimeTypes = MIMETYPES_TEXT_URILIST;
}
- return new ClipData(label, mimeTypes, icon, item);
+ return new ClipData(label, mimeTypes, item);
}
/**
* Create a new ClipData holding an URI with MIME type
* {@link ClipDescription#MIMETYPE_TEXT_URILIST}.
- * Unlike {@link #newUri(ContentResolver, CharSequence, Bitmap, Uri)}, nothing
+ * Unlike {@link #newUri(ContentResolver, CharSequence, Uri)}, nothing
* is inferred about the URI -- if it is a content: URI holding a bitmap,
* the reported type will still be uri-list. Use this with care!
*
* @param label User-visible label for the clip data.
- * @param icon Iconic representation of the clip data.
* @param uri The URI in the clip.
* @return Returns a new ClipData containing the specified data.
*/
- static public ClipData newRawUri(CharSequence label, Bitmap icon, Uri uri) {
+ static public ClipData newRawUri(CharSequence label, Uri uri) {
Item item = new Item(uri);
- return new ClipData(label, MIMETYPES_TEXT_URILIST, icon, item);
+ return new ClipData(label, MIMETYPES_TEXT_URILIST, item);
}
/**
@@ -445,6 +437,9 @@
return mClipDescription;
}
+ /**
+ * Add a new Item to the overall ClipData container.
+ */
public void addItem(Item item) {
if (item == null) {
throw new NullPointerException("item is null");
@@ -452,15 +447,23 @@
mItems.add(item);
}
+ /** @hide */
public Bitmap getIcon() {
return mIcon;
}
+ /**
+ * Return the number of items in the clip data.
+ */
public int getItemCount() {
return mItems.size();
}
- public Item getItem(int index) {
+ /**
+ * Return a single item inside of the clip data. The index can range
+ * from 0 to {@link #getItemCount()}-1.
+ */
+ public Item getItemAt(int index) {
return mItems.get(index);
}
diff --git a/core/java/android/content/ClipboardManager.java b/core/java/android/content/ClipboardManager.java
index 3e2b763..a79f060 100644
--- a/core/java/android/content/ClipboardManager.java
+++ b/core/java/android/content/ClipboardManager.java
@@ -170,7 +170,7 @@
public CharSequence getText() {
ClipData clip = getPrimaryClip();
if (clip != null && clip.getItemCount() > 0) {
- return clip.getItem(0).coerceToText(mContext);
+ return clip.getItemAt(0).coerceToText(mContext);
}
return null;
}
@@ -181,7 +181,7 @@
* primary clip. It has no label or icon.
*/
public void setText(CharSequence text) {
- setPrimaryClip(ClipData.newPlainText(null, null, text));
+ setPrimaryClip(ClipData.newPlainText(null, text));
}
/**
diff --git a/core/java/android/content/CursorLoader.java b/core/java/android/content/CursorLoader.java
index 38ebaf2..6228bd0 100644
--- a/core/java/android/content/CursorLoader.java
+++ b/core/java/android/content/CursorLoader.java
@@ -26,6 +26,17 @@
/**
* A loader that queries the {@link ContentResolver} and returns a {@link Cursor}.
+ * This class implements the {@link Loader} protocol in a standard way for
+ * querying cursors, building on {@link AsyncTaskLoader} to perform the cursor
+ * query on a background thread so that it does not block the application's UI.
+ *
+ * <p>A CursorLoader must be built with the full information for the query to
+ * perform, either through the
+ * {@link #CursorLoader(Context, Uri, String[], String, String[], String)} or
+ * creating an empty instance with {@link #CursorLoader(Context)} and filling
+ * in the desired paramters with {@link #setUri(Uri)}, {@link #setSelection(String)},
+ * {@link #setSelectionArgs(String[])}, {@link #setSortOrder(String)},
+ * and {@link #setProjection(String[])}.
*/
public class CursorLoader extends AsyncTaskLoader<Cursor> {
final ForceLoadContentObserver mObserver;
@@ -81,6 +92,22 @@
}
}
+ /**
+ * Creates an empty unspecified CursorLoader. You must follow this with
+ * calls to {@link #setUri(Uri)}, {@link #setSelection(String)}, etc
+ * to specify the query to perform.
+ */
+ public CursorLoader(Context context) {
+ super(context);
+ mObserver = new ForceLoadContentObserver();
+ }
+
+ /**
+ * Creates a fully-specified CursorLoader. See
+ * {@link ContentResolver#query(Uri, String[], String, String[], String)
+ * ContentResolver.query()} for documentation on the meaning of the
+ * parameters. These will be passed as-is to that call.
+ */
public CursorLoader(Context context, Uri uri, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
super(context);
@@ -119,7 +146,7 @@
}
@Override
- public void onCancelled(Cursor cursor) {
+ public void onCanceled(Cursor cursor) {
if (cursor != null && !cursor.isClosed()) {
cursor.close();
}
diff --git a/core/java/android/content/XmlDocumentProvider.java b/core/java/android/content/XmlDocumentProvider.java
index 153ad38..76539c7 100644
--- a/core/java/android/content/XmlDocumentProvider.java
+++ b/core/java/android/content/XmlDocumentProvider.java
@@ -40,6 +40,8 @@
import java.util.regex.Pattern;
/**
+ * @hide -- not yet ready to support, should be provided just as a static lib.
+ *
* A read-only content provider which extracts data out of an XML document.
*
* <p>A XPath-like selection pattern is used to select some nodes in the XML document. Each such
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index e688c86..46f611f 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -149,7 +149,13 @@
* {@link android.R.attr#finishOnCloseSystemDialogs} attribute.
*/
public static final int FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS = 0x0100;
- /**
+ /**
+ * Value for {@link #flags}: true when the application's rendering should
+ * be hardware accelerated.
+ */
+ public static final int FLAG_HARDWARE_ACCELERATED = 0x0200;
+ /**
+ * @hide
* Bit in {@link #flags} corresponding to an immersive activity
* that wishes not to be interrupted by notifications.
* Applications that hide the system notification bar with
@@ -164,12 +170,7 @@
* "toast" window).
* {@see android.app.Notification#FLAG_HIGH_PRIORITY}
*/
- public static final int FLAG_IMMERSIVE = 0x0200;
- /**
- * Value for {@link #flags}: true when the application's rendering should
- * be hardware accelerated.
- */
- public static final int FLAG_HARDWARE_ACCELERATED = 0x0400;
+ public static final int FLAG_IMMERSIVE = 0x0400;
/**
* Options that have been set in the activity declaration in the
* manifest.
@@ -180,7 +181,7 @@
* {@link #FLAG_STATE_NOT_NEEDED}, {@link #FLAG_EXCLUDE_FROM_RECENTS},
* {@link #FLAG_ALLOW_TASK_REPARENTING}, {@link #FLAG_NO_HISTORY},
* {@link #FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS},
- * {@link #FLAG_IMMERSIVE}, {@link #FLAG_HARDWARE_ACCELERATED}
+ * {@link #FLAG_HARDWARE_ACCELERATED}
*/
public int flags;
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index ee3bdab..3883451 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -1045,9 +1045,7 @@
FragmentManager.POP_BACK_STACK_INCLUSIVE);
Fragment f = Fragment.instantiate(this, fragmentName, args);
FragmentTransaction transaction = getFragmentManager().beginTransaction();
- transaction.setTransition(direction == 0 ? FragmentTransaction.TRANSIT_NONE
- : direction > 0 ? FragmentTransaction.TRANSIT_FRAGMENT_NEXT
- : FragmentTransaction.TRANSIT_FRAGMENT_PREV);
+ transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
transaction.replace(com.android.internal.R.id.prefs, f);
transaction.commit();
}
@@ -1142,7 +1140,7 @@
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
transaction.addToBackStack(BACK_STACK_PREFS);
} else {
- transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_NEXT);
+ transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
}
transaction.commit();
}
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 24165aa..8f25311 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -796,18 +796,21 @@
if (this.value != null) {
final Bitmap b = (Bitmap) this.value;
final Bitmap.Config c = b.getConfig();
+ // If we don't know, be pessimistic and assume 4
int bpp = 4;
- switch (c) {
- case ALPHA_8:
- bpp = 1;
- break;
- case RGB_565:
- case ARGB_4444:
- bpp = 2;
- break;
- case ARGB_8888:
- bpp = 4;
- break;
+ if (c != null) {
+ switch (c) {
+ case ALPHA_8:
+ bpp = 1;
+ break;
+ case RGB_565:
+ case ARGB_4444:
+ bpp = 2;
+ break;
+ case ARGB_8888:
+ bpp = 4;
+ break;
+ }
}
counter.bitmapIncrement(b.getWidth() * b.getHeight() * bpp);
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 623cd41..de886d8 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7942,7 +7942,7 @@
for (int i=0; i<urls.length; i++) {
Uri uri = Uri.parse(urls[0].getURL());
if (clip == null) {
- clip = ClipData.newRawUri(null, null, uri);
+ clip = ClipData.newRawUri(null, uri);
} else {
clip.addItem(new ClipData.Item(uri));
}
@@ -7976,15 +7976,13 @@
return true;
case ID_CUT:
- setPrimaryClip(ClipData.newPlainText(null, null,
- mTransformed.subSequence(min, max)));
+ setPrimaryClip(ClipData.newPlainText(null, mTransformed.subSequence(min, max)));
((Editable) mText).delete(min, max);
stopSelectionActionMode();
return true;
case ID_COPY:
- setPrimaryClip(ClipData.newPlainText(null, null,
- mTransformed.subSequence(min, max)));
+ setPrimaryClip(ClipData.newPlainText(null, mTransformed.subSequence(min, max)));
stopSelectionActionMode();
return true;
}
@@ -8105,7 +8103,7 @@
final int start = getSelectionStart();
final int end = getSelectionEnd();
CharSequence selectedText = mTransformed.subSequence(start, end);
- ClipData data = ClipData.newPlainText(null, null, selectedText);
+ ClipData data = ClipData.newPlainText(null, selectedText);
DragLocalState localState = new DragLocalState(this, start, end);
startDrag(data, getTextThumbnailBuilder(selectedText), localState, 0);
stopSelectionActionMode();
@@ -8257,7 +8255,7 @@
if (clip != null) {
boolean didfirst = false;
for (int i=0; i<clip.getItemCount(); i++) {
- CharSequence paste = clip.getItem(i).coerceToText(getContext());
+ CharSequence paste = clip.getItemAt(i).coerceToText(getContext());
if (paste != null) {
if (!didfirst) {
long minMax = prepareSpacesAroundPaste(min, max, paste);
@@ -9300,7 +9298,7 @@
ClipData clipData = event.getClipData();
final int itemCount = clipData.getItemCount();
for (int i=0; i < itemCount; i++) {
- Item item = clipData.getItem(i);
+ Item item = clipData.getItemAt(i);
content.append(item.coerceToText(TextView.this.mContext));
}
diff --git a/core/java/com/android/internal/widget/WaveView.java b/core/java/com/android/internal/widget/WaveView.java
index 4cb3966..c7a90c4 100644
--- a/core/java/com/android/internal/widget/WaveView.java
+++ b/core/java/com/android/internal/widget/WaveView.java
@@ -152,7 +152,6 @@
mUnlockRing.setScaleX(0.1f);
mUnlockRing.setScaleY(0.1f);
mUnlockRing.setAlpha(0.0f);
-
mDrawables.add(mUnlockRing);
mUnlockDefault = new DrawableHolder(createDrawable(R.drawable.unlock_default));
@@ -192,7 +191,6 @@
if (DBG) Log.v(TAG, "State RESET_LOCK");
mWaveTimerDelay = WAVE_DELAY;
for (int i = 0; i < mLightWaves.size(); i++) {
- //TweenMax.to(mLightWave.get(i), .3, {alpha:0, ease:Quint.easeOut});
DrawableHolder holder = mLightWaves.get(i);
holder.addAnimTo(300, 0, "alpha", 0.0f, false);
}
@@ -200,16 +198,12 @@
mLightWaves.get(i).startAnimations(this);
}
- //TweenMax.to(unlockRing, .5, { x: lockX, y: lockY, scaleX: .1, scaleY: .1,
- // alpha: 0, overwrite: true, ease:Quint.easeOut });
mUnlockRing.addAnimTo(DURATION, 0, "x", mLockCenterX, true);
mUnlockRing.addAnimTo(DURATION, 0, "y", mLockCenterY, true);
mUnlockRing.addAnimTo(DURATION, 0, "scaleX", 0.1f, true);
mUnlockRing.addAnimTo(DURATION, 0, "scaleY", 0.1f, true);
mUnlockRing.addAnimTo(DURATION, 0, "alpha", 0.0f, true);
- //TweenMax.to(unlockDefault, 0, { x: lockX, y: lockY, scaleX: .1, scaleY: .1,
- // alpha: 0 , overwrite: true });
mUnlockDefault.removeAnimationFor("x");
mUnlockDefault.removeAnimationFor("y");
mUnlockDefault.removeAnimationFor("scaleX");
@@ -220,15 +214,10 @@
mUnlockDefault.setScaleX(0.1f);
mUnlockDefault.setScaleY(0.1f);
mUnlockDefault.setAlpha(0.0f);
-
- //TweenMax.to(unlockDefault, .5, { delay: .1, scaleX: 1, scaleY: 1,
- // alpha: 1, overwrite: true, ease:Quint.easeOut });
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "scaleX", 1.0f, true);
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "scaleY", 1.0f, true);
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "alpha", 1.0f, true);
- //TweenMax.to(unlockHalo, 0, { x: lockX, y: lockY, scaleX:.1, scaleY: .1,
- // alpha: 0 , overwrite: true });
mUnlockHalo.removeAnimationFor("x");
mUnlockHalo.removeAnimationFor("y");
mUnlockHalo.removeAnimationFor("scaleX");
@@ -239,16 +228,12 @@
mUnlockHalo.setScaleX(0.1f);
mUnlockHalo.setScaleY(0.1f);
mUnlockHalo.setAlpha(0.0f);
-
- //TweenMax.to(unlockHalo, .5, { x: lockX, y: lockY, scaleX: 1, scaleY: 1,
- // alpha: 1 , overwrite: true, ease:Quint.easeOut });
mUnlockHalo.addAnimTo(DURATION, SHORT_DELAY, "x", mLockCenterX, true);
mUnlockHalo.addAnimTo(DURATION, SHORT_DELAY, "y", mLockCenterY, true);
mUnlockHalo.addAnimTo(DURATION, SHORT_DELAY, "scaleX", 1.0f, true);
mUnlockHalo.addAnimTo(DURATION, SHORT_DELAY, "scaleY", 1.0f, true);
mUnlockHalo.addAnimTo(DURATION, SHORT_DELAY, "alpha", 1.0f, true);
- //lockTimer.stop();
removeCallbacks(mLockTimerActions);
mLockState = STATE_READY;
@@ -260,8 +245,6 @@
case STATE_START_ATTEMPT:
if (DBG) Log.v(TAG, "State START_ATTEMPT");
- //TweenMax.to(unlockDefault, 0, {scaleX: .1, scaleY:.1, alpha: 0,
- // x:lockX +182, y: lockY , overwrite: true });
mUnlockDefault.removeAnimationFor("x");
mUnlockDefault.removeAnimationFor("y");
mUnlockDefault.removeAnimationFor("scaleX");
@@ -273,14 +256,10 @@
mUnlockDefault.setScaleY(0.1f);
mUnlockDefault.setAlpha(0.0f);
- //TweenMax.to(unlockDefault, 0.5, { delay: .1 , scaleX: 1, scaleY: 1,
- // alpha: 1, ease:Quint.easeOut });
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "scaleX", 1.0f, false);
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "scaleY", 1.0f, false);
mUnlockDefault.addAnimTo(DURATION, SHORT_DELAY, "alpha", 1.0f, false);
- //TweenMax.to(unlockRing, 0.5, {scaleX: 1, scaleY: 1,
- // alpha: 1, ease:Quint.easeOut, overwrite: true });
mUnlockRing.addAnimTo(DURATION, 0, "scaleX", 1.0f, true);
mUnlockRing.addAnimTo(DURATION, 0, "scaleY", 1.0f, true);
mUnlockRing.addAnimTo(DURATION, 0, "alpha", 1.0f, true);
@@ -292,12 +271,8 @@
case STATE_ATTEMPTING:
if (DBG) Log.v(TAG, "State ATTEMPTING (fingerDown = " + fingerDown + ")");
- //TweenMax.to(unlockHalo, 0.4, { x:mouseX, y:mouseY, scaleX:1, scaleY:1,
- // alpha: 1, ease:Quint.easeOut });
if (dragDistance > mSnapRadius) {
if (fingerDown) {
- //TweenMax.to(unlockHalo, 0.4, {x:ringX, y:ringY, scaleX:1, scaleY:1,
- // alpha: 1 , ease:Quint.easeOut , overwrite: true });
mUnlockHalo.addAnimTo(0, 0, "x", ringX, true);
mUnlockHalo.addAnimTo(0, 0, "y", ringY, true);
mUnlockHalo.addAnimTo(0, 0, "scaleX", 1.0f, true);
@@ -320,8 +295,6 @@
if (DBG) Log.v(TAG, "State UNLOCK_ATTEMPT");
if (dragDistance > mSnapRadius) {
for (int n = 0; n < mLightWaves.size(); n++) {
- //TweenMax.to(this["lightWave"+n], .5,{alpha:0, delay: (6+n-currentWave)*.1,
- // x:ringX, y:ringY, scaleX: .1, scaleY: .1, ease:Quint.easeOut});
DrawableHolder wave = mLightWaves.get(n);
long delay = 1000L*(6 + n - mCurrentWave)/10L;
wave.addAnimTo(FINAL_DURATION, delay, "x", ringX, true);
@@ -334,19 +307,14 @@
mLightWaves.get(i).startAnimations(this);
}
- //TweenMax.to(unlockRing, .5, {x:ringX, y: ringY, scaleX: .1, scaleY: .1,
- // alpha: 0, ease: Quint.easeOut });
mUnlockRing.addAnimTo(FINAL_DURATION, 0, "x", ringX, false);
mUnlockRing.addAnimTo(FINAL_DURATION, 0, "y", ringY, false);
mUnlockRing.addAnimTo(FINAL_DURATION, 0, "scaleX", 0.1f, false);
mUnlockRing.addAnimTo(FINAL_DURATION, 0, "scaleY", 0.1f, false);
mUnlockRing.addAnimTo(FINAL_DURATION, 0, "alpha", 0.0f, false);
- //TweenMax.to(unlockRing, .5, { delay: 1.3, alpha: 0 , ease: Quint.easeOut });
mUnlockRing.addAnimTo(FINAL_DURATION, FINAL_DELAY, "alpha", 0.0f, false);
- //TweenMax.to(unlockDefault, 0, { x:ringX, y: ringY, scaleX: .1, scaleY: .1,
- // alpha: 0 , overwrite: true });
mUnlockDefault.removeAnimationFor("x");
mUnlockDefault.removeAnimationFor("y");
mUnlockDefault.removeAnimationFor("scaleX");
@@ -358,26 +326,19 @@
mUnlockDefault.setScaleY(0.1f);
mUnlockDefault.setAlpha(0.0f);
- //TweenMax.to(unlockDefault, .5, { x:ringX, y: ringY, scaleX: 1, scaleY: 1,
- // alpha: 1 , ease: Quint.easeOut , overwrite: true });
mUnlockDefault.addAnimTo(FINAL_DURATION, 0, "x", ringX, true);
mUnlockDefault.addAnimTo(FINAL_DURATION, 0, "y", ringY, true);
mUnlockDefault.addAnimTo(FINAL_DURATION, 0, "scaleX", 1.0f, true);
mUnlockDefault.addAnimTo(FINAL_DURATION, 0, "scaleY", 1.0f, true);
mUnlockDefault.addAnimTo(FINAL_DURATION, 0, "alpha", 1.0f, true);
- //TweenMax.to(unlockDefault, .5, { delay: 1.3, scaleX: 3, scaleY: 3,
- // alpha: 1, ease: Quint.easeOut });
mUnlockDefault.addAnimTo(FINAL_DURATION, FINAL_DELAY, "scaleX", 3.0f, false);
mUnlockDefault.addAnimTo(FINAL_DURATION, FINAL_DELAY, "scaleY", 3.0f, false);
mUnlockDefault.addAnimTo(FINAL_DURATION, FINAL_DELAY, "alpha", 0.0f, false);
- //TweenMax.to(unlockHalo, .5, { x:ringX, y: ringY , ease: Back.easeOut });
mUnlockHalo.addAnimTo(FINAL_DURATION, 0, "x", ringX, false);
mUnlockHalo.addAnimTo(FINAL_DURATION, 0, "y", ringY, false);
- //TweenMax.to(unlockHalo, .5, { delay: 1.3, scaleX: 3, scaleY: 3,
- // alpha: 1, ease: Quint.easeOut });
mUnlockHalo.addAnimTo(FINAL_DURATION, FINAL_DELAY, "scaleX", 3.0f, false);
mUnlockHalo.addAnimTo(FINAL_DURATION, FINAL_DELAY, "scaleY", 3.0f, false);
mUnlockHalo.addAnimTo(FINAL_DURATION, FINAL_DELAY, "alpha", 0.0f, false);
@@ -429,10 +390,12 @@
if (DBG) Log.v(TAG, "LockTimerActions");
// reset lock after inactivity
if (mLockState == STATE_ATTEMPTING) {
+ if (DBG) Log.v(TAG, "Timer resets to STATE_RESET_LOCK");
mLockState = STATE_RESET_LOCK;
}
// for prototype, reset after successful unlock
if (mLockState == STATE_UNLOCK_SUCCESS) {
+ if (DBG) Log.v(TAG, "Timer resets to STATE_RESET_LOCK after success");
mLockState = STATE_RESET_LOCK;
}
invalidate();
@@ -455,16 +418,12 @@
wave.setX(mMouseX);
wave.setY(mMouseY);
- //TweenMax.to(this["lightWave"+currentWave], 2, { x:lockX , y:lockY, alpha: 1.5,
- // scaleX: 1, scaleY:1, ease:Cubic.easeOut});
wave.addAnimTo(WAVE_DURATION, 0, "x", mLockCenterX, true);
wave.addAnimTo(WAVE_DURATION, 0, "y", mLockCenterY, true);
wave.addAnimTo(WAVE_DURATION*2/3, 0, "alpha", 1.0f, true);
wave.addAnimTo(WAVE_DURATION, 0, "scaleX", 1.0f, true);
wave.addAnimTo(WAVE_DURATION, 0, "scaleY", 1.0f, true);
- //TweenMax.to(this["lightWave"+currentWave], 1, { delay: 1.3
- // , alpha: 0 , ease:Quint.easeOut});
wave.addAnimTo(1000, RING_DELAY, "alpha", 0.0f, false);
wave.startAnimations(WaveView.this);
@@ -603,6 +562,8 @@
}
public void reset() {
+ if (DBG) Log.v(TAG, "reset() : resets state to STATE_RESET_LOCK");
mLockState = STATE_RESET_LOCK;
+ invalidate();
}
}
diff --git a/core/res/res/animator/fragment_next_enter.xml b/core/res/res/animator/fragment_fade_enter.xml
similarity index 100%
rename from core/res/res/animator/fragment_next_enter.xml
rename to core/res/res/animator/fragment_fade_enter.xml
diff --git a/core/res/res/animator/fragment_next_exit.xml b/core/res/res/animator/fragment_fade_exit.xml
similarity index 100%
rename from core/res/res/animator/fragment_next_exit.xml
rename to core/res/res/animator/fragment_fade_exit.xml
diff --git a/core/res/res/animator/fragment_prev_enter.xml b/core/res/res/animator/fragment_prev_enter.xml
deleted file mode 100644
index 13b15f3..0000000
--- a/core/res/res/animator/fragment_prev_enter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:zAdjustment="top">
- <objectAnimator
- android:interpolator="@interpolator/decelerate_cubic"
- android:valueFrom="0"
- android:valueTo="1"
- android:valueType="floatType"
- android:propertyName="alpha"
- android:duration="@android:integer/config_activityDefaultDur"/>
-</set>
\ No newline at end of file
diff --git a/core/res/res/animator/fragment_prev_exit.xml b/core/res/res/animator/fragment_prev_exit.xml
deleted file mode 100644
index 503b7ad..0000000
--- a/core/res/res/animator/fragment_prev_exit.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:zAdjustment="normal">
- <objectAnimator
- android:interpolator="@interpolator/decelerate_cubic"
- android:valueFrom="1"
- android:valueTo="0"
- android:valueType="floatType"
- android:propertyName="alpha"
- android:duration="@android:integer/config_activityShortDur"/>
-</set>
\ No newline at end of file
diff --git a/core/res/res/drawable-mdpi/pointer_arrow.png b/core/res/res/drawable-mdpi/pointer_arrow.png
index e01129c..fbd187c 100644
--- a/core/res/res/drawable-mdpi/pointer_arrow.png
+++ b/core/res/res/drawable-mdpi/pointer_arrow.png
Binary files differ
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 19e2b8d..6ca42e3 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1379,10 +1379,8 @@
<attr name="fragmentOpenExitAnimation" format="reference" />
<attr name="fragmentCloseEnterAnimation" format="reference" />
<attr name="fragmentCloseExitAnimation" format="reference" />
- <attr name="fragmentNextEnterAnimation" format="reference" />
- <attr name="fragmentNextExitAnimation" format="reference" />
- <attr name="fragmentPrevEnterAnimation" format="reference" />
- <attr name="fragmentPrevExitAnimation" format="reference" />
+ <attr name="fragmentFadeEnterAnimation" format="reference" />
+ <attr name="fragmentFadeExitAnimation" format="reference" />
</declare-styleable>
<!-- Window animation class attributes. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 3ad29c4..eabd457 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1311,10 +1311,8 @@
<public type="attr" name="fragmentOpenExitAnimation" />
<public type="attr" name="fragmentCloseEnterAnimation" />
<public type="attr" name="fragmentCloseExitAnimation" />
- <public type="attr" name="fragmentNextEnterAnimation" />
- <public type="attr" name="fragmentNextExitAnimation" />
- <public type="attr" name="fragmentPrevEnterAnimation" />
- <public type="attr" name="fragmentPrevExitAnimation" />
+ <public type="attr" name="fragmentFadeEnterAnimation" />
+ <public type="attr" name="fragmentFadeExitAnimation" />
<public type="attr" name="actionBarSize" />
<public type="attr" name="imeSubtypeLocale" />
<public type="attr" name="imeSubtypeMode" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index a366047..16c80d0 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -85,10 +85,8 @@
<item name="fragmentOpenExitAnimation">@animator/fragment_open_exit</item>
<item name="fragmentCloseEnterAnimation">@animator/fragment_close_enter</item>
<item name="fragmentCloseExitAnimation">@animator/fragment_close_exit</item>
- <item name="fragmentNextEnterAnimation">@animator/fragment_next_enter</item>
- <item name="fragmentNextExitAnimation">@animator/fragment_next_exit</item>
- <item name="fragmentPrevEnterAnimation">@animator/fragment_prev_enter</item>
- <item name="fragmentPrevExitAnimation">@animator/fragment_prev_exit</item>
+ <item name="fragmentFadeEnterAnimation">@animator/fragment_fade_enter</item>
+ <item name="fragmentFadeExitAnimation">@animator/fragment_fade_exit</item>
</style>
<!-- Standard animations for a non-full-screen window or activity. -->
diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd
index 045a1e8..0972805 100644
--- a/docs/html/guide/topics/fundamentals/fragments.jd
+++ b/docs/html/guide/topics/fundamentals/fragments.jd
@@ -319,7 +319,7 @@
<pre>
FragmentManager fragmentManager = {@link android.app.Activity#getFragmentManager()}
-FragmentTransaction fragmentTransaction = fragmentManager.{@link android.app.FragmentManager#openTransaction()};
+FragmentTransaction fragmentTransaction = fragmentManager.{@link android.app.FragmentManager#beginTransaction()};
</pre>
<p>You can then add a fragment using the {@link
@@ -406,7 +406,7 @@
<pre>
FragmentManager fragmentManager = {@link android.app.Activity#getFragmentManager()};
-FragmentTransaction fragmentTransaction = fragmentManager.{@link android.app.FragmentManager#openTransaction()};
+FragmentTransaction fragmentTransaction = fragmentManager.{@link android.app.FragmentManager#beginTransaction()};
</pre>
<p>Each transaction is a set of changes that you want to perform at the same time. You can set
@@ -428,7 +428,7 @@
<pre>
// Create new fragment and transaction
Fragment newFragment = new ExampleFragment();
-FragmentTransaction transaction = getFragmentManager().openTransaction();
+FragmentTransaction transaction = getFragmentManager().beginTransaction();
// Replace whatever is in the fragment_container view with this fragment,
// and add the transaction to the back stack
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
index e864577..a67f915 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
@@ -120,7 +120,7 @@
mAltText.setVisibility(View.VISIBLE);
if (mClipping.getItemCount() > 0) {
// TODO: figure out how to visualize every kind of ClipData!
- mAltText.setText(mClipping.getItem(0).coerceToText(getContext()));
+ mAltText.setText(mClipping.getItemAt(0).coerceToText(getContext()));
}
}
}
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
index 70a4b20..32c016d 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
@@ -114,14 +114,12 @@
lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN;
lp.windowAnimations = com.android.internal.R.style.Animation_LockScreen;
- if (mContext.getResources().getBoolean(R.bool.config_enableLockScreenRotation)) {
- Log.d(TAG, "Rotation sensor for lock screen On!");
- lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
- } else {
- Log.d(TAG, "Rotation sensor for lock screen Off!");
- lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
- }
-
+ // TODO: Sometimes we get the wrong value for the sensor resource we use to configure
+ // this. However, the current UI design has LockScreen always respond to orientation so
+ // we don't need this for the time-being.
+ //
+ // For reference, the configuration variable is R.bool.config_enableLockScreenRotation
+ lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
lp.setTitle("Keyguard");
mWindowLayoutParams = lp;
diff --git a/services/input/PointerController.cpp b/services/input/PointerController.cpp
index ebc58ee..92af51e 100644
--- a/services/input/PointerController.cpp
+++ b/services/input/PointerController.cpp
@@ -310,8 +310,16 @@
void PointerController::setPointerIcon(const SkBitmap* bitmap, float hotSpotX, float hotSpotY) {
AutoMutex _l(mLock);
- delete mLocked.iconBitmap;
- mLocked.iconBitmap = bitmap ? new SkBitmap(*bitmap) : NULL;
+ if (mLocked.iconBitmap) {
+ delete mLocked.iconBitmap;
+ mLocked.iconBitmap = NULL;
+ }
+
+ if (bitmap) {
+ mLocked.iconBitmap = new SkBitmap();
+ bitmap->copyTo(mLocked.iconBitmap, SkBitmap::kARGB_8888_Config);
+ }
+
mLocked.iconHotSpotX = hotSpotX;
mLocked.iconHotSpotY = hotSpotY;
mLocked.drawn = false;
diff --git a/services/java/com/android/server/ClipboardService.java b/services/java/com/android/server/ClipboardService.java
index bec35d1..062ab74 100644
--- a/services/java/com/android/server/ClipboardService.java
+++ b/services/java/com/android/server/ClipboardService.java
@@ -140,7 +140,7 @@
public boolean hasClipboardText() {
synchronized (this) {
if (mPrimaryClip != null) {
- CharSequence text = mPrimaryClip.getItem(0).getText();
+ CharSequence text = mPrimaryClip.getItemAt(0).getText();
return text != null && text.length() > 0;
}
return false;
@@ -175,7 +175,7 @@
private final void checkDataOwnerLocked(ClipData data, int uid) {
final int N = data.getItemCount();
for (int i=0; i<N; i++) {
- checkItemOwnerLocked(data.getItem(i), uid);
+ checkItemOwnerLocked(data.getItemAt(i), uid);
}
}
@@ -214,7 +214,7 @@
if (mPrimaryClip != null && !mActivePermissionOwners.contains(pkg)) {
final int N = mPrimaryClip.getItemCount();
for (int i=0; i<N; i++) {
- grantItemLocked(mPrimaryClip.getItem(i), pkg);
+ grantItemLocked(mPrimaryClip.getItemAt(i), pkg);
}
mActivePermissionOwners.add(pkg);
}
@@ -249,7 +249,7 @@
}
final int N = mPrimaryClip.getItemCount();
for (int i=0; i<N; i++) {
- revokeItemLocked(mPrimaryClip.getItem(i));
+ revokeItemLocked(mPrimaryClip.getItemAt(i));
}
}
}
