Commit Graph

41 Commits

Author SHA1 Message Date
Sriram Ramasubramanian
0d795683b3 Bug 823644: Base TextAppearances for the application. [r=mfinkle]
--HG--
extra : rebase_source : 2321d6b1215713dc191710fcb6c80793b917cc44
2013-03-14 11:44:09 -07:00
Sriram Ramasubramanian
79be486e54 Bug 823644: Cleanup list-view style. [r=mfinkle]
--HG--
extra : rebase_source : 0d806581a999edf580221e4c9dabe913928ea1e5
2013-03-13 16:59:02 -07:00
Sriram Ramasubramanian
feb64d8f1b Bug 823644: Base theme for Fennec. [r=mfinkle]
--HG--
extra : rebase_source : e65143bdcbcc334b8d239bfb495f27583d8fd05f
2013-03-13 15:04:50 -07:00
Sriram Ramasubramanian
5297e59f65 Bug 846396: Settings screen in blue. [r=wesj] 2013-02-28 15:27:51 -08:00
Sriram Ramasubramanian
e34d7b5105 Bug 844984: Remove overdraw in Awesomebar. [r=bnicholson] 2013-02-25 12:15:00 -08:00
Wes Johnston
0e62162ed2 Bug 840267 - Use light UI for Sync JPAKE setup. r=rnewman 2013-02-22 16:05:36 -08:00
Sriram Ramasubramanian
809df9c68e Bug 840346: Flat URL bar. [r=mfinkle]
--HG--
extra : rebase_source : 25e8b78e6ef97e3bb1e0ccb701bd98d9d1b24e4c
2013-02-13 08:50:56 -08:00
Wes Johnston
46eec1d2bb Bug 832321 - Use Light Android theme in all of Fennec. r=sriram 2013-01-22 16:40:13 -08:00
Sriram Ramasubramanian
4a0d986b15 Bug 831402: Use android spinners for tablets. [r=mfinkle]
--HG--
extra : rebase_source : dff6de264cd969f4c075c0636257c3434ecfcdd5
2013-01-16 11:11:03 -08:00
Sriram Ramasubramanian
43d0709454 Bug 818238: A GeckoPopupMenu for tabs-tray. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable-hdpi/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable-hdpi/ic_menu_synced_tabs.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_synced_tabs.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable/ic_menu_synced_tabs.png
extra : rebase_source : 1021520012fa821a283f4dfab780a73503f4d49e
2012-12-04 13:13:24 -08:00
Sriram Ramasubramanian
fcfb1d38d7 Bug 708707: Fennec home screen widget. [r=mfinkle]
--HG--
extra : rebase_source : 63871fd8412c45931e8739b1550ebf537638549f
2012-10-19 11:15:06 -07:00
Wes Johnston
04371ea4f2 Bug 793197 - Use a custom list item style in our custom listViews. r=sriram 2012-10-02 18:58:01 -07:00
Wes Johnston
444a60fb94 Bug 793162 - Use default Fennec theme for Webapps. r=mfinkle 2012-09-24 14:52:25 -07:00
Sriram Ramasubramanian
c8acb908f5 Bug 785994: Replace arrows in custom menu. [r=mfinkle]
--HG--
extra : rebase_source : dbefd9c70d3be1189f238830f133a17c559b75dc
2012-09-19 14:41:14 -07:00
Sriram Ramasubramanian
5e62f57686 Bug 785994: Use ListView for custom menu. [r=mfinkle]
--HG--
extra : rebase_source : 64fa013dca7844e77b41c1a87a163665d91bdf47
2012-09-19 10:32:01 -07:00
Wes Johnston
10d64e8289 Bug 780759 - Show a splashscreen when webapps launch. r=mfinkle 2012-09-19 10:24:26 -07:00
Nick Alexander
3152c26530 Bug 773293 - part 1/2: Make checkboxes in Android Sync Send Tab To Device activity match Fennec checkboxes. r=rnewman
--HG--
extra : rebase_source : c7e7367eae1135b070f9226086e4c3cf5245283c
2012-08-30 12:17:38 -07:00
Sriram Ramasubramanian
c7ee833995 Bug 778438: ActionBar crash on Awesomebar. [r=mfinkle] 2012-07-30 14:21:29 -07:00
Sriram Ramasubramanian
d17dd1f83a Bug 770928: Enable default text interaction on honeycomb+. [r=mbrubeck] 2012-07-26 23:56:53 -07:00
Sriram Ramasubramanian
ab100b6124 Bug 776309: Support for 7" tablet-ish + phone-ish interface. [r=mbrubeck]
--HG--
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/reader.png => mobile/android/base/resources/drawable-large-hdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-hdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-hdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/tab_new.png => mobile/android/base/resources/drawable-large-hdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_bg.xml => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/reader.png => mobile/android/base/resources/drawable-large-mdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-mdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-mdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/tab_new.png => mobile/android/base/resources/drawable-large-mdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/reader.png => mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-xhdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-xhdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/tab_new.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/layout-xlarge/doorhangerpopup.xml => mobile/android/base/resources/layout-large-v11/doorhangerpopup.xml
rename : mobile/android/base/resources/layout-xlarge/site_identity_popup.xml => mobile/android/base/resources/layout-large-v11/site_identity_popup.xml
rename : mobile/android/base/resources/layout-xlarge/gecko_app.xml => mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in
rename : mobile/android/base/resources/layout-xlarge/tabs_panel_toolbar_menu.xml => mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml
rename : mobile/android/base/resources/layout/gecko_app.xml => mobile/android/base/resources/layout/gecko_app.xml.in
rename : mobile/android/base/resources/values-xlarge/styles.xml => mobile/android/base/resources/values-xlarge-v11/styles.xml
extra : rebase_source : a36dfaae46a01769dadcf2f70756f35e19f5bbe6
2012-07-23 13:08:48 -07:00
Sriram Ramasubramanian
5bacfc0376 Bug 739364: Change awesomescreen backgrounds to be lighter blue. [r=mfinkle] 2012-07-02 11:22:29 -07:00
Sriram Ramasubramanian
4bf4ca7db1 Bug 762724: Tabs button arrows should change direction on expand/collapse. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-mdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable/tabs_carat.png => mobile/android/base/resources/drawable/tabs_carat_contracted.png
2012-06-14 11:19:06 -07:00
Sriram Ramasubramanian
acc455e350 Bug 739407: Make Tabs UI tablet ready. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi/tabs_more.png => mobile/android/base/resources/drawable-hdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/tabs_more.png => mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/tabs_more.png => mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_more.png => mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_more.png => mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_more.png => mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_more.png => mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/tabs_more.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/tabs_more.png => mobile/android/base/resources/drawable-xlarge-hdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/tabs_more.png => mobile/android/base/resources/drawable-xlarge-mdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_more.png => mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable/tabs_more.png => mobile/android/base/resources/drawable/tabs_carat.png
rename : mobile/android/base/resources/drawable/tabs_tray_list_selector.xml => mobile/android/base/resources/drawable/tabs_tray_default_selector.xml
2012-06-07 21:47:22 -07:00
Sriram Ramasubramanian
c2e1967d15 Bug 739412: Support custom menu for post-honeycomb devices. [r=mfinkle] 2012-05-31 16:01:50 -07:00
Matt Brubeck
737347a966 Back out 202d63933120 and 6a232df5e065 (bug 739412, bug 760196) because of Android startup crashes 2012-05-31 14:41:35 -07:00
Sriram Ramasubramanian
1502c921c0 Bug 739412: Support custom menu for post-honeycomb devices. [r=mfinkle] 2012-05-31 11:12:24 -07:00
Sriram Ramasubramanian
0faa1d9ef7 Bug 758798: Liberate TextSwitcher from magic numbers. [r=mfinkle] 2012-05-25 15:10:26 -07:00
Gervase Markham
ca171eec44 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Sriram Ramasubramanian
742cef1cde Bug 715274: Fix lists in AwesomeScreen. [r=mfinkle, r=margaret] 2012-03-26 14:39:24 -07:00
Sriram Ramasubramanian
b58a9172f7 Bug 727454: BrowserToolbar inflation crash in ActionBar. [r=mfinkle] 2012-03-20 17:23:06 -07:00
Sriram Ramasubramanian
7eb76a5b8a Bug 735209: No application icon in AwesomeBar's clipboard bar. [r=mfinkle] 2012-03-13 11:59:02 -07:00
Sriram Ramasubramanian
b8485b6b52 Bug 714131: Default clipboard-bar in AwesomeBar in ICS. [r=mfinkle] 2012-03-12 12:15:57 -07:00
Sriram Ramasubramanian
d9f7afff3b Bug 706819: Show tabs-tray faster. [r=mfinkle] 2012-02-13 16:54:36 -08:00
Sriram Ramasubramanian
4abd44528f Bug 711746: ActionBar should be loaded in XML to avoid temporary title screen. [r=mfinkle] 2012-02-13 10:23:09 -08:00
Brad Lassey
0b9e0f45df bug 705874 - Binary XML file line #6: Error inflating class org.mozilla.gecko.BrowserToolbar (Startup crash on Android 2.1) r=mfinkle 2012-01-31 01:26:37 -05:00
Sriram Ramasubramanian
fbad323c22 Bug 713402: Tabs not shown in awesomescreen in honeycomb. [r=mfinkle] 2012-01-27 11:58:18 -08:00
Sriram Ramasubramanian
2c20f8a1f8 Bug 712687: ICS should use a different layout for landscape mode. [r=mfinkle] 2012-01-27 11:19:13 -08:00
Sriram Ramasubramanian
5a12e11890 Bug 711428: Awesomescreen tab indicators needs to be curved [r=mfinkle] 2011-12-20 12:53:56 -08:00
Sriram Ramasubramanian
fef6457c68 Bug 708700: New url bar size and styling [r=mfinkle] 2011-12-15 11:53:04 -08:00
Sriram Ramasubramanian
9e30346ac5 Bug 702264: Patch 2: Honeycomb/ICS needs action bar support [r=mfinkle] 2011-11-23 11:04:47 -08:00
Sriram Ramasubramanian
021960d0d0 Bug 702264: Patch 1: Fixing the styles and themes for ICS [r=mfinkle] 2011-11-23 00:01:38 -08:00