From ce470e17fd4298c1b8aa9a5fd7493bde7a6be840 Mon Sep 17 00:00:00 2001
From: Peter Ng
The title introduces the content of your dialog. It can, for example, identify the name of a - setting that the user is about to change, or request a decision.
-Dialog content varies widely. For settings dialogs, a dialog may contain UI elements such as - sliders, text fields, checkboxes, or radio buttons that allow the user to change app or system - settings. In other cases, such as alerts, the content may consist solely of text that provides - further context for a user decision.
-Action buttons are typically Cancel and/or OK, with OK indicating the preferred or most likely - action. However, if the options consist of specific actions such as Close or Wait rather than - a confirmation or cancellation of the action described in the content, then all the buttons - should be active verbs. As a rule, the dismissive action of a dialog is always on the left - whereas the affirmative actions are on the right.
-The title introduces the content of your dialog. It can, for example, identify the name of a + setting that the user is about to change, or request a decision.
+Dialog content varies widely. For settings dialogs, a dialog may contain UI elements such as + sliders, text fields, checkboxes, or radio buttons that allow the user to change app or system + settings. In other cases, such as alerts, the content may consist solely of text that provides + further context for a user decision.
+Action buttons are typically Cancel and/or OK, with OK indicating the preferred or most likely action. However, if the options consist of specific actions such as Close or Wait rather than a confirmation or cancellation of the action described in the content, then all the buttons should be active verbs. Order actions following these rules:
+
diff --git a/docs/html/design/building-blocks/index.jd b/docs/html/design/building-blocks/index.jd
index d915aae51abfe..e554775679156 100644
--- a/docs/html/design/building-blocks/index.jd
+++ b/docs/html/design/building-blocks/index.jd
@@ -11,7 +11,7 @@ footer.hide=1
#text-overlay {
position: absolute;
left: 0;
- top: 472px;
+ top: 520px;
width: 450px;
}
diff --git a/docs/html/design/building-blocks/tabs.jd b/docs/html/design/building-blocks/tabs.jd
index 19ed1c3ff1354..8a2eb41455b55 100644
--- a/docs/html/design/building-blocks/tabs.jd
+++ b/docs/html/design/building-blocks/tabs.jd
@@ -6,6 +6,7 @@ page.title=Tabs
Tabs in the action bar make it easy to explore and switch between different views or functional aspects of your app, or to browse categorized data sets.
+For details on using gestures to move between tabs, see the Swipe Views pattern.
Fixed tabs display all items concurrently. To navigate to a different view, touch the tab.
+Fixed tabs display all items concurrently. To navigate to a different view, touch the tab, or swipe left or right.
HM366zm8;}H6z&V>L^lSh;nrnB~I+&`Jc
zD2nreM9XnwfgLB?g92D~%j`^Ysz93(drf#mu-oGjux3z64IYDJXcfe9z4V^15d#1o
zt61#zEiU(g{0d8}Mp%g4#Kea@<^|Vtx=sLwT)Ay5-2$sh+ZBA!Jr7-UV&Ne&FcwYY
zJ=x1~756$7d|~{Yam22)KT%f3Z4f0PW<1<$U8(8g#RXx1oYi79W%}05r^BHL2VG_q12t*(UG~rZi)6m(sGcAHnYMj4
zmz-g#{TBi!JV;efL%mihDdUG829wSv0)eSY#kIn}YZE^-=c_T#QRR|o+XaeR1Sc+=
zSOJrx7dB3$&;x(QTEk!1G;F_3b&H+hL?jo;lwA(g07~VUmd@^T;+sG+|go)nCH5j@DY--7>M0L8VL8N8Fg<
zqkdlllh=4r*A6;+uh+h!ek @M}_&cquQgrnsUX4m~)>L+dB~i|yG@9`LQaTJn71K0o
zF$bpLGN 5!&7}1L&W6>M2__9f2K2^2K&0z<=eHSL}FLTU* g?kLO0nN$)9J}DW@(%U!u)L;~olAKauNhDbFO^(eLkuNis
zcqGkXTiY^1)yXi;<=-bAEo)5%^4;DF++?UAsadsxCG+fG{W6;8Ba7^^_kZ6PN-t$_
z$z6JJi?uaVD%)zVV4PKi(6n^-`RimdWky#$0{9CyQMJ|w5MOM7A6A{VR%AX*5;I6e
zr(P+} ($b)-0(w7ZPUX>C{YCe6{=ytd
z`My^xIS92b7#jwyVb
zTlE|%f^=^fPdWXWQeRj96=gdy^!r05c(cN5*TV=N$z^rk?#K?z=g9xvuPru|D|?1q
z41$SIc05$cR#JVBJ5ki=0MF9;PHRF5n}uMxp%T!42X8!+t`}ZBIVor~lBFe;cm=on
z014a`-c>wf`d;zk^z)7XKymeDc^f?&wqLl$rk!Ra*!yK81-JNQ;S=D{Mm)MN{IWQg
zJ|+4Imr)HBP|WmU#V?A%z}n|cNA-w&G+i9SY~`b5g;mp+WM%x=d`S2^tx
*6VlcJ3|Z7`xl)HL7QU|H(flz8YxPc=a%ZgeGip41HaRq
zGas)(ZZQkOIngyWx#O`#!#r{g9riC2_IWqOWoBfc#JgUr^7$6UPE%YJPfM0cmtU%V
zsw~qkr{-;)=1E9@5ndNwHznF-|V_*OJ*R3awpW_P`K|Mwm5zMcyt{Nv}!@rDOvg|zGeHTdSR&am>q;*wx
!aK_Y*Sg9
zmon1@xO2})&KcYcxZmzMid(_Rt;%t2Mozt5PA^L@)t4Lp*=Mu~1xDv^iJIzln#IM$
z#OB2*bLDwBAq5C?^pNIP)s_KY!M+fDzvBTuWPHinZts5gyWzd>eeaeXuPD^wJ@?%I
zug{%(Dq^tPXN4tq
z9c^PLcRVg)-wRaE>7Z@~pm%LEk5h50AU+#GWBO>W`(|%KCAn!6s#S}#>e-R8WMt<4
zM3q~GgDWO>XPck@HDp)x+9;ku@SxOIF$?8@F~4WLJ}IS#cQ(N9Q;FlY*j7gG&EOs#
zIB@WHUw--2Prmr#i=KmuJbU~>8qUp|H!UwNt!mlLwQY-{a@%*&XrSkV-KMjji;8o9
zcSVi+oU=
a=1<*EGU}tE+J&+2;70srqh-)if
zV?@r@JXokee$JsOR8-wF6zpv1HgvyOF-JpAt#}*jLy3urZ8hL0&u!bh%~iB@RnV*X
zqN+3Eiup+r&aGRq)5c@%6_&6?3AsQ2^FI$qjvTq=<6ORcdH=^g_Obu#^y$+}RvE|q
zp#CfZeEc23y_3J3hqlot;W7tka(_lX+@+-@3+}I8y=uWdr?JjyhjYNJE$KA(eOKaUAL;`a
z-JM6JB(7S@Rmbh)7|a_L?gE3Z9b9$Q_*!$+n|YH!`vTUu@7n-%jvA92Px0?L$ox<6P85}M*;qQjy_`!G_Q>ivQ|H6w^6p`a|{GRt8
zL9(qKuNYZ8G?m0_W)tG+CM3=s#jzZ}m%4_tIg^8Yx_^v=`(x1|w3Wm;QQ<9`
zG|8w<+