Some new API cleanup.

- Tweak Fragment docs to match new sample code.
- Make some new attributes public.
- Hide all of the XmlAdapter stuff, since it is not actually being used.

Change-Id: Iae2062f91d1ca0c6b1d656ae948417d3d048482f

9 files changed, 287 insertions, 529 deletions

diff --git a/api/current.xml b/api/current.xml
index 7ac7dfa..94efafe 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -1828,7 +1828,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843513"
+ value="16843501"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1839,7 +1839,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843482"
+ value="16843470"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1850,7 +1850,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843522"
+ value="16843510"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1861,7 +1861,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843521"
+ value="16843509"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1872,7 +1872,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843523"
+ value="16843511"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1883,7 +1883,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843492"
+ value="16843480"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1894,7 +1894,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843491"
+ value="16843479"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1905,7 +1905,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843529"
+ value="16843517"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1916,7 +1916,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843495"
+ value="16843483"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1927,7 +1927,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843525"
+ value="16843513"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1938,7 +1938,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843496"
+ value="16843484"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1949,7 +1949,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843552"
+ value="16843540"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1960,7 +1960,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843551"
+ value="16843539"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1971,7 +1971,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843553"
+ value="16843541"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1982,7 +1982,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843524"
+ value="16843512"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -1993,7 +1993,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843530"
+ value="16843518"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2004,7 +2004,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843531"
+ value="16843519"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2055,17 +2055,6 @@
  visibility="public"
 >
 </field>
-<field name="adapter"
- type="int"
- transient="false"
- volatile="false"
- value="16843468"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="addStatesFromChildren"
  type="int"
  transient="false"
@@ -2103,7 +2092,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843543"
+ value="16843531"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2114,7 +2103,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843480"
+ value="16843468"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2147,7 +2136,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843584"
+ value="16843572"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2180,7 +2169,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843565"
+ value="16843553"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2235,7 +2224,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843489"
+ value="16843477"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2246,7 +2235,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843520"
+ value="16843508"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2312,7 +2301,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843560"
+ value="16843548"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2352,17 +2341,6 @@
  visibility="public"
 >
 </field>
-<field name="as"
- type="int"
- transient="false"
- volatile="false"
- value="16843474"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="author"
  type="int"
  transient="false"
@@ -2389,7 +2367,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843549"
+ value="16843537"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2499,7 +2477,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843562"
+ value="16843550"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2543,7 +2521,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843577"
+ value="16843565"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2631,7 +2609,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843538"
+ value="16843526"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2642,7 +2620,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843537"
+ value="16843525"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2675,7 +2653,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843581"
+ value="16843569"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2686,7 +2664,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843580"
+ value="16843568"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2752,7 +2730,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843610"
+ value="16843598"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3111,17 +3089,6 @@
  visibility="public"
 >
 </field>
-<field name="column"
- type="int"
- transient="false"
- volatile="false"
- value="16843477"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="columnDelay"
  type="int"
  transient="false"
@@ -3269,7 +3236,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843486"
+ value="16843474"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3280,7 +3247,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843593"
+ value="16843581"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3335,7 +3302,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843607"
+ value="16843595"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3441,6 +3408,17 @@
  visibility="public"
 >
 </field>
+<field name="detailsElementBackground"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843600"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="dial"
  type="int"
  transient="false"
@@ -3500,7 +3478,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843542"
+ value="16843530"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3577,7 +3555,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843484"
+ value="16843472"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3621,7 +3599,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843578"
+ value="16843566"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3632,7 +3610,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843576"
+ value="16843564"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3643,7 +3621,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843544"
+ value="16843532"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3819,7 +3797,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843490"
+ value="16843478"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3870,6 +3848,28 @@
  visibility="public"
 >
 </field>
+<field name="editTextBackground"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843604"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="editTextColor"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843603"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="editTextPreferenceStyle"
  type="int"
  transient="false"
