From 84e6be0c6922da32a7d4f8b732ef56b97f8d8560 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Wed, 20 Mar 2013 18:14:48 -0700
Subject: [PATCH] Add action bar support library samples.

These samples are simply ported from the ApiDemos package
with package names updated to use the support library
implementation instead.

Bug: 8175766
Change-Id: Idfa35708d4db65a201a20c3726bb18663c2c0a81
---
 samples/Support7Demos/AndroidManifest.xml     |  64 +++++++-
 .../res/drawable-hdpi/apidemo_androidlogo.png | Bin 0 -> 2642 bytes
 .../drawable-hdpi/ic_launcher_settings.png    | Bin 0 -> 7230 bytes
 .../res/drawable-mdpi/apidemo_androidlogo.png | Bin 0 -> 1983 bytes
 .../drawable-mdpi/ic_launcher_settings.png    | Bin 0 -> 4122 bytes
 .../res/layout/action_bar_display_options.xml |  59 +++++++
 .../action_bar_display_options_custom.xml     |  17 ++
 .../action_bar_settings_action_provider.xml   |  34 ++++
 .../res/layout/action_bar_tab_content.xml     |  19 +++
 .../res/layout/action_bar_tabs.xml            |  49 ++++++
 .../action_bar_settings_action_provider.xml   |  27 ++++
 samples/Support7Demos/res/menu/actions.xml    |  49 ++++++
 .../res/menu/display_options_actions.xml      |  20 +++
 .../res/menu/sample_media_router_menu.xml     |   3 +-
 samples/Support7Demos/res/values/strings.xml  |  43 ++++-
 .../android/supportv7/Support7Demos.java      |   2 +-
 .../app/ActionBarDisplayOptions.java          | 148 ++++++++++++++++++
 .../supportv7/app/ActionBarMechanics.java     |  72 +++++++++
 ...tionBarSettingsActionProviderActivity.java |  94 +++++++++++
 .../android/supportv7/app/ActionBarTabs.java  | 135 ++++++++++++++++
 .../android/supportv7/app/ActionBarUsage.java | 101 ++++++++++++
 .../example/android/supportv7/app/_index.html | 111 +++----------
 .../android/supportv7/media/_index.html       |   8 +-
 .../android/supportv7/view/_index.html        |  22 +++
 24 files changed, 973 insertions(+), 104 deletions(-)
 create mode 100644 samples/Support7Demos/res/drawable-hdpi/apidemo_androidlogo.png
 create mode 100644 samples/Support7Demos/res/drawable-hdpi/ic_launcher_settings.png
 create mode 100644 samples/Support7Demos/res/drawable-mdpi/apidemo_androidlogo.png
 create mode 100644 samples/Support7Demos/res/drawable-mdpi/ic_launcher_settings.png
 create mode 100644 samples/Support7Demos/res/layout/action_bar_display_options.xml
 create mode 100644 samples/Support7Demos/res/layout/action_bar_display_options_custom.xml
 create mode 100644 samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml
 create mode 100644 samples/Support7Demos/res/layout/action_bar_tab_content.xml
 create mode 100644 samples/Support7Demos/res/layout/action_bar_tabs.xml
 create mode 100644 samples/Support7Demos/res/menu/action_bar_settings_action_provider.xml
 create mode 100644 samples/Support7Demos/res/menu/actions.xml
 create mode 100644 samples/Support7Demos/res/menu/display_options_actions.xml
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java
 create mode 100644 samples/Support7Demos/src/com/example/android/supportv7/view/_index.html

diff --git a/samples/Support7Demos/AndroidManifest.xml b/samples/Support7Demos/AndroidManifest.xml
index d9ff231d4..4112bcef0 100644
--- a/samples/Support7Demos/AndroidManifest.xml
+++ b/samples/Support7Demos/AndroidManifest.xml
@@ -49,7 +49,7 @@
                 android:label="@string/sample_media_router_activity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.example.android.supportv7.SUPPORT4_SAMPLE_CODE" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
@@ -63,24 +63,74 @@
 
         <!-- GridLayout Support Samples -->
 
-        <activity android:name=".view.GridLayout1" android:label="Views/Layouts/GridLayout/1. Simple Form">
+        <activity android:name=".view.GridLayout1"
+                android:label="@string/grid_layout_1">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.example.android.supportv7.SUPPORT4_SAMPLE_CODE" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".view.GridLayout2" android:label="Views/Layouts/GridLayout/2. Form (XML)">
+        <activity android:name=".view.GridLayout2"
+                android:label="@string/grid_layout_2">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.example.android.supportv7.SUPPORT4_SAMPLE_CODE" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".view.GridLayout3" android:label="Views/Layouts/GridLayout/3. Form (Java)">
+        <activity android:name=".view.GridLayout3"
+                android:label="@string/grid_layout_3">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.example.android.supportv7.SUPPORT4_SAMPLE_CODE" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <!-- Action Bar Samples -->
+        <activity android:name=".app.ActionBarMechanics"
+                android:label="@string/action_bar_mechanics"
+                android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".app.ActionBarUsage"
+                android:label="@string/action_bar_usage"
+                android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".app.ActionBarDisplayOptions"
+                android:label="@string/action_bar_display_options"
+                android:logo="@drawable/apidemo_androidlogo"
+                android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".app.ActionBarTabs"
+                android:label="@string/action_bar_tabs"
+                android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".app.ActionBarSettingsActionProviderActivity"
+                android:label="@string/action_bar_settings_action_provider"
+                android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
diff --git a/samples/Support7Demos/res/drawable-hdpi/apidemo_androidlogo.png b/samples/Support7Demos/res/drawable-hdpi/apidemo_androidlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..088181b9102665cc94f2e3629a7ffbce7abbf8d4
GIT binary patch
literal 2642
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

literal 0
HcmV?d00001