@@ -3973,7 +3973,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843546"
+ value="16843534"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4028,7 +4028,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843547"
+ value="16843535"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4226,7 +4226,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843587"
+ value="16843575"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4248,7 +4248,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843592"
+ value="16843580"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4259,7 +4259,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843589"
+ value="16843577"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4270,7 +4270,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843590"
+ value="16843578"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4281,7 +4281,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843588"
+ value="16843576"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4292,7 +4292,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843591"
+ value="16843579"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4391,7 +4391,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843595"
+ value="16843583"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4446,7 +4446,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843601"
+ value="16843589"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4501,7 +4501,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843503"
+ value="16843491"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4512,7 +4512,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843507"
+ value="16843495"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4523,7 +4523,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843508"
+ value="16843496"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4534,7 +4534,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843509"
+ value="16843497"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4545,7 +4545,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843510"
+ value="16843498"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4556,7 +4556,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843505"
+ value="16843493"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4567,7 +4567,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843506"
+ value="16843494"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4578,7 +4578,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843511"
+ value="16843499"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4589,7 +4589,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843512"
+ value="16843500"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4607,17 +4607,6 @@
  visibility="public"
 >
 </field>
-<field name="from"
- type="int"
- transient="false"
- volatile="false"
- value="16843472"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="fromAlpha"
  type="int"
  transient="false"
@@ -4640,17 +4629,6 @@
  visibility="public"
 >
 </field>
-<field name="fromValue"
- type="int"
- transient="false"
- volatile="false"
- value="16843475"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="fromXDelta"
  type="int"
  transient="false"
@@ -4941,7 +4919,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843487"
+ value="16843475"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5007,7 +4985,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843545"
+ value="16843533"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5018,7 +4996,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843563"
+ value="16843551"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5047,6 +5025,17 @@
  visibility="public"
 >
 </field>
+<field name="horizontalScrollViewStyle"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843605"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="horizontalSpacing"
  type="int"
  transient="false"
@@ -5095,7 +5084,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843528"
+ value="16843516"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5216,7 +5205,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843516"
+ value="16843504"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5227,7 +5216,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843514"
+ value="16843502"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5238,7 +5227,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843515"
+ value="16843503"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5348,7 +5337,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843558"
+ value="16843546"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5524,7 +5513,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843585"
+ value="16843573"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -5623,7 +5612,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843579"
+ value="16843567"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6294,7 +6283,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843518"
+ value="16843506"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6338,7 +6327,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843539"
+ value="16843527"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6349,7 +6338,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843533"
+ value="16843521"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6437,7 +6426,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843541"
+ value="16843529"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6492,7 +6481,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843598"
+ value="16843586"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6613,7 +6602,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843488"
+ value="16843476"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6646,7 +6635,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843597"
+ value="16843585"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6767,7 +6756,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843483"
+ value="16843471"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6800,7 +6789,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843594"
+ value="16843582"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6932,7 +6921,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843564"
+ value="16843552"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -6965,7 +6954,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843502"
+ value="16843490"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7328,7 +7317,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843534"
+ value="16843522"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7427,7 +7416,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843494"
+ value="16843482"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7482,7 +7471,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843559"
+ value="16843547"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7603,7 +7592,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843501"
+ value="16843489"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7955,7 +7944,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843572"
+ value="16843560"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7966,7 +7955,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843573"
+ value="16843561"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -7977,7 +7966,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843574"
+ value="16843562"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8076,7 +8065,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843570"
+ value="16843558"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8087,7 +8076,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843571"
+ value="16843559"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8439,7 +8428,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843582"
+ value="16843570"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8472,7 +8461,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843548"
+ value="16843536"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8483,7 +8472,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843605"
+ value="16843593"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8494,18 +8483,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843600"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="selection"
- type="int"
- transient="false"
- volatile="false"
- value="16843469"
+ value="16843588"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8626,7 +8604,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843493"
+ value="16843481"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8648,7 +8626,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843575"
+ value="16843563"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8670,7 +8648,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843596"
+ value="16843584"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8681,7 +8659,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843599"
+ value="16843587"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8747,18 +8725,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843608"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="sortOrder"
- type="int"
- transient="false"
- volatile="false"
- value="16843470"
+ value="16843596"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8813,7 +8780,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843519"
+ value="16843507"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8835,7 +8802,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843609"
+ value="16843597"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8846,7 +8813,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843517"
+ value="16843505"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8945,7 +8912,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843561"
+ value="16843549"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -8956,7 +8923,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843532"
+ value="16843520"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9088,7 +9055,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843611"
+ value="16843599"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9143,7 +9110,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843583"
+ value="16843571"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9198,7 +9165,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843485"
+ value="16843473"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9209,7 +9176,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843527"
+ value="16843515"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9594,7 +9561,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843535"
+ value="16843523"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9671,7 +9638,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843536"
+ value="16843524"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9715,7 +9682,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843540"
+ value="16843528"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9733,6 +9700,17 @@
  visibility="public"
 >
 </field>
+<field name="textColorHighlightInverse"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843601"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="textColorHint"
  type="int"
  transient="false"
@@ -9766,6 +9744,17 @@
  visibility="public"
 >
 </field>
+<field name="textColorLinkInverse"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843602"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="textColorPrimary"
  type="int"
  transient="false"
@@ -9902,7 +9891,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843555"
+ value="16843543"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9913,7 +9902,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843554"
+ value="16843542"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -9935,7 +9924,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843556"
+ value="16843544"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10166,18 +10155,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843526"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="to"
- type="int"
- transient="false"
- volatile="false"
- value="16843473"
+ value="16843514"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10206,17 +10184,6 @@
  visibility="public"
 >
 </field>
-<field name="toValue"
- type="int"
- transient="false"
- volatile="false"
- value="16843476"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="toXDelta"
  type="int"
  transient="false"
@@ -10342,7 +10309,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843566"
+ value="16843554"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10353,7 +10320,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843567"
+ value="16843555"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10364,7 +10331,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843568"
+ value="16843556"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10375,7 +10342,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843569"
+ value="16843557"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10419,7 +10386,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843602"
+ value="16843590"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10448,22 +10415,11 @@
  visibility="public"
 >
 </field>
-<field name="uri"
- type="int"
- transient="false"
- volatile="false"
- value="16843471"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="useIntrinsicSizeAsMinimum"
  type="int"
  transient="false"
  volatile="false"
- value="16843550"
+ value="16843538"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10507,7 +10463,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843498"
+ value="16843486"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10518,7 +10474,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843499"
+ value="16843487"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10529,7 +10485,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843500"
+ value="16843488"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10606,7 +10562,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843586"
+ value="16843574"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10826,7 +10782,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843606"
+ value="16843594"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10837,7 +10793,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843603"
+ value="16843591"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10848,7 +10804,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843604"
+ value="16843592"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10892,7 +10848,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843481"
+ value="16843469"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10903,7 +10859,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843504"
+ value="16843492"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10914,7 +10870,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843497"
+ value="16843485"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -10969,7 +10925,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843557"
+ value="16843545"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -11141,28 +11097,6 @@
  visibility="public"
 >
 </field>
-<field name="withClass"
- type="int"
- transient="false"
- volatile="false"
- value="16843479"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="withExpression"
- type="int"
- transient="false"
- volatile="false"
- value="16843478"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="writePermission"
  type="int"
  transient="false"
@@ -232636,195 +232570,6 @@
 >
 </method>
 </class>
-<class name="Adapters"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="Adapters"
- type="android.widget.Adapters"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="loadAdapter"
- return="android.widget.BaseAdapter"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="id" type="int">
-</parameter>
-<parameter name="parameters" type="java.lang.Object...">
-</parameter>
-</method>
-<method name="loadCursorAdapter"
- return="android.widget.CursorAdapter"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="id" type="int">
-</parameter>
-<parameter name="uri" type="java.lang.String">
-</parameter>
-<parameter name="parameters" type="java.lang.Object...">
-</parameter>
-</method>
-<method name="loadCursorAdapter"
- return="android.widget.CursorAdapter"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="id" type="int">
-</parameter>
-<parameter name="cursor" type="android.database.Cursor">
-</parameter>
-<parameter name="parameters" type="java.lang.Object...">
-</parameter>
-</method>
-</class>
-<class name="Adapters.CursorBinder"
- extends="java.lang.Object"
- abstract="true"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="Adapters.CursorBinder"
- type="android.widget.Adapters.CursorBinder"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="transformation" type="android.widget.Adapters.CursorTransformation">
-</parameter>
-</constructor>
-<method name="bind"
- return="boolean"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="view" type="android.view.View">
-</parameter>
-<parameter name="cursor" type="android.database.Cursor">
-</parameter>
-<parameter name="columnIndex" type="int">
-</parameter>
-</method>
-<field name="mContext"
- type="android.content.Context"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
-<field name="mTransformation"
- type="android.widget.Adapters.CursorTransformation"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
-</class>
-<class name="Adapters.CursorTransformation"
- extends="java.lang.Object"
- abstract="true"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="Adapters.CursorTransformation"
- type="android.widget.Adapters.CursorTransformation"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-</constructor>
-<method name="transform"
- return="java.lang.String"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="cursor" type="android.database.Cursor">
-</parameter>
-<parameter name="columnIndex" type="int">
-</parameter>
-</method>
-<method name="transformToResource"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="cursor" type="android.database.Cursor">
-</parameter>
-<parameter name="columnIndex" type="int">
-</parameter>
-</method>
-<field name="mContext"
- type="android.content.Context"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
-</class>
 <class name="AlphabetIndexer"
  extends="android.database.DataSetObserver"
  abstract="false"
@@ -252138,7 +251883,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
 </parameter>
 </method>
 </interface>
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 3141423..316e513 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -225,12 +225,11 @@ final class FragmentState implements Parcelable {
  * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
  *      main}
  *
- * <p>The titles fragment, showing a list of titles, is very simple, relying
+ * <p>The titles fragment, showing a list of titles, is fairly simple, relying
  * on {@link ListFragment} for most of its work.  Note the implementation of
- * clicking an item, which can either update
- * the content of the details fragment or start a new activity show the
- * details depending on whether the current activity's layout can show the
- * details.</p>
+ * clicking an item: depending on the current activity's layout, it can either
+ * create and display a new fragment to show the details in-place (more about
+ * this later), or start a new activity show the details.</p>
  *
  * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
  *      titles}
@@ -243,7 +242,7 @@ final class FragmentState implements Parcelable {
  *      details}
  *
  * <p>In this case when the user clicks on a title, there is no details
- * fragment in the current activity, so the title title fragment's click code will
+ * container in the current activity, so the title title fragment's click code will
  * launch a new activity to display the details fragment:</p>
  *
  * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
@@ -255,22 +254,25 @@ final class FragmentState implements Parcelable {
  *
  * {@sample development/samples/ApiDemos/res/layout-land/fragment_layout.xml layout}
  *
- * <p>Note how the prior code will adjust to this alternative UI flow: the
- * titles fragment will now show its text inside of its activity, and the
- * details activity will finish of it finds itself running in a configuration
- * where the details can be shown inline.
+ * <p>Note how the prior code will adjust to this alternative UI flow: the titles
+ * fragment will now embed the details fragment inside of this activity, and the
+ * details activity will finish itself if it is running in a configuration
+ * where the details can be shown in-place.
  *
  * <p>When a configuration change causes the activity hosting these fragments
  * to restart, its new instance may use a different layout that doesn't
  * include the same fragments as the previous layout.  In this case all of
  * the previous fragments will still be instantiated and running in the new
- * instance; however, any that are no longer associated with a &lt;fragment&gt;
- * tag in the view hierarchy will not have their content view created and will
- * return false from {@link #isInLayout}.
+ * instance.  However, any that are no longer associated with a &lt;fragment&gt;
+ * tag in the view hierarchy will not have their content view created
+ * and will return false from {@link #isInLayout}.  (The code here also shows
+ * how you can determine if a fragment placed in a container is no longer
+ * running in a layout with that container and avoid creating its view hierarchy
+ * in that case.)
  * 
  * <p>The attributes of the &lt;fragment&gt; tag are used to control the
- * LayoutParams provider when attaching the fragment's view to the parent
- * container.  They can alse be parsed by the fragment in {@link #onInflate}
+ * LayoutParams provided when attaching the fragment's view to the parent
+ * container.  They can also be parsed by the fragment in {@link #onInflate}
  * as parameters.
  * 
  * <p>The fragment being instantiated must have some kind of unique identifier
diff --git a/core/java/android/text/ClipboardManager.java b/core/java/android/text/ClipboardManager.java
index 0b239cf..d030910 100644
--- a/core/java/android/text/ClipboardManager.java
+++ b/core/java/android/text/ClipboardManager.java
@@ -17,7 +17,7 @@
 package android.text;
 
 /**
- * @deprecated Old text-only interace to the clipboard.  See
+ * @deprecated Old text-only interface to the clipboard.  See
  * {@link android.content.ClipboardManager} for the modern API.
  */
 @Deprecated
diff --git a/core/java/android/widget/Adapters.java b/core/java/android/widget/Adapters.java
index a71d4ab..3849aa4 100644
--- a/core/java/android/widget/Adapters.java
+++ b/core/java/android/widget/Adapters.java
@@ -39,6 +39,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
+ * @hide -- not sure if we really want this in the framework.
+ *
  * <p>This class can be used to load {@link android.widget.Adapter adapters} defined in
  * XML resources. XML-defined adapters can be used to easily create adapters in your
  * own application or to pass adapters to other processes.</p>
@@ -239,18 +241,18 @@ import java.util.HashMap;
  * @see android.widget.Adapter
  * @see android.content.ContentProvider
  * 
- * @attr ref android.R.styleable#CursorAdapter_layout 
- * @attr ref android.R.styleable#CursorAdapter_selection 
- * @attr ref android.R.styleable#CursorAdapter_sortOrder 
- * @attr ref android.R.styleable#CursorAdapter_uri 
- * @attr ref android.R.styleable#CursorAdapter_BindItem_as 
- * @attr ref android.R.styleable#CursorAdapter_BindItem_from 
- * @attr ref android.R.styleable#CursorAdapter_BindItem_to
- * @attr ref android.R.styleable#CursorAdapter_MapItem_fromValue 
- * @attr ref android.R.styleable#CursorAdapter_MapItem_toValue 
- * @attr ref android.R.styleable#CursorAdapter_SelectItem_column 
- * @attr ref android.R.styleable#CursorAdapter_TransformItem_withClass 
- * @attr ref android.R.styleable#CursorAdapter_TransformItem_withExpression 
+ * attr ref android.R.styleable#CursorAdapter_layout
+ * attr ref android.R.styleable#CursorAdapter_selection
+ * attr ref android.R.styleable#CursorAdapter_sortOrder
+ * attr ref android.R.styleable#CursorAdapter_uri
+ * attr ref android.R.styleable#CursorAdapter_BindItem_as
+ * attr ref android.R.styleable#CursorAdapter_BindItem_from
+ * attr ref android.R.styleable#CursorAdapter_BindItem_to
+ * attr ref android.R.styleable#CursorAdapter_MapItem_fromValue
+ * attr ref android.R.styleable#CursorAdapter_MapItem_toValue
+ * attr ref android.R.styleable#CursorAdapter_SelectItem_column
+ * attr ref android.R.styleable#CursorAdapter_TransformItem_withClass
+ * attr ref android.R.styleable#CursorAdapter_TransformItem_withExpression
  */
 @SuppressWarnings({"JavadocReference"})
 public class Adapters {
@@ -614,12 +616,12 @@ public class Adapters {
                throws IOException, XmlPullParserException {
 
             Resources resources = mResources;
-            TypedArray a = resources.obtainAttributes(mAttrs, android.R.styleable.CursorAdapter);
+            TypedArray a = resources.obtainAttributes(mAttrs, com.android.internal.R.styleable.CursorAdapter);
 
-            String uri = a.getString(android.R.styleable.CursorAdapter_uri);
-            String selection = a.getString(android.R.styleable.CursorAdapter_selection);
-            String sortOrder = a.getString(android.R.styleable.CursorAdapter_sortOrder);
-            int layout = a.getResourceId(android.R.styleable.CursorAdapter_layout, 0);
+            String uri = a.getString(com.android.internal.R.styleable.CursorAdapter_uri);
+            String selection = a.getString(com.android.internal.R.styleable.CursorAdapter_selection);
+            String sortOrder = a.getString(com.android.internal.R.styleable.CursorAdapter_sortOrder);
+            int layout = a.getResourceId(com.android.internal.R.styleable.CursorAdapter_layout, 0);
             if (layout == 0) {
                 throw new IllegalArgumentException("The layout specified in " +
                         resources.getResourceEntryName(mId) + " does not exist");
@@ -670,9 +672,9 @@ public class Adapters {
 
         private void parseSelectTag() {
             TypedArray a = mResources.obtainAttributes(mAttrs,
-                    android.R.styleable.CursorAdapter_SelectItem);
+                    com.android.internal.R.styleable.CursorAdapter_SelectItem);
 
-            String fromName = a.getString(android.R.styleable.CursorAdapter_SelectItem_column);
+            String fromName = a.getString(com.android.internal.R.styleable.CursorAdapter_SelectItem_column);
             if (fromName == null) {
                 throw new IllegalArgumentException("A select item in " +
                         mResources.getResourceEntryName(mId) +
@@ -688,21 +690,21 @@ public class Adapters {
         private void parseBindTag() throws IOException, XmlPullParserException {
             Resources resources = mResources;
             TypedArray a = resources.obtainAttributes(mAttrs,
-                    android.R.styleable.CursorAdapter_BindItem);
+                    com.android.internal.R.styleable.CursorAdapter_BindItem);
 
-            String fromName = a.getString(android.R.styleable.CursorAdapter_BindItem_from);
+            String fromName = a.getString(com.android.internal.R.styleable.CursorAdapter_BindItem_from);
             if (fromName == null) {
                 throw new IllegalArgumentException("A bind item in " +
                         resources.getResourceEntryName(mId) + " does not have a 'from' attribute");
             }
 
-            int toName = a.getResourceId(android.R.styleable.CursorAdapter_BindItem_to, 0);
+            int toName = a.getResourceId(com.android.internal.R.styleable.CursorAdapter_BindItem_to, 0);
             if (toName == 0) {
                 throw new IllegalArgumentException("A bind item in " +
                         resources.getResourceEntryName(mId) + " does not have a 'to' attribute");
             }
 
-            String asType = a.getString(android.R.styleable.CursorAdapter_BindItem_as);
+            String asType = a.getString(com.android.internal.R.styleable.CursorAdapter_BindItem_as);
             if (asType == null) {
                 throw new IllegalArgumentException("A bind item in " +
                         resources.getResourceEntryName(mId) + " does not have an 'as' attribute");
@@ -796,9 +798,9 @@ public class Adapters {
             Resources resources = mResources;
 
             TypedArray a = resources.obtainAttributes(mAttrs,
-                    android.R.styleable.CursorAdapter_MapItem);
+                    com.android.internal.R.styleable.CursorAdapter_MapItem);
 
-            String from = a.getString(android.R.styleable.CursorAdapter_MapItem_fromValue);
+            String from = a.getString(com.android.internal.R.styleable.CursorAdapter_MapItem_fromValue);
             if (from == null) {
                 throw new IllegalArgumentException("A map item in " +
                         resources.getResourceEntryName(mId) +
@@ -806,7 +808,7 @@ public class Adapters {
             }
 
             if (!drawable) {
-                String to = a.getString(android.R.styleable.CursorAdapter_MapItem_toValue);
+                String to = a.getString(com.android.internal.R.styleable.CursorAdapter_MapItem_toValue);
                 if (to == null) {
                     throw new IllegalArgumentException("A map item in " +
                             resources.getResourceEntryName(mId) +
@@ -814,7 +816,7 @@ public class Adapters {
                 }
                 transformation.addStringMapping(from, to);
             } else {
-                int to = a.getResourceId(android.R.styleable.CursorAdapter_MapItem_toValue, 0);
+                int to = a.getResourceId(com.android.internal.R.styleable.CursorAdapter_MapItem_toValue, 0);
                 if (to == 0) {
                     throw new IllegalArgumentException("A map item in " +
                             resources.getResourceEntryName(mId) +
@@ -830,12 +832,12 @@ public class Adapters {
             Resources resources = mResources;
             CursorTransformation transformation = null;
             TypedArray a = resources.obtainAttributes(mAttrs,
-                    android.R.styleable.CursorAdapter_TransformItem);
+                    com.android.internal.R.styleable.CursorAdapter_TransformItem);
 
-            String className = a.getString(android.R.styleable.CursorAdapter_TransformItem_withClass);
+            String className = a.getString(com.android.internal.R.styleable.CursorAdapter_TransformItem_withClass);
             if (className == null) {
                 String expression = a.getString(
-                        android.R.styleable.CursorAdapter_TransformItem_withExpression);
+                        com.android.internal.R.styleable.CursorAdapter_TransformItem_withExpression);
                 transformation = createExpressionTransformation(expression);
             } else if (!mContext.isRestricted()) {
                 try {
diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml
index a5f87d3..5d034a5 100644
--- a/core/res/res/layout/preference_list_content.xml
+++ b/core/res/res/layout/preference_list_content.xml
@@ -65,7 +65,7 @@
                 android:layout_marginRight="@dimen/preference_screen_side_margin"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
-                android:background="?attr/preferencePanelBackground"
+                android:background="?attr/detailsElementBackground"
                 android:orientation="vertical"
                 android:visibility="gone" >
 
diff --git a/core/res/res/values-xlarge/styles.xml b/core/res/res/values-xlarge/styles.xml
index 489e530..ed05cb1 100644
--- a/core/res/res/values-xlarge/styles.xml
+++ b/core/res/res/values-xlarge/styles.xml
@@ -40,7 +40,7 @@
         <item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item>
         <item name="android:layout_marginTop">48dip</item>
         <item name="android:layout_marginBottom">48dip</item>
-        <item name="android:background">?attr/preferencePanelBackground</item>
+        <item name="android:background">?attr/detailsElementBackground</item>
     </style>
 </resources>
 
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 890ac7c..2d798c9 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -98,9 +98,9 @@
         <!-- Text color for urls in search suggestions, used by things like global search and the browser. @hide -->
         <attr name="textColorSearchUrl" format="reference|color" />
 
-        <!-- Color of highlighted text, when used in a light theme. @hide -->
+        <!-- Color of highlighted text, when used in a light theme. -->
         <attr name="textColorHighlightInverse" format="reference|color" />
-        <!-- Color of link text (URLs), when used in a light theme. @hide -->
+        <!-- Color of link text (URLs), when used in a light theme. -->
         <attr name="textColorLinkInverse" format="reference|color" />
 
         <!-- Color of list item text in alert dialogs. -->
@@ -371,6 +371,17 @@
         <attr name="alertDialogButtonGroupStyle" format="reference" />
         <attr name="alertDialogCenterButtons" format="boolean" />
 
+        <!-- ============== -->
+        <!-- Image elements -->
+        <!-- ============== -->
+        <eat-comment />
+
+        <!-- Background that can be used behind parts of a UI that provide
+             details on data the user is selecting.  For example, this is
+             the background element of PreferenceActivity's embedded
+             preference fragment. -->
+        <attr name="detailsElementBackground" format="reference" />
+
         <!-- ============ -->
         <!-- Panel styles -->
         <!-- ============ -->
@@ -598,8 +609,6 @@
         <attr name="ringtonePreferenceStyle" format="reference" />
         <!-- The preference layout that has the child/tabbed effect. -->
         <attr name="preferenceLayoutChild" format="reference" />
-        <!-- Preference panel background -->
-        <attr name="preferencePanelBackground" format="reference" />
         <!-- Preference panel style -->
         <attr name="preferencePanelStyle" format="reference" />
 
@@ -2022,7 +2031,8 @@
              will use only the number of items in the adapter and the number of items visible
              on screen to determine the scrollbar's properties. -->
         <attr name="smoothScrollbar" format="boolean" />
-        <!-- A reference to an XML description of the adapter to attach to the list. -->
+        <!-- A reference to an XML description of the adapter to attach to the list.
+             XXX Should remove? -->
         <attr name="adapter" format="reference" />
         <!-- Defines the choice behavior for the view. By default, lists do not have
              any choice behavior. By setting the choiceMode to singleChoice, the list
@@ -4555,7 +4565,8 @@
     <!-- =============================== -->
     <eat-comment />
 
-    <!-- Adapter used to bind cursors. -->
+    <!-- Adapter used to bind cursors.
+         @hide XXX should remove? -->
     <declare-styleable name="CursorAdapter">
         <!-- URI to get the cursor from. Optional. -->
         <attr name="uri" format="string" />
@@ -4567,7 +4578,8 @@
         <attr name="layout" />
     </declare-styleable>
 
-    <!-- Attributes used in bind items for XML cursor adapters. -->
+    <!-- Attributes used in bind items for XML cursor adapters.
+         @hide XXX should remove? -->
     <declare-styleable name="CursorAdapter_BindItem">
         <!-- The name of the column to bind from. Mandatory. -->
         <attr name="from" format="string" />
@@ -4589,13 +4601,15 @@
         <attr name="as" format="string" />
     </declare-styleable>
 
-    <!-- Attributes used in select items for XML cursor adapters. -->
+    <!-- Attributes used in select items for XML cursor adapters.
+         @hide XXX should remove? -->
     <declare-styleable name="CursorAdapter_SelectItem">
         <!-- The name of the column to select. Mandatory. -->
         <attr name="column" format="string" />
     </declare-styleable>
 
-    <!-- Attributes used to map values to new values in XML cursor adapters' bind items. -->
+    <!-- Attributes used to map values to new values in XML cursor adapters' bind items.
+         @hide XXX should remove? -->
     <declare-styleable name="CursorAdapter_MapItem">
         <!-- The original value from the column. Mandatory. -->
         <attr name="fromValue" format="string" />
@@ -4603,7 +4617,8 @@
         <attr name="toValue" format="string" />
     </declare-styleable>
 
-    <!-- Attributes used to map values to new values in XML cursor adapters' bind items. -->
+    <!-- Attributes used to map values to new values in XML cursor adapters' bind items.
+         @hide XXX should remove? -->
     <declare-styleable name="CursorAdapter_TransformItem">
         <!-- The transformation expression. Mandatory if "withClass" is not specified. -->
         <attr name="withExpression" format="string" />
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 76a9d3b..06d1e82 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1231,7 +1231,7 @@
   <public type="attr" name="expandableListViewWhiteStyle" id="0x010102b6" />
 
 <!-- ===============================================================
-     Resources proposed for Froyo.
+     Resources added in version 8 of the platform (Froyo / 2.2)
      =============================================================== -->
   <eat-comment />
   <public type="attr" name="installLocation" id="0x010102b7" />
@@ -1247,7 +1247,7 @@
   <public type="anim" name="cycle_interpolator" id="0x010a000c" />
 
 <!-- ===============================================================
-     Resources introduced in Gingerbread.
+     Resources added in version 9 of the platform (Gingerbread / 2.3)
      =============================================================== -->
   <eat-comment />
   <public type="attr" name="logo" id="0x010102be" />
@@ -1282,18 +1282,6 @@
      Resources proposed for Honeycomb.
      =============================================================== -->
   <eat-comment />
-  <public type="attr" name="adapter" />
-  <public type="attr" name="selection" />
-  <public type="attr" name="sortOrder" />
-  <public type="attr" name="uri" />
-  <public type="attr" name="from" />
-  <public type="attr" name="to" />
-  <public type="attr" name="as" />
-  <public type="attr" name="fromValue" />
-  <public type="attr" name="toValue" />
-  <public type="attr" name="column" />
-  <public type="attr" name="withExpression" />
-  <public type="attr" name="withClass" />
   <public type="attr" name="allContactsName" />
   <public type="attr" name="windowActionBar" />
   <public type="attr" name="actionBarStyle" />
@@ -1426,6 +1414,12 @@
   <public type="attr" name="spinnersShown" />
   <public type="attr" name="calendarViewShown" />
   <public type="attr" name="state_multiline" />
+  <public type="attr" name="detailsElementBackground" />
+  <public type="attr" name="textColorHighlightInverse" />
+  <public type="attr" name="textColorLinkInverse" />
+  <public type="attr" name="editTextColor" />
+  <public type="attr" name="editTextBackground" />
+  <public type="attr" name="horizontalScrollViewStyle" />
 
   <public type="anim" name="animator_fade_in" />
   <public type="anim" name="animator_fade_out" />
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 439d551..2dacbab 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -234,7 +234,7 @@
         <item name="ringtonePreferenceStyle">@android:style/Preference.RingtonePreference</item>
         <item name="preferenceLayoutChild">@android:layout/preference_child</item>
         <item name="preferencePanelStyle">@style/PreferencePanel</item>
-        <item name="preferencePanelBackground">@android:drawable/panel_bg_holo_dark</item>
+        <item name="detailsElementBackground">@android:drawable/panel_bg_holo_dark</item>
 
         <!-- Search widget styles -->
         <item name="searchWidgetCorpusItemBackground">@android:color/search_widget_corpus_item_background</item>
@@ -894,7 +894,7 @@
         <item name="editTextPreferenceStyle">@android:style/Preference.DialogPreference.EditTextPreference</item>
         <item name="ringtonePreferenceStyle">@android:style/Preference.RingtonePreference</item>
         <item name="preferenceLayoutChild">@android:layout/preference_child</item>
-        <item name="preferencePanelBackground">@android:drawable/panel_bg_holo_dark</item>
+        <item name="detailsElementBackground">@android:drawable/panel_bg_holo_dark</item>
 
         <!-- Search widget styles -->
         <item name="searchWidgetCorpusItemBackground">@android:color/search_widget_corpus_item_background</item>
@@ -1150,7 +1150,7 @@
         <item name="editTextPreferenceStyle">@android:style/Preference.DialogPreference.EditTextPreference</item>
         <item name="ringtonePreferenceStyle">@android:style/Preference.RingtonePreference</item>
         <item name="preferenceLayoutChild">@android:layout/preference_child</item>
-        <item name="preferencePanelBackground">@android:drawable/panel_bg_holo_light</item>
+        <item name="detailsElementBackground">@android:drawable/panel_bg_holo_light</item>
 
         <!-- Search widget styles -->
         <item name="searchWidgetCorpusItemBackground">@android:color/search_widget_corpus_item_background</item>