diff --git a/samples/Support7Demos/res/drawable-hdpi/ic_launcher_settings.png b/samples/Support7Demos/res/drawable-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..c02bd424f51d096db65297e520b909c3b718d400
GIT binary patch
literal 7230
zcmYjW1ys~Qzg<8&r5mI{VwVOHq*>|iTsjunB?Ku2K|qj_TpH<a>28)@q$L$ly7S@p
zop;`wGc)&p=H5I1-<dOKX3k86mWDDR9xWaK03ZabDCj(*%D;kx^;qlwtyO*mEE`p2
zg-3i$SMn`EkAV9|#TX6%P?7#CXbxFZ|9rUKZ)6=F@jre5()SP(0H75IE6D1-UHFS|
zDq|n;S`8{}zTtPz*cy9{{Ioe5OWv3gMb4kJ5gY5uS;K-|4WX`iO5-8Tru~N)4SiFd
zgbn?}6WLgQ9IGGI)=#|2IpuO+HQ0`D6n%_$Oh{BQSyG~hiPOW*#oSw5d}fEjOLi;T
z55`iGQZ7T5dw;I%FPfX5Rl@IoA%bREZ?`;_<);$zWX{P51P}vX*~O&KAwPy<o#CJ2
z2qs*l&iH8qiHQR==|~Xb$5+xRpQ#>BIxwsb+L(S0H)cV<K#r13=l$>4ZkYT-qcj6D
zI?m1#)`y?=O=uP6z92MtMWL{8a6jD%UL<XhxoP{5UCSvHJ=Tu@5v**5wBj5-kn&EJ
zK3@&|G7z+_Y%F~gi0Zfzj6d7nDK7(x-*6D$U%Puea0X$$wzbgb#EI%GY<Z~svo`*4
z**9g)mqIXaR(|>OUM}e2`S{UyruO9fd-=gQ;s=K78zT7J_&u*`I5Ch>bIgrNYP<bV
z;9+{-#?IQePSpFm2&qG!$h1e8cW0%SQ$O1}Yy1jgwCSGamwct~RN$Ixtwz_G{;wNz
zkA;@oXv^!~pO7ydJYq6_rJ3&n2W@_-Kd4o=syWyR$Q-YBxI%q@etNeSBy;sX;3DX!
z5X=1i7GJsF2M-v-+?6zeE9zUj1J#X?bbc_JD213&d?v%^_M?S|>%Uo<GM+zcBw1Il
zq8~~=G2eZ?<6ZLnob~RS?wD9s<}6j<wsSw6@lNK-?0^e`Py;D)s&x~+Y8pP7I6J&<
zk2rhx<avO*LEX51fXo2IipT*r>Iu0kUA=F7xIVbgvwXPtl_mMb|H^%(@M`_&=KIz`
zKwA2%n26t+QXc!3r>+OT+jRLJE=QR=5-;kxJ~N#X0d~BUg32B4gWk{7sMWTuegHCl
zEmL8CXL!BEY<ZtUCUYGTbgX+g9*zylx<WO&Nt;`KqbIx?$j<uk@kr_W06~sGnp=6a
z-OS#Gq|S-l2&Q*4>fR|lK}M$2p7<#>5ie40NAtRdy|Za4h@=T4@%|aiP@SgLE8g%@
z7VyhegaV_qM~5>6O|e)7O5zqmE|cL^)a-U&ILDlD3LELRr~48Tf4F5Lls)IOc9}i|
zQ%HmBD=G|f>T;w){H%=0Ct!k@Re(JFP2-^VusgiQfiQ(CO7D&nbQxm;e@os^IJu;`
zvVxJL%r>Mhul=Mk7LZ|e@-@d5Dtnq8V6+)gsqAcS+2ULVjIBg>nF~R`)jXBob%Ys1
z9z->~JK5Q&Bh<9z=6dQJ(3c9*i@}B!2Z&d&i0lBvrBCM3p^Kw?UWC1kns+g79F*7$
zuO>32^?P0tzAB;RmC0K&+S>Gtq1z84-%~*2$hlhz5?<ETuNi&g<Q1)3sG)tj4SGrf
zAz{VIsTBcMp9lj`a1g{xXs3)Lq*!3aR~x`t$F#a^mCu+=4hTYX3;2?)l{MEHVTHZ-
z`C@68o7Hplqu6FiHgfh3j(Ua_Y4HWxs64rMrIE&KH1YXt#%eOSj!b;2CJz<L<q=za
z=XfK522pb>9!eBtR($1%T<l~|$RR2W6fJQI=N-SZ)vq8VDJfEy{Bw(s_<$cx{Y1Yn
zbSL@=XD{s-F-N;;Z()z1s`3lA^f9Ykz5(xP+y0L6Vti(Hy>D)>?3Z~O=nh-}ItVy3
z)*gKUm)yjWm4eE#n_l72Y3KnDGZ=S5A%rcHon6_avmdQtFJj)1Lo1v>!vU(VAG9l_
z(p(<x-RN^WlmCKHBX}L?b(|udpbTF;7j#>QOYIV4Rvf|oRHyWn3veWs0m^A^pEf9T
zehqtCcF9e+qblT5AIHYk3mP?vcRoR1Wq0?DDHBE6?|w8>0A@&(*h=clswMb2r)*%A
zbCAti-4jkaLu~5T6cSz!&m^ksqFr^V;B&9)8yahcD{@B?87Ivlrm3Cf+W*jZ)n)n`
zo>=x+XInGtJ{Z8n7=-+PwU|Y~?MsVwvxvVHnBTzICLDotDrPKVm?g{GwjN<qU423P
zAJ{&W7JM2qHjz+k?C5lC>f8Pb{{d53+2b@oHLdd+ot-@?ORUYsj`%R?jBiDjvWNG5
zA#!M|wsrTNi-$L<u?*qI6}&n|BjI<&V~vW`5p>|6RgMxXX?lGLzEz^p58u{&1Z^(X
zOq(8Z2E?mcKP_<Q4JG>USDsAyWZJ#m5>}k-W2a0GJ9aVAxm!lVqQaDwA;Pc1W)>I(
z(G)ax+WUupQs|kzmQ}xGxwHn9^V8{>N@@_y5T4-DCJcnCnh>+!YN?0uGD-ClzdZLq
zEN_~o>sB-|77Wj?roOphxHz7Q0vZQkB>1G`BpKxuK)*H_s_~k3G)@snZ573btec(W
z!K?Ge)PynAbuBQ5oU<kq?-SAnLO8wL3^)Tw%2XBvLqSFLO=SaaJ~F+gbT0no7l9SF
zEyZd?sXChw=<J-h=Wo2iIb=x2hZF;xO3t_5hr6^ong=aP+Q|cPec~L!URLG_(avno
zX6@G*s9(IAsej7_Y6!DaFj);SU?dxibw#B%<RA!)SA59Gp0-bYPp@}=kL>r|7U;mb
zV-LHDIa%+{sH(KRKl?=;Q%LT+QqwylNFU6{U5ck)ysR1$RgA@|{ie&(jat5fOWY7+
zv+P7K&LQW0FOM)yL-%zTc6A%OO+hh_h>H3lG?^N`9<$H21=)OLe62tjeiJr*Wl_=0
z-khvaeK>2mZB;$A-i>}>7Leitz2R~fSVi9NGg<^)u_-o&OD<w@1TK(nU(^O2ummj2
zfj~Y478@i9Ie2zE8&^2Q2Kz@~w3;)uU4o(6{cOtof!ReFr0qDNiimoxvPoz_G{nFs
z24$x;Y?Jvh+VD*q;(N$*Ug-xJqm)eLBx3nOtJNzRo4<z`1Q+zy0sFv0PSv8n!R5|A
zM`Q;f!5IWQ2NL}^=VN*9GEv)YlA|HH8bgs9hXjU;p+42U4tth$Yq<-3=$jtQ6}0e+
zL*MhiOx9jgGY(x#3JooF<LM@W6H^X0((7ha3>n*FA720^PVswgyQMhBQ<IVio{4Gc
zQ?z|o4BYHt>N?#H7-Dtv`I3}KlY;OKL!-&9FduCg4)*?XVvsxA%#Nao%MXaAkZ;Cu
zeR;B|mN~L$-G-E><xKZt%}t*@2D7;YjagTPc>M{<vW;DS6?iCpUeT`5xWGnc)UqQ_
zuuZI`M<%K%t@!<%Hsgw&K$s#(r%p+Xhrvp4=6hJ@QBC-36m8fEu`d-_V&Ka-7Ih@0
z;G*~;n_dJCSu!ZI*&v#c)q+$jo~2&mh(15FOkL;4dft|!4M^aYu?^#*y4{nt^6qPv
z!@*Ai-u;d4C2ce5@Y|u}A8+q`jpoBkTa)S3z4DA!`@ncs!aMNiejoSP-^L@ilZXD=
zs(7stimtzGKorR((X2LMh(wEk%Obi*2*-ZX%2NoVz~xIteBR*b@UTOsvU&ZK+>z~6
zs-1wp$#Keo@5}pGUH7HKo(>K_g&n)N1|G>wQAkO+{H~O={~G!!IO-cX4F_ANkzc`n
z_SxI6vX);Y-xuO{7T8gFb`qwdz6PUE$lsY^Xj-%D;sl0@S3Kq4LNKlT7Z<}pwdok$
zRnwi*`D^5cCo&*;C4x9d6}x&GlrTLG@;kyUlk|%kF>>+X$4`Pd@3}I7=8D_85`;L6
z^e^>$Lf8Re^dJ>VflFjdZy!tHClqo!oH5xzk(QecoqO^nyLHY&I7Vmz<qzQ}^kgq+
zfFeq<`{*Gf?rX?<sxmo!1HF=oRMrte@=9X~D!4G!=?O>G>$?@8x)YxPcDSE?Iyi}>
zPiLqW%u^3lU}K=ZAJZ_c_=;kwZMJ3=Q+Oxz!})W00S=ayTGDieDURFqBn<?ZyP3hL
zkLuE=oc7p6S-a_zwP78NP=~;+dgox;1y0<ALXaL2#Zqup3hs$IM@HhEND<+rD8`w#
z^4{n?omQS;15xrQBap$Zs_B3WJ4WV}yVJ)>6m7CaP-fT1gQ*P5(_{WvI~tA=l0D$1
zR=I|@wjk@KaoAH_nkuIEAi3wRZ1gi44zxtDXQk)IwGE6TkW3QuvYK{-r=WJBdhj=x
z4O<HdjWdm?mitJsjmA1Qkb$u2DuihxQ#la9&)$I0im&y!$V2$8fsrzIGCQY!_xk;@
z4m6^*;$9Xpzz>BVM=>1biZ^M^Ny%2zHx(w6eE@^c$t<)zzbSXG56N&Is*;Zi+fK#*
zdd8C9&WZcLwxP*BK!bE*7EH_|Bw9YB_F1`j#@}(pOJ$o0Vu*Aet=N&o{(`U)zV{Hl
z--O$~Jb-ctZRQ|JpMLf@6OTT6&fw8aPc&m?<7=cF+`z|;sY31*Q#P$UJD2@a!dRr)
zXqWO?RE6sp<6_B`{aDu|P)jW%Br&e+4Rz-{_th;F`gXOv_4GWwwdMw`!IQC+CN~MQ
zvF}J#v$pje6P>D9H%dY<VdL{pK{OGZ$S6dvbdcbOgYb3V?$9O9*^%i{Kgw*Aq9j0U
zvSdjo!4*M8FKNHxU$*OVwzMzT8WMst<a}E|gJ02gJfDVAnh||{cV?MMQjNzXvpA8_
z)29tcU4BMe_!_f7g;e*AfHWA?n0&O2DLAcoOu&li%<G&XP_~iXdy+|3DU$l8f~DR>
zD_IKp{yE)FBNkTylXjh91wizTM#U}(giD83m9&`4wGop^i@@;UN`fOQ{OJqzBoIs5
znyJdduz!rJXPWi_$v4lPwz~mdnTvE@AD#mHm?)oH@({ZHt?nt0eyX5wLrV$uO1e<s
z*M%fgb~VyC6SlJI*i$n50gOmf#`PcfjD6QmGoEQSB8d#7&v8tNgtC`H{h<*{G1$NR
z*_GaEF<y#k614VPj08n6G8hl$=rF%?FKGFtl%JMs<EUyG4HQ841t|yavuu1dP2KzR
z?d?_6;BP$WKA_Jw!@Tf5_Nc4nM-|N--GTi@m-1l#T4x<`{;C6@cseehqi!~FW%%i_
zs^%Kv3`%{<)Lo+VvJI(jiSCJKg9k%!Zh`5Onul54cd1Z)Sqkl-CRndqa^}y$<G<2b
zxOCLHIFw+KhJ^1#RHe18S^*@sYMMNeEA%MI(9ba*w!0~M!;_h?o7dq-GlF~!O1urn
zaiapKxVe;Gv!gsZzb#XK*niJ{RVrk*;-5ZDUayxUK2df=ex|=oBE^gDOaGZ2l|N;o
z>Flp3C(1z2D}=Z~9l-We$LE$4OfX#%<$4e9-yq|B{3hBGx~8<RIqzvl1Ok%GUgr-Q
zy}akLLw$QOzy7Dza-AU~mP&EjK83fC$V(dJTE0{G3ap2p7L=`mA~f4@l&S^W)g3Ke
zzhf*H=7>~>iRb-7iRiOfZ^9#H^Hn9*S}~KXo9kbD>^@JqksewgB+eZPH=;MUs`*8o
z`~n+@bG|j;(WAcYU3odoK1fwP0YYPg)N@NaoQ6{BD8<Kf=;inRX)gxlZtj+T=TIMN
z6e(?w#)+L-W5K$8!>)p@E=^g<SxRx#f>S~vda!PB%>uup=x=-=G`Lt9o4rM=Vz-y<
zY(11H7!S%sF40%;1Ypvg?V8|UFu2CS&7GCno!jX+t<>BUJ!&4$Wt(k8GX_ST>arOw
zfV42pgS|0%jdap_i`k;mP8>$-F<#@a7z3*0a5?UuZ1NpfE}lrKs2A60buCZwyh`Re
zhBl)M<8lqh8%ln5Z;MP~;XNSjy>b;-<jk{*YmGq6)*FhO7j;&B$uv30z9b5=TRAX5
zg%$e>&1lc%Z|(+DnS_cd%CyB;IEkU*w-dU~Ex*k~Zg{{6&7WfT^<JwHZUaKk>vm7A
zGZ-xXAYTy7Je?*(YeO<)QnEwI@jSMyQ(ZZ+B6rcU)7IX!y2N^3>fm&ba-=u!_^<r=
zZxfMcGLEA<pGxzGoc9QX+)N{r`d_A(sKo6{>4^7AsI6doi95&(C;D+Ku_YSd9!G~E
zW^`VOFhFV$tTKmB&sY7$j0?x#z@twJGa+X))8srVX491+vA+Z<$fC9V8N3;YO6U^}
zTvn3?WrYmLecskJE^$Its>+_EglX{R@)t!!7O|3T>^&z9EFB4(pKUOb4#mxgiOU^W
zX1XI6W9*=#v3Q&*!~PAUQ+G^jf9}Z;@2+d9P5sOz<355T^}SHu5Ff=sms7GZcv_Wz
z{P)*OTqNaO6(Qi-`D~59BIfh4_B&j``c$kre7XmUpJ#(lYK<&EXBQ?s?SkoTrEGk;
zM}MviwY%F)F!Ks4x1rK^+96!AD$XPLBGWya{196fn?!L{$%2#>p&>*CPtwME4SGrD
zH?}6rDlSzwQREr@EqvO7qp+(nbr?G!#t|W`<MxD`q#$Kf#>yW`k^ET-ivwWON{6i_
z#Z~|^2ekgN9xy#U&$61EY-ze3Hk7EnVB|l8=1vj(;=MXfTz27{Uu@|%@xgsD-}%Ha
zs>JZKy~bozrzbw!UaTq#E%duo`=ZfaXEAQKHLt<60%*yU@UXNbetiNl?usE=eO^t3
zP()ljq<!uY;(-20<meRxJJgwMBooxo7jv9mERUWZb0hgzyRMKRqZWYSxQ#-wH^bwq
zdLs+FF3hwJ(9-U$_jg(n#-n^f6fc<&vp0vPSZ=On65XpMz*AJ3!gyb*hacXR^x~cY
zyO!B0Ej)i{fuPM5Ln_eem}j+2RxOM@uMvhpHyf&&K{r`?kS*Y!d3(nBqfK1dd!)xq
z;s{j1OAp!V%y@I8?rQKhwKvs%bfJjjNQ&4K#H!eTJwE%YUeq9$nI?Tedic#6jt!>}
zTbh;Ni~hqt&hPPZljyZWZBto`w`8h#$zDSR$va6@R`(=V^M;cN9h!x65NnT^@6X3|
z7@ERIuo<oDJQL=6Gm<?(L!_R+J#^Loko4KCY+d{n5n66mePZ}^31PlI5gqPfN6~<*
zY`6r)J=#J_AWpWr9i{A~xMgz^=+Y8pW=uWO5vsd#bFkyXOlgM3u7VKc%1f2ZxHG}g
zB`Ie-MCor^X5ZvuvW{7a6TEyY=a&n{Ra-Nhkz}3vT^|s0`Fzp|p8OT+>`?6%L*9|l
zNwL7M_~YZ@YI^a^2{ZQb!HMJuBsWsBthT5dNEt1()|go}^Q1?x{(+1!WE0bL`sw@;
zQ-RbW2`|0XQKy?HYBhL`{N159*3G^`f&B1nZ4*pwawix0Y<*X9bWavl8u1KXAtqqd
zy19lRWYl|N%L*=(h#il{+Tf<^(Kdxme9|NxGfA4szl!ctaw`~9blYLG5FR4TDMKVB
zPU9{ccBlpR$h)2sL-rqTe($PIq;KqY-TdGpod3<T@knxD_J`5)&Lrxb`ut>$=HKpd
z{5qOst5{Pan*g2*IX8wjdlcuScy8Etv)0yYWrVQ(8m*XaFwuA&V^Z^^e$%(#>W*}|
zF!1YrPsiZfHDJP4dK|C(2*}?5<I%>$`<-3WQ!1aUKHMAwa)yGH5t`prB*#XV5?0i2
zv@l)jElQkt9Nc`8xQevr%3|{|rrwzBr6ye~<CnQLj*L>cHR@p;@amk>Abj8ZpJl~m
zTmqrvd_}>gFMEE!u*`1tPxFU9b$E_Q$v#j8eyI8*#HhBN2U?6b%TV--N+hH9l+`aS
z7*qj#GF(R=`1~z@W8Szwtv)yZr|TW>;==33T36GQ&(z$XB-I>Zc2E?5bUVUWdnEdj
zAi@XF+ODe3`a)&o0Ul>7N|qCv$_XcX?doC-aV;>FcK;8@JgqPitwsv3Z<N^VZK>vz
zA%Bk|-F{8xlkS7fT>E+Nlxq~l8TkzobNPT@n<huBkBOY|W(+>**5rPHqg45o(t1gX
z#1aSaIUtg~oVERLsmKzvp<Skz$IN3G-sq0!MQEkC*OJ@QHM!?$ccPg3m2OdsOM>$+
zvU6}mC--N3&&%|YSj^@1Jh)euH8*8LAx{i_C)LacQ-!j|o4C}jwq!m9ov?-y5`gR5
zH!OY{_u2=m@Umf+x_x{Rywu+U4j>ztb#%&MJ~s#3#VDEe*oxnho;RIFhVg9H?{@&;
zuTbWvVY_C0v89eCesj%Qf0EhgNEQ1YxMf`qBI=Y`-8PDn!}6Lay$UFg#0(nA%yt)?
z-(#0drfyjB;u0D$a*lJNB>gZEZ&wL#Pj7w_L&wG2nn(-{K3ZcP0PIlKuGS{Lt923k
zi?)MldYCnLW<}E<IJ&^<1=`em#7?gwHJhjj9G&|_l_E~&cH~~;Myr`=mI%XT?@WSL
zcd12{BrLI4mO`sV7@4sXC0qethwAhOi>kKBMeM4wV^hY^(fFdAd3+ZbmbbZUC!>-~
zfH(8)m6+;|{7otFPx!6tQdEjL9SsntGVMMf4Us2%sVyFYj<y{b><WN9UnAZnF991>
z3CupHzB5PKGo&^nnp{SxQftAc=&x<GclNI{HWmmRg>a|OKbPVjE;f+OrEt2K<rd*~
zrrKJP2}|m(u#dpc`2?m`eYBK`Bsn&MJN;s%<@m5R^xxhnz4<mhG~sdU{^0NZr}|6!
zY5+`yGQ;Qb3c_nW17f&q-Q1I>o;iJQU5MH=_g}qIaG*USGuN&X&pJv73Xrul&q#2v
zWDv^wdOiU_iM^^n4x+R$e<|-nwO`Bf=ejHC@U2MmVWownu2&rTOCd%3206>pxd@VK
zINnQqi%ZYe5mv%PFATr7MW2-N%XER&Ir4T`u@&6LHek67>i^f!;&$w=qqnEy8}xKr
z=mq6Vnw1*Zy$wU;s@Rqao8L3b?MzM-u%efjya`|BL3?xB{5N_B`sj37x_RZ<-`1o3
zm<(P=lvbKz=0W+gq#*Lv0`Nfo7VR?nndbvQ>;l+&^v&TaPg9B{g?%p@Ras8?&Rr?#
zytdTPT6Ls9sho;pC85XvLA`ZuAhQnv#_ZuKY(C_f<#H``e-MDI2;tlxUq*S}TH*@K
zw$*VIEI&Rd5qc^bdCFV6*}<#<{{_c~gPli$`X8ZS?P&)P1cE>UKnVemFf&M85(ttM
z0_u)Ho;+&U|7mO=HIfjR-TzAYfD(KlQ9YoTq_D805Qy*b0|@LSecb;4zroGj*2&)Y
zKYjn7K~PLmNc6u3ALk>zN5i{+e^7FAwF3y~!|h;j0hqgu9n2H%4uuFPxI?_$?4X`-
z0Yi6~ivSp6$M-J`H$J#E)Yiud;wT^shue9=`F$Q~PneyZ0L0zR%^fNr`{oT8;tqZ6
z%nr^6hd~6KAeOGyUQmdm9nA94;pqf*fb-k9+Cgnk%Z-X3!@&Jd7_i4-0sw)aE^P{y
z$40V$jXIAaJD8r+KSt;=dVWD*7YoL}Cp+SQv@XOBY6tjF&Hw0h*_|19q)7fz|MdVL
a2j?;K13?#m_@Iv*0IaB?P$6ga;eP;-KHB{N

literal 0
HcmV?d00001

diff --git a/samples/Support7Demos/res/drawable-mdpi/apidemo_androidlogo.png b/samples/Support7Demos/res/drawable-mdpi/apidemo_androidlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..11cb47b2848619023bfbe3a7b53c54ff6031cd5d
GIT binary patch
literal 1983
zcmV;w2SE6VP)<h;3K|Lk000e1NJLTq006rH001Be1ONa4;5fly00002VoOIv0RM-N
z%)bBt010qNS#tmY07w7;07w8v$!k6U000Sga6xAP006rH001BW@LPHv000KZNkl<Z
zXx{CbYiw0T5XXPDq)40At|@}j0D>ASFQo>QV1f#w1VxE}BEAT;iXnngN)%9|##b=q
z)kNfBEW`p51k|FU5+4vi2ns@^5wwDWH4IvT(onBo&e^l)o=5LJx73*2f4}VP&g{%i
zcV~CzTu390G}1VS$T(LMOCDE{4>a(TI{aTRGtkOQ=t?$FPmMa>dU^xhE;;n&GR_Z?
zZBTFfN@g*FJ18>dKE_5?sbjv}gSgUn_C|hTmy$sHiYX2lic!n<U`b291EU$n#YWdb
zK4gumZ${f{duHjzkO2L^vQHff)9&kb>B)m!Pn&SV5jE7O^E#e#Eyi)<GM1^c9{w^$
z2Wp71i%RvCuksQ~LTqcInuV$^!0<MdFrF-*p?WHKSH(iKjZp`!z9GCEV!=<WWSwgC
zA3V>aAX{ef7B@8ObpHjFFwfWNkVPpKl9$wU85C14^Q3*!hGa5=cf|KRNCAtP;OlhA
zrHt34U6i%Qp(|yql79Y!ac-CPEMsKUh%XOQ5-Qt|g%OrCkV@$h!JK^NdgUaaMf3`l
z8%()G+H@WiQX#kd4Y=Gcxm3_Sst&oHi3WLuN@g>I1$<-l7BM5j)CE*XVFbDJd0sMI
zHfHb&osEv;Y~)RrvWb&MZ!u+2y%2{s%#vZ=Zr9$FmyJuJk!rr87EhexS?dyX#dc}O
zS_&+pf!A55n)FyNX46fxKB~4Eas~JYo{scqB)OVC!2RaUAPN<*)I3HpTvN}e4-Ba>
zOxMH-=JA1TrL<!#lV}@YrC)5%p+kWFKHSEonr>j6stt6z3}l`rb~95Q^<R~|VcqI(
zw~uG4Rx?TMkCVw}A-yePuX>P#Ai0!rizds}^2FpoCQ)iNx2h?+w;k*CKdY9>@hg-f
z7V1r~U)>k(_E7y9jAM$vAGfQ??r}57Owz4wJRIcoK-{TYFU30@)G4N8Kh1i{<%vzH
z>eWnEYw`ifN=yz|ifw-%qj#uwdIQtED^&ZLp-*>_^i9$O=1eiQf~WOd{Uz=;(QcQ{
zdN<ZH)BDg1hZNGqYSx&C+AyS!DotFM#ME>6(Vl{V2`{^e@2zHzaXsFkTW_nMedV_E
zu@847s83m`i4pEGXSZLgTUE`a8a{Ad3?BvZRO?nz62_lpv5$?-Bioq4hP|<3tPPY~
z<Kd2uCD^*-Hk#vh=iq-9LBWN(^+OPgs^yf2I}v=LjZZK*fppYar7lcJF8NloHYkw-
zzQay&Iz{k<d&R;odoK6G*>St`W=P=5@E~8e8bi3wL^A#iN9<-I{E{hysL<)qCOzN;
zn?FLdoz+jt3!+#X2j>NIk=gB+7Mw>@bF;NF?9E|3X60sX4&ctAuXg%LBb+#^3UR1p
z>N?clEoeFXV|F`kcj|9F*wfN}O9hgPohq53p(}$E5Pm_~Ck6GFoUl%1ceyaI-q;&E
z9MqCJ?64T)ceC61Z#Xe|SV9xF9){}d;)kT<Vw9^-Ts`)7%HXa*sZqMMH&w%>P?sSN
zDOZ4X+`dI0;Zf2#!FgK&l4Il(UneCx-;-W#)~)gWYm{raRTH15Z2T0xVd5;;ZdY~K
z1=cKHOR`dU&LC}g5xf3)m>tH@Z|scw+lRYWK2G9aOdn%Ejk75iPiikkys8~lqjslg
z`vcr$HDkQz9y71hMGUf(cBfLFNmXs?kS;uDR0|iGb#S$T4Icgsu4W?rEwX^8c)}c4
zr)7!m>CAGOZ`5SkGL}-KCNn=J%X4|u2xQgq$(iAHwO^{Z$09nhSia>;=hcg-o#({0
zJ@BtB7BG+jIQ7G=M!FRM6=N5ZWde2uWUyQnw|Q1_BX$j3F`GwZ2Zza|3j>TNG^|%!
znzg(`Kth#6ABK?QFj5}R;(kER<#MjkRA0=h#7<pYYFUg7`MTtwmRa6!KK@WkrGPOO
zF`C`3v6z&x#3=o?H)@sUTEo5@+31}RR|8LaUrnxhyE@CXB(JU3!2wFui6r<JU~><0
z*V{n}rR)op{*tMxk(NO{kNE}bxUWm<G*g*NLyI{qbu>}MLm|n$57a5_hhvUW=eI}e
zn8;fJ+4M=~@VGkNLbh+?UjNYS$x>B}N_n5V86NOWv^61YVnw8%d+gPrt0Og@H8!$9
zR&x(ST^}kAQO(*2Wk5fiVH>N})}Y~#FP~D#rR3{WxlV1i`irgFNTd2f^Y+v~yVxAO
zGv#*crJ&~m>F4_yv5`Odg@cL4bB`wHy4&ObLlI+*c{K4CHDM=8y6IE1Rh`tb{snB|
zC<j_BOr?=V8fm2QKf%8$Q}s&MSh^?x001R)MObuXVRU6WV{&C-bY%cCFflMKF)%GM
zI8-q>IyEplF*YqQH##sd>Yf`|0000bbVXQnWMOn=I&E)cX=Zr<GB7bPEio`HGB{K*
zI65^jIx#jaFgH3dFq^}p<NyEw8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GP
RWjp`?002ovPDHLkV1kf{qptt}

literal 0
HcmV?d00001

diff --git a/samples/Support7Demos/res/drawable-mdpi/ic_launcher_settings.png b/samples/Support7Demos/res/drawable-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..05cdd9aa94e8edbdc270ea1ec109a2028520625f
GIT binary patch
literal 4122
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

literal 0
HcmV?d00001

diff --git a/samples/Support7Demos/res/layout/action_bar_display_options.xml b/samples/Support7Demos/res/layout/action_bar_display_options.xml
new file mode 100644
index 000000000..d4216f5dd
--- /dev/null
+++ b/samples/Support7Demos/res/layout/action_bar_display_options.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="vertical">
+        <Button android:id="@+id/toggle_home_as_up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_home_as_up" />
+        <Button android:id="@+id/toggle_show_home"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_show_home" />
+        <Button android:id="@+id/toggle_use_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_use_logo" />
+        <Button android:id="@+id/toggle_show_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_show_title" />
+        <Button android:id="@+id/toggle_show_custom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_show_custom" />
+        <Button android:id="@+id/toggle_navigation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_navigation" />
+        <Button android:id="@+id/cycle_custom_gravity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cycle_custom_gravity" />
+        <Button android:id="@+id/toggle_visibility"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_visibility" />
+        <Button android:id="@+id/toggle_system_ui"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/toggle_system_ui" />
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/samples/Support7Demos/res/layout/action_bar_display_options_custom.xml b/samples/Support7Demos/res/layout/action_bar_display_options_custom.xml
new file mode 100644
index 000000000..b7f5bd952
--- /dev/null
+++ b/samples/Support7Demos/res/layout/action_bar_display_options_custom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:text="@string/display_options_custom_button" />
diff --git a/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml b/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml
new file mode 100644
index 000000000..dd9807b74
--- /dev/null
+++ b/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:focusable="true"
+    android:addStatesFromChildren="true"
+    android:background="?android:attr/actionBarItemBackground"
+    style="?android:attr/actionButtonStyle">
+
+    <ImageButton android:id="@+id/button"
+        android:background="@drawable/ic_launcher_settings"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true" />
+
+</LinearLayout>
diff --git a/samples/Support7Demos/res/layout/action_bar_tab_content.xml b/samples/Support7Demos/res/layout/action_bar_tab_content.xml
new file mode 100644
index 000000000..c0aa7fade
--- /dev/null
+++ b/samples/Support7Demos/res/layout/action_bar_tab_content.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@+id/text"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content" />
diff --git a/samples/Support7Demos/res/layout/action_bar_tabs.xml b/samples/Support7Demos/res/layout/action_bar_tabs.xml
new file mode 100644
index 000000000..a51f46ef7
--- /dev/null
+++ b/samples/Support7Demos/res/layout/action_bar_tabs.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <FrameLayout android:id="@+id/fragment_content"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dip"
+                 android:layout_weight="1" />
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="0dip"
+                  android:layout_weight="1"
+                  android:orientation="vertical">
+        <Button android:id="@+id/btn_add_tab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_add_tab"
+                android:onClick="onAddTab" />
+        <Button android:id="@+id/btn_remove_tab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_remove_tab"
+                android:onClick="onRemoveTab" />
+        <Button android:id="@+id/btn_toggle_tabs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_toggle_tabs"
+                android:onClick="onToggleTabs" />
+        <Button android:id="@+id/btn_remove_all_tabs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_remove_all_tabs"
+                android:onClick="onRemoveAllTabs" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/samples/Support7Demos/res/menu/action_bar_settings_action_provider.xml b/samples/Support7Demos/res/menu/action_bar_settings_action_provider.xml
new file mode 100644
index 000000000..e9bb931c0
--- /dev/null
+++ b/samples/Support7Demos/res/menu/action_bar_settings_action_provider.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 Google Inc.
+
+     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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/menu_item_action_provider_action_bar"
+        android:title="@string/action_bar_settings"
+        app:showAsAction="ifRoom"
+        app:actionProviderClass="com.example.android.supportv7.app.ActionBarSettingsActionProviderActivity$SettingsActionProvider"/>
+
+    <item android:id="@+id/menu_item_action_provider_overflow"
+        android:title="@string/action_bar_settings"
+        app:showAsAction="never"
+        app:actionProviderClass="com.example.android.supportv7.app.ActionBarSettingsActionProviderActivity$SettingsActionProvider"/>
+</menu>
diff --git a/samples/Support7Demos/res/menu/actions.xml b/samples/Support7Demos/res/menu/actions.xml
new file mode 100644
index 000000000..fbae7b1c4
--- /dev/null
+++ b/samples/Support7Demos/res/menu/actions.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Google Inc.
+
+     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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_search"
+          android:icon="@android:drawable/ic_menu_search"
+          android:title="@string/action_bar_search"
+          app:showAsAction="ifRoom"
+          app:actionProviderClass="android.support.v7.widget.SearchActionProvider" />
+    <item android:id="@+id/action_add"
+          android:icon="@android:drawable/ic_menu_add"
+          android:title="@string/action_bar_add" />
+    <item android:id="@+id/action_edit"
+          android:icon="@android:drawable/ic_menu_edit"
+          android:title="@string/action_bar_edit"
+          app:showAsAction="always" />
+    <item android:id="@+id/action_share"
+          android:icon="@android:drawable/ic_menu_share"
+          android:title="@string/action_bar_share"
+          app:showAsAction="ifRoom" />
+    <item android:id="@+id/action_sort"
+          android:icon="@android:drawable/ic_menu_sort_by_size"
+          android:title="@string/action_bar_sort"
+          app:showAsAction="ifRoom">
+        <menu>
+            <item android:id="@+id/action_sort_size"
+                  android:icon="@android:drawable/ic_menu_sort_by_size"
+                  android:title="@string/action_bar_sort_size"
+                  android:onClick="onSort" />
+            <item android:id="@+id/action_sort_alpha"
+                  android:icon="@android:drawable/ic_menu_sort_alphabetically"
+                  android:title="@string/action_bar_sort_alpha"
+                  android:onClick="onSort" />
+        </menu>
+    </item>
+</menu>
diff --git a/samples/Support7Demos/res/menu/display_options_actions.xml b/samples/Support7Demos/res/menu/display_options_actions.xml
new file mode 100644
index 000000000..8feb6aace
--- /dev/null
+++ b/samples/Support7Demos/res/menu/display_options_actions.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/simple_item"
+          android:title="@string/display_options_menu_item" />
+</menu>
diff --git a/samples/Support7Demos/res/menu/sample_media_router_menu.xml b/samples/Support7Demos/res/menu/sample_media_router_menu.xml
index 404654fe9..aac1e967d 100644
--- a/samples/Support7Demos/res/menu/sample_media_router_menu.xml
+++ b/samples/Support7Demos/res/menu/sample_media_router_menu.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 <!-- TODO: Use MediaRouter support library -->
     <item android:id="@+id/menu_media_route"
         android:title="@string/sample_media_router_play_on"
diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml
index 2e8c281de..51a261aeb 100644
--- a/samples/Support7Demos/res/values/strings.xml
+++ b/samples/Support7Demos/res/values/strings.xml
@@ -19,7 +19,7 @@
 
     <!-- MediaRouter -->
 
-    <string name="sample_media_router_activity">Media/MediaRouter</string>
+    <string name="sample_media_router_activity">MediaRouter</string>
     <string name="sample_media_router_text">This activity demonstrates how to
             use MediaRouter from the support library.  Select a route from the action bar.</string>
     <string name="sample_media_router_play_on">Play on...</string>
@@ -32,8 +32,49 @@
     <string name="variable_volume_route_name">Variable Volume Remote Playback Route</string>
 
     <!-- GridLayout -->
+
+    <string name="grid_layout_1">GridLayout/1. Simple Form</string>
+    <string name="grid_layout_2">GridLayout/2. Form (XML)</string>
+    <string name="grid_layout_3">GridLayout/3. Form (Java)</string>
+
     <string name="grid_layout_1_instructions">Type here:</string>
     <string name="grid_layout_1_ok">Ok</string>
     <string name="grid_layout_1_cancel">Cancel</string>
 
+    <!-- ActionBar -->
+
+    <string name="action_bar_mechanics">AppCompat/Action Bar/Action Bar Mechanics</string>
+    <string name="action_bar_usage">AppCompat/Action Bar/Action Bar Usage</string>
+    <string name="action_bar_tabs">AppCompat/Action Bar/Action Bar Tabs</string>
+    <string name="action_bar_settings_action_provider">AppCompat/Action Bar/Settings Action Provider</string>
+    <string name="action_bar_settings_action_provider_no_handling">Handling in onOptionsItemSelected avoided</string>
+
+    <string name="action_bar_search">Search</string>
+    <string name="action_bar_add">Add</string>
+    <string name="action_bar_edit">Edit</string>
+    <string name="action_bar_share">Share</string>
+    <string name="action_bar_sort">Sort</string>
+    <string name="action_bar_sort_alpha">Alphabetically</string>
+    <string name="action_bar_sort_size">By size</string>
+    <string name="action_bar_settings">Settings</string>
+
+    <string name="action_bar_display_options">AppCompat/Action Bar/Display Options</string>
+    <string name="toggle_home_as_up">DISPLAY_HOME_AS_UP</string>
+    <string name="toggle_show_home">DISPLAY_SHOW_HOME</string>
+    <string name="toggle_use_logo">DISPLAY_USE_LOGO</string>
+    <string name="toggle_show_title">DISPLAY_SHOW_TITLE</string>
+    <string name="toggle_show_custom">DISPLAY_SHOW_CUSTOM</string>
+    <string name="toggle_navigation">Navigation</string>
+    <string name="cycle_custom_gravity">Cycle Custom View Gravity</string>
+    <string name="toggle_visibility">Toggle Visibility</string>
+    <string name="toggle_system_ui">Toggle System UI</string>
+
+    <string name="display_options_custom_button">Custom View!</string>
+    <string name="display_options_menu_item">Menu Item</string>
+
+    <string name="btn_add_tab">Add new tab</string>
+    <string name="btn_remove_tab">Remove last tab</string>
+    <string name="btn_toggle_tabs">Toggle tab mode</string>
+    <string name="btn_remove_all_tabs">Remove all tabs</string>
+
 </resources>
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/Support7Demos.java b/samples/Support7Demos/src/com/example/android/supportv7/Support7Demos.java
index d2e633540..a135649bd 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/Support7Demos.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/Support7Demos.java
@@ -56,7 +56,7 @@ public class Support7Demos extends ListActivity {
         List<Map<String, Object>> myData = new ArrayList<Map<String, Object>>();
 
         Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
-        mainIntent.addCategory("com.example.android.supportv7.SUPPORT4_SAMPLE_CODE");
+        mainIntent.addCategory("com.example.android.supportv7.SAMPLE_CODE");
 
         PackageManager pm = getPackageManager();
         List<ResolveInfo> list = pm.queryIntentActivities(mainIntent, 0);
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java
new file mode 100644
index 000000000..f35844372
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.supportv7.app;
+
+import com.example.android.supportv7.R;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBar.Tab;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.view.Menu;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+
+/**
+ * This demo shows how various action bar display option flags can be combined and their effects.
+ */
+public class ActionBarDisplayOptions extends ActionBarActivity
+        implements View.OnClickListener, ActionBar.TabListener {
+    private View mCustomView;
+    private ActionBar.LayoutParams mCustomViewLayoutParams;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.action_bar_display_options);
+
+        findViewById(R.id.toggle_home_as_up).setOnClickListener(this);
+        findViewById(R.id.toggle_show_home).setOnClickListener(this);
+        findViewById(R.id.toggle_use_logo).setOnClickListener(this);
+        findViewById(R.id.toggle_show_title).setOnClickListener(this);
+        findViewById(R.id.toggle_show_custom).setOnClickListener(this);
+        findViewById(R.id.toggle_navigation).setOnClickListener(this);
+        findViewById(R.id.cycle_custom_gravity).setOnClickListener(this);
+        findViewById(R.id.toggle_visibility).setOnClickListener(this);
+        findViewById(R.id.toggle_system_ui).setOnClickListener(this);
+
+        // Configure several action bar elements that will be toggled by display options.
+        mCustomView = getLayoutInflater().inflate(R.layout.action_bar_display_options_custom, null);
+        mCustomViewLayoutParams = new ActionBar.LayoutParams(
+                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+
+        final ActionBar bar = getSupportActionBar();
+        bar.setCustomView(mCustomView, mCustomViewLayoutParams);
+        bar.addTab(bar.newTab().setText("Tab 1").setTabListener(this));
+        bar.addTab(bar.newTab().setText("Tab 2").setTabListener(this));
+        bar.addTab(bar.newTab().setText("Tab 3").setTabListener(this));
+    }
+
+    @Override
+    public boolean onCreateSupportOptionsMenu(Menu menu) {
+        getSupportMenuInflater().inflate(R.menu.display_options_actions, menu);
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        final ActionBar bar = getSupportActionBar();
+        int flags = 0;
+        switch (v.getId()) {
+            case R.id.toggle_home_as_up:
+                flags = ActionBar.DISPLAY_HOME_AS_UP;
+                break;
+            case R.id.toggle_show_home:
+                flags = ActionBar.DISPLAY_SHOW_HOME;
+                break;
+            case R.id.toggle_use_logo:
+                flags = ActionBar.DISPLAY_USE_LOGO;
+                break;
+            case R.id.toggle_show_title:
+                flags = ActionBar.DISPLAY_SHOW_TITLE;
+                break;
+            case R.id.toggle_show_custom:
+                flags = ActionBar.DISPLAY_SHOW_CUSTOM;
+                break;
+            case R.id.toggle_navigation:
+                bar.setNavigationMode(
+                        bar.getNavigationMode() == ActionBar.NAVIGATION_MODE_STANDARD
+                                ? ActionBar.NAVIGATION_MODE_TABS
+                                : ActionBar.NAVIGATION_MODE_STANDARD);
+                return;
+            case R.id.cycle_custom_gravity: {
+                ActionBar.LayoutParams lp = mCustomViewLayoutParams;
+                int newGravity = 0;
+                switch (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
+                    case Gravity.LEFT:
+                        newGravity = Gravity.CENTER_HORIZONTAL;
+                        break;
+                    case Gravity.CENTER_HORIZONTAL:
+                        newGravity = Gravity.RIGHT;
+                        break;
+                    case Gravity.RIGHT:
+                        newGravity = Gravity.LEFT;
+                        break;
+                }
+                lp.gravity = lp.gravity & ~Gravity.HORIZONTAL_GRAVITY_MASK | newGravity;
+                bar.setCustomView(mCustomView, lp);
+                return;
+            }
+            case R.id.toggle_visibility:
+                if (bar.isShowing()) {
+                    bar.hide();
+                } else {
+                    bar.show();
+                }
+                return;
+            case R.id.toggle_system_ui:
+                if ((getWindow().getDecorView().getSystemUiVisibility()
+                        & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+                    getWindow().getDecorView().setSystemUiVisibility(0);
+                } else {
+                    getWindow().getDecorView().setSystemUiVisibility(
+                            View.SYSTEM_UI_FLAG_FULLSCREEN);
+                }
+                return;
+        }
+
+        int change = bar.getDisplayOptions() ^ flags;
+        bar.setDisplayOptions(change, flags);
+    }
+
+    @Override
+    public void onTabSelected(Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(Tab tab, FragmentTransaction ft) {
+    }
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java
new file mode 100644
index 000000000..da899b159
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.supportv7.app;
+
+import android.os.Bundle;
+import android.support.v4.view.WindowCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.view.Menu;
+import android.support.v7.view.MenuItem;
+import android.widget.Toast;
+
+/**
+ * This demonstrates the basics of the Action Bar and how it interoperates with the
+ * standard options menu. This demo is for informative purposes only; see ActionBarUsage for
+ * an example of using the Action Bar in a more idiomatic manner.
+ */
+public class ActionBarMechanics extends ActionBarActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // The Action Bar is a window feature. The feature must be requested
+        // before setting a content view. Normally this is set automatically
+        // by your Activity's theme in your manifest. The provided system
+        // theme Theme.WithActionBar enables this for you. Use it as you would
+        // use Theme.NoTitleBar. You can add an Action Bar to your own themes
+        // by adding the element <item name="android:windowActionBar">true</item>
+        // to your style definition.
+        supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR);
+    }
+
+    @Override
+    public boolean onCreateSupportOptionsMenu(Menu menu) {
+        // Menu items default to never show in the action bar. On most devices this means
+        // they will show in the standard options menu panel when the menu button is pressed.
+        // On xlarge-screen devices a "More" button will appear in the far right of the
+        // Action Bar that will display remaining items in a cascading menu.
+        menu.add("Normal item");
+
+        MenuItem actionItem = menu.add("Action Button");
+
+        // Items that show as actions should favor the "if room" setting, which will
+        // prevent too many buttons from crowding the bar. Extra items will show in the
+        // overflow area.
+        actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        // Items that show as actions are strongly encouraged to use an icon.
+        // These icons are shown without a text description, and therefore should
+        // be sufficiently descriptive on their own.
+        actionItem.setIcon(android.R.drawable.ic_menu_share);
+        return true;
+    }
+
+    @Override
+    public boolean onSupportOptionsItemSelected(MenuItem item) {
+        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
+        return true;
+    }
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
new file mode 100644
index 000000000..5c70b702f
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.example.android.supportv7.app;
+
+import com.example.android.supportv7.R;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.view.ActionProvider;
+import android.support.v7.view.Menu;
+import android.support.v7.view.MenuItem;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.Toast;
+
+/**
+ * This activity demonstrates how to implement an {@link android.view.ActionProvider}
+ * for adding functionality to the Action Bar. In particular this demo creates an
+ * ActionProvider for launching the system settings and adds a menu item with that
+ * provider.
+ */
+public class ActionBarSettingsActionProviderActivity extends ActionBarActivity {
+    @Override
+    public boolean onCreateSupportOptionsMenu(Menu menu) {
+        super.onCreateSupportOptionsMenu(menu);
+        getSupportMenuInflater().inflate(R.menu.action_bar_settings_action_provider, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onSupportOptionsItemSelected(MenuItem item) {
+        // If this callback does not handle the item click, onPerformDefaultAction
+        // of the ActionProvider is invoked. Hence, the provider encapsulates the
+        // complete functionality of the menu item.
+        Toast.makeText(this, R.string.action_bar_settings_action_provider_no_handling,
+                Toast.LENGTH_SHORT).show();
+        return false;
+    }
+
+    public static class SettingsActionProvider extends ActionProvider {
+        /** An intent for launching the system settings. */
+        private static final Intent sSettingsIntent = new Intent(Settings.ACTION_SETTINGS);
+
+        /**
+         * Creates a new instance.
+         *
+         * @param context Context for accessing resources.
+         */
+        public SettingsActionProvider(Context context) {
+            super(context);
+        }
+
+        @Override
+        public View onCreateActionView() {
+            // Inflate the action view to be shown on the action bar.
+            LayoutInflater layoutInflater = LayoutInflater.from(getContext());
+            View view = layoutInflater.inflate(R.layout.action_bar_settings_action_provider, null);
+            ImageButton button = (ImageButton) view.findViewById(R.id.button);
+            // Attach a click listener for launching the system settings.
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    getContext().startActivity(sSettingsIntent);
+                }
+            });
+            return view;
+        }
+
+        @Override
+        public boolean onPerformDefaultAction() {
+            // This is called if the host menu item placed in the overflow menu of the
+            // action bar is clicked and the host activity did not handle the click.
+            getContext().startActivity(sSettingsIntent);
+            return true;
+        }
+    }
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java
new file mode 100644
index 000000000..f0ee271e6
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.supportv7.app;
+
+import com.example.android.supportv7.R;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBar.Tab;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * This demonstrates the use of action bar tabs and how they interact
+ * with other action bar features.
+ */
+public class ActionBarTabs extends ActionBarActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.action_bar_tabs);
+    }
+
+    public void onAddTab(View v) {
+        final ActionBar bar = getSupportActionBar();
+        final int tabCount = bar.getTabCount();
+        final String text = "Tab " + tabCount;
+        bar.addTab(bar.newTab()
+                .setText(text)
+                .setTabListener(new TabListener(new TabContentFragment(text))));
+    }
+
+    public void onRemoveTab(View v) {
+        final ActionBar bar = getSupportActionBar();
+        if (bar.getTabCount() > 0) {
+            bar.removeTabAt(bar.getTabCount() - 1);
+        }
+    }
+
+    public void onToggleTabs(View v) {
+        final ActionBar bar = getSupportActionBar();
+
+        if (bar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS) {
+            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+            bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE);
+        } else {
+            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+            bar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
+        }
+    }
+
+    public void onRemoveAllTabs(View v) {
+        getSupportActionBar().removeAllTabs();
+    }
+
+    /**
+     * A TabListener receives event callbacks from the action bar as tabs
+     * are deselected, selected, and reselected. A FragmentTransaction
+     * is provided to each of these callbacks; if any operations are added
+     * to it, it will be committed at the end of the full tab switch operation.
+     * This lets tab switches be atomic without the app needing to track
+     * the interactions between different tabs.
+     *
+     * NOTE: This is a very simple implementation that does not retain
+     * fragment state of the non-visible tabs across activity instances.
+     * Look at the FragmentTabs example for how to do a more complete
+     * implementation.
+     */
+    private class TabListener implements ActionBar.TabListener {
+        private TabContentFragment mFragment;
+
+        public TabListener(TabContentFragment fragment) {
+            mFragment = fragment;
+        }
+
+        @Override
+        public void onTabSelected(Tab tab, FragmentTransaction ft) {
+            ft.add(R.id.fragment_content, mFragment, mFragment.getText());
+        }
+
+        @Override
+        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+            ft.remove(mFragment);
+        }
+
+        @Override
+        public void onTabReselected(Tab tab, FragmentTransaction ft) {
+            Toast.makeText(ActionBarTabs.this, "Reselected!", Toast.LENGTH_SHORT).show();
+        }
+
+    }
+
+    private class TabContentFragment extends Fragment {
+        private String mText;
+
+        public TabContentFragment(String text) {
+            mText = text;
+        }
+
+        public String getText() {
+            return mText;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View fragView = inflater.inflate(R.layout.action_bar_tab_content, container, false);
+
+            TextView text = (TextView) fragView.findViewById(R.id.text);
+            text.setText(mText);
+
+            return fragView;
+        }
+    }
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java
new file mode 100644
index 000000000..729e652bd
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.supportv7.app;
+
+import com.example.android.supportv7.R;
+
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.widget.SearchViewCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.view.Menu;
+import android.support.v7.view.MenuInflater;
+import android.support.v7.view.MenuItem;
+import android.view.View;
+import android.widget.SearchView;
+import android.widget.SearchView.OnQueryTextListener;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * This demonstrates idiomatic usage of the Action Bar. The default Honeycomb theme
+ * includes the action bar by default and a menu resource is used to populate the
+ * menu data itself. If you'd like to see how these things work under the hood, see
+ * ActionBarMechanics.
+ */
+public class ActionBarUsage extends ActionBarActivity {
+    TextView mSearchText;
+    int mSortMode = -1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSearchText = new TextView(this);
+        setContentView(mSearchText);
+    }
+
+    @Override
+    public boolean onCreateSupportOptionsMenu(Menu menu) {
+        MenuInflater inflater = getSupportMenuInflater();
+        inflater.inflate(R.menu.actions, menu);
+        View searchView = menu.findItem(R.id.action_search).getActionView();
+        SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareSupportOptionsMenu(Menu menu) {
+        if (mSortMode != -1) {
+            Drawable icon = menu.findItem(mSortMode).getIcon();
+            menu.findItem(R.id.action_sort).setIcon(icon);
+        }
+        return super.onPrepareSupportOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onSupportOptionsItemSelected(MenuItem item) {
+        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
+        return true;
+    }
+
+    // This method is specified as an onClick handler in the menu xml and will
+    // take precedence over the Activity's onOptionsItemSelected method.
+    // See res/menu/actions.xml for more info.
+    public void onSort(MenuItem item) {
+        mSortMode = item.getItemId();
+        // Request a call to onPrepareOptionsMenu so we can change the sort icon
+        supportInvalidateOptionsMenu();
+    }
+
+    // The following callbacks are called for the SearchView.OnQueryChangeListener
+    // For more about using SearchView, see src/.../view/SearchView1.java and SearchView2.java
+    private final SearchViewCompat.OnQueryTextListenerCompat mOnQueryTextListener =
+            new SearchViewCompat.OnQueryTextListenerCompat() {
+        @Override
+        public boolean onQueryTextChange(String newText) {
+            newText = newText.isEmpty() ? "" : "Query so far: " + newText;
+            mSearchText.setText(newText);
+            return true;
+        }
+
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+            Toast.makeText(ActionBarUsage.this,
+                    "Searching for: " + query + "...", Toast.LENGTH_SHORT).show();
+            return true;
+        }
+    };
+}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/_index.html b/samples/Support7Demos/src/com/example/android/supportv7/app/_index.html
index d203ffb6b..c316d1bfc 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/app/_index.html
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/_index.html
@@ -1,102 +1,33 @@
 
 <p>This section includes samples showing the use of the application
-package features of the static support library, in particular fragments
-and loaders.</p>
+package features of the static support library.</p>
 <ul>
-  <li><a href="#Fragment">Fragment</a></li>
-  <li><a href="#LoaderManager">LoaderManager</a></li>
+  <li><a href="#ActionBar">Action Bar</a></li>
 </ul>
 
 
-<h3 id="Fragment">Fragment</h3>
+<h3 id="ActionBar">Action Bar</h3>
 <dl>
-  <dt><a href="FragmentAlertDialogSupport.html">Fragment Alert Dialog</a></dt>
-  <dd>Demonstrates how to use a DialogFragment to show and manage an
-  AlertDialog.</dd>
-  
-  <dt><a href="FragmentArgumentsSupport.html">Fragment Arguments</a></dt>
-  <dd>Demonstrates how a fragment can be initialized with arguments,
-  supplying them either as an argument Bundle at runtime or XML attributes
-  in a &lt;fragment> tag.</dd>
-  
-  <dt><a href="FragmentContextMenuSupport.html">Fragment Context Menu</a></dt>
-  <dd>Demonstrates how to display and respond to a context menu that is
-  display from a fragment's view hierarchy.</dd>
-  
-  <dt><a href="FragmentCustomAnimationSupport.html">Fragment Custom Animation</a></dt>
-  <dd>Demonstrates the use of a custom animation for pushing and popping fragments
-  on the back stack.</dd>
+  <dt><a href="ActionBarMechanics.html">Action Bar Mechanics</a></dt>
+  <dd>Demonstrates the basics of the Action Bar and how it interoperates with the standard options
+menu. This demo is for informative purposes only; see Usage for an example of using the
+Action Bar in a more idiomatic manner.</dd>
 
-  <dt><a href="FragmentDialogSupport.html">Fragment Dialog</a></dt>
-  <dd>Demonstrates use of DialogFragment to show various types of dialogs.</dd>
-  
-  <dt><a href="FragmentDialogOrActivitySupport.html">Fragment Dialog or Activity</a></dt>
-  <dd>Demonstrates how the same Fragment implementation can be used to provide the UI
-  for either an Activity or Dialog.</dd>
-  
-  <dt><a href="FragmentHideShowSupport.html">Fragment Hide Show</a></dt>
-  <dd>Demonstrates hiding and showing fragments.</dd>
-  
-  <dt><a href="FragmentLayoutSupport.html">Fragment Layout</a></dt>
-  <dd>Demonstrates use of the &lt;fragment&gt; tag to embed a Fragment in
-  an Activity's content view layout, and making the layout change based on
-  configuration to achieve different UI flows.</dd>
-  
-  <dt><a href="FragmentListArraySupport.html">Fragment List Array</a></dt>
-  <dd>Demonstrates use of ListFragment to show the contents of a simple ArrayAdapter.</dd>
-  
-  <dt><a href="FragmentMenuSupport.html">Fragment Menu</a></dt>
-  <dd>Demonstrates populating custom menu items from a Fragment.</dd>
-  
-  <dt><a href="FragmentPagerSupport.html">Fragment Pager Support</a></dt>
-  <dd>Demonstrates the use of the support class ViewPager with a
-  FragmentPagerAdapter to build a user interface where the user can fling
-  left or right to switch between fragments.</dd>
+  <dt><a href="ActionBarTabs.html">Action Bar Tabs</a></dt>
+  <dd>Demonstrates the use of Action Bar tabs and how they interact with other action bar
+features.  Also see the <a href="FragmentTabs.html">Fragment Tabs</a> for a more
+complete example of how to switch between fragments.</dd>
 
-  <dt><a href="FragmentStatePagerSupport.html">Fragment State Pager Support</a></dt>
-  <dd>Demonstrates the use of the support class ViewPager with a
-  FragmentStatePagerAdapter to build a user interface where the user can fling
-  left or right to switch between fragments.  This versions of the adapter
-  doesn't keep around the fragment instances that ViewPager has destroyed.</dd>
+  <dt><a href="ActionBarUsage.html">Action Bar Usage</a></dt>
+  <dd>Demonstrates simple usage of the Action Bar, including a SearchView as an action item. The
+default Honeycomb theme includes the Action Bar by default and a menu resource is used to populate
+the menu data itself. If you'd like to see how these things work under the hood, see
+Mechanics.</dd>
 
-  <dt><a href="FragmentReceiveResultSupport.html">Fragment Receive Result</a></dt>
-  <dd>Demonstrates starting a new Activity from a Fragment, and receiving
-  a result back from it.</dd>
-  
-  <dt><a href="FragmentRetainInstanceSupport.html">Fragment Retain Instance</a></dt>
-  <dd>Demonstrates a Fragment can be used to easily retain active state across
-  an Activity's configuration change.</dd>
-  
-  <dt><a href="FragmentStackSupport.html">Fragment Stack</a></dt>
-  <dd>Demonstrates creating a stack of Fragment instances similar to the
-  traditional stack of activities.</dd>
-  
-  <dt><a href="FragmentTabs.html">Fragment Tabs</a></dt>
-  <dd>Demonstrates the use of fragments to implement switching between
-  tabs in a TabHost.</dd>
-
-  <dt><a href="FragmentTabsPager.html">Fragment Tabs Pager</a></dt>
-  <dd>Demonstrates the use of fragments to implement switching between
-  tabs in a TabHost, using a ViewPager to manager the fragments so that
-  the user can also fling left and right to switch tabs.</dd>
+  <dt><a href="ActionBarActionProviderSettingsActivity.html">Settings Action Provider</a></dt>
+  <dd>Shows how to implement an ActionProvider for launching the system settings that supplies a
+  menu item with a specialized action view and handles standard menu item clicks in one place.</dd>
 
+  <dt><a href="ActionBarDisplayOptions.html">Display Options</a></dt>
+  <dd>Shows how various Action Bar display option flags can be combined and their effects.</dd>
 </dl>
-
-<h3 id="LoaderManager">LoaderManager</h3>
-<dl>
-  <dt><a href="LoaderCursorSupport.html">Loader Cursor</a></dt>
-  <dd>Demonstrates use of LoaderManager to perform a query for a Cursor that
-  populates a ListFragment.</dd>
-
-  <dt><a href="LoaderCustomSupport.html">Loader Custom</a></dt>
-  <dd>Demonstrates implementation and use of a custom Loader class.  The
-  custom class here "loads" the currently installed applications.</dd>
-  
-  <dt><a href="LoaderThrottleSupport.html">Loader Throttle</a></dt>
-  <dd>Complete end-to-end demonstration of a simple content provider that
-  populates data in a list through a cursor loader.  The UI allows the list
-  to be populated with a series of items, showing how AsyncTaskLoader's
-  throttling facility can be used to control how much a Loader is refreshed
-  in this case.</dd>
-</dl>
- 
\ No newline at end of file
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/_index.html b/samples/Support7Demos/src/com/example/android/supportv7/media/_index.html
index a443287cc..0802cae76 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/_index.html
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/_index.html
@@ -2,20 +2,20 @@
 <p>This section includes samples showing the use of the application
 package features of the static support library.</p>
 <ul>
-  <li><a href="#MediaRouter">MediaRouter</a></li>
+  <li><a href="#MediaRouter">Media Router</a></li>
 </ul>
 
 
-<h3 id="MediaRouter">MediaRouter</h3>
+<h3 id="MediaRouter">Media Router</h3>
 <dl>
   <dt><a href="SampleMediaRouteProvider.html">Media Route Provider</a></dt>
   <dd>Demonstrates how to implement a MediaRouteProvider to discover,
   publish and control custom media routes.</dd>
-  
+
   <dt><a href="SampleMediaRouteProviderService.html">Media Route Provider Service</a></dt>
   <dd>Demonstrates how to make a MediaRouteProvider available to all
   running applications by registering it as a service.</dd>
-  
+
   <dt><a href="SampleMediaRouterActivity.html">Media Router Activity</a></dt>
   <dd>Demonstrates how to use MediaRouter within an Activity to support
   remote media playback.</dd>
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/view/_index.html b/samples/Support7Demos/src/com/example/android/supportv7/view/_index.html
new file mode 100644
index 000000000..072967a1a
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/view/_index.html
@@ -0,0 +1,22 @@
+
+<p>This section includes samples showing the use of the view
+package features of the static support library.</p>
+<ul>
+  <li><a href="#GridLayout">Grid Layout</a></li>
+</ul>
+
+
+<h3 id="GridLayout">Grid Layout</h3>
+<dl>
+  <dt><a href="GridLayout1.html">Grid Layout Simple Form</a></dt>
+  <dd>Demonstrates how to use GridLayout to create a simple data entry form.</dd>
+
+  <dt><a href="GridLayout2.html">Grid Layout Form (XML)</a></dt>
+  <dd>Demonstrates how to use GridLayout to create a more complex
+  data entry form using XML layout resources.</dd>
+
+  <dt><a href="GridLayout3.html">Grid Layout Form (Java)</a></dt>
+  <dd>Demonstrates how to use GridLayout to create a more complex
+  data entry form programmatically.</dd>
+</dl>
+ 
\ No newline at end of file