Commit Graph

3025 Commits

Author SHA1 Message Date
Richard Newman
ab9b34d533 Merge m-c to s-c (including fixed conflict in Android Sync manifest).
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
2012-12-15 17:08:14 -08:00
Richard Newman
ab14f18666 Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman
b4da9b8cbd Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Lucas Rocha
86b0266f4a Bug 818021 - Use fade out transition when leaving awesome screen (r=mfinkle) 2012-12-05 16:46:17 +00:00
Jim Chen
b9f544bb42 Bug 815430 - Fix IME status notification handling; r=cpeterson 2012-12-05 11:10:33 -05:00
Jim Chen
29d213ac6c Bug 811755 - Synchronize selection when selection changes due to events; r=cpeterson 2012-12-05 11:09:56 -05:00
Jim Chen
c925add927 Bug 811755 - Preserve selection and spans during replacement actions; r=cpeterson 2012-12-05 11:09:56 -05:00
Jim Chen
486bfd2aa1 Bug 811755 - Discard stale selection notifications after text change; r=cpeterson 2012-12-05 11:09:55 -05:00
Richard Newman
a0afd2733e Merge m-c to s-c. 2012-12-04 15:00:07 -08:00
Richard Newman
90ef727123 Merge m-c to s-c (with resource merges in mobile/android/base/resources/drawable/).
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in
rename : mobile/android/base/resources/drawable/address_bar_url.xml => mobile/android/base/resources/drawable/address_bar_url.xml.in
rename : mobile/android/base/resources/drawable/menu_level.xml => mobile/android/base/resources/drawable/menu_level.xml.in
rename : mobile/android/base/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml.in
rename : mobile/android/base/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml.in
2012-12-02 00:32:38 -08:00
Jonathan Griffin
b26796145f Merge m-c to s-c so that bug 815807 won't break B2G tests on this tree 2012-11-29 17:50:09 -08:00
Richard Newman
262aa85bc2 Merge m-c to s-c. 2012-11-27 21:24:41 -08:00
Richard Newman
a133ef7d87 Merge m-c to s-c. 2012-11-23 17:18:45 -08:00
Richard Newman
cf8be64b6d Merge m-c to s-c. 2012-11-21 09:37:58 -08:00
Richard Newman
98e4f59aad Merge m-c to s-c. 2012-11-19 18:10:54 -08:00
Michael Comella
187fb15356 Bug 788106 - Band-aid ArrayIndexOutOfBoundsException. r=bnicholson 2012-11-20 20:28:35 -05:00
Michael Comella
22c77635ac Bug 788106 - Remove excess whitespace. r=bnicholson 2012-11-20 20:28:34 -05:00
Sriram Ramasubramanian
2cb0293649 Bug 818238: Menu button in tabs-tray needs a touch delegate. [r=mfinkle] 2012-12-04 13:15:50 -08:00
Sriram Ramasubramanian
5766a8aed0 Back out d1bb44812701 because it landed with the wrong bug number 2012-12-04 16:45:20 -08:00
Sriram Ramasubramanian
0c4f4d4e7f Bug 818071: Change the menu icons to 3-dots. [r=mfinkle]
--HG--
extra : rebase_source : 4cefa57061fdb31aa8159757197779dee46f9567
2012-12-04 14:22:56 -08:00
Sriram Ramasubramanian
af472214f8 Bug 818328: Menu button in tabs-tray needs a touch delegate. [r=mfinkle]
--HG--
extra : rebase_source : 82ba1dd6fd3f88566b9c9f29a9723526646ce959
2012-12-04 13:15:50 -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
a8d6a737cc Bug 818229: Support a GeckoPopupMenu for the custom menu. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/menu.png => mobile/android/base/resources/drawable-hdpi/menu.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_item_check.png => mobile/android/base/resources/drawable-hdpi/menu_item_check.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_item_more.png => mobile/android/base/resources/drawable-hdpi/menu_item_more.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_item_uncheck.png => mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_panel_bg.9.png => mobile/android/base/resources/drawable-hdpi/menu_panel_bg.9.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_pb.png => mobile/android/base/resources/drawable-hdpi/menu_pb.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_popup_arrow.png => mobile/android/base/resources/drawable-hdpi/menu_popup_arrow.png
rename : mobile/android/base/resources/drawable-hdpi-v11/menu_popup_bg.9.png => mobile/android/base/resources/drawable-hdpi/menu_popup_bg.9.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu.png => mobile/android/base/resources/drawable-xhdpi/menu.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_item_check.png => mobile/android/base/resources/drawable-xhdpi/menu_item_check.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_item_more.png => mobile/android/base/resources/drawable-xhdpi/menu_item_more.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_item_uncheck.png => mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_panel_bg.9.png => mobile/android/base/resources/drawable-xhdpi/menu_panel_bg.9.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_pb.png => mobile/android/base/resources/drawable-xhdpi/menu_pb.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_arrow.png => mobile/android/base/resources/drawable-xhdpi/menu_popup_arrow.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_bg.9.png => mobile/android/base/resources/drawable-xhdpi/menu_popup_bg.9.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu.png => mobile/android/base/resources/drawable/menu.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_item_check.png => mobile/android/base/resources/drawable/menu_item_check.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_item_more.png => mobile/android/base/resources/drawable/menu_item_more.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_item_uncheck.png => mobile/android/base/resources/drawable/menu_item_uncheck.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_panel_bg.9.png => mobile/android/base/resources/drawable/menu_panel_bg.9.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_pb.png => mobile/android/base/resources/drawable/menu_pb.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_popup_arrow.png => mobile/android/base/resources/drawable/menu_popup_arrow.png
rename : mobile/android/base/resources/drawable-mdpi-v11/menu_popup_bg.9.png => mobile/android/base/resources/drawable/menu_popup_bg.9.png
extra : rebase_source : ffd0e90fd625b66b999bdf655d3848144e062e05
2012-12-04 13:12:09 -08:00
Sriram Ramasubramanian
46c17be0ae Bug 818229: Refactor menu code to have different menu-presenters. [r=mfinkle]
--HG--
extra : rebase_source : 9c7e3a2e5000896cab04130824489542b40476ad
2012-12-04 13:12:04 -08:00
Ed Morley
576db2fb47 Backout 5971115a94d2 (bug 811445's test) for causing bug 817336 2012-12-04 21:37:22 +00:00
Peter Retzer
0429281eba Bug 784297 - Thumbnail for about:home is out of date/incorrect. [r=sriram]
--HG--
extra : rebase_source : 916eb3a43f9a564d4f85dca19a9d51c73799e140
2012-12-03 12:30:51 -08:00
Michael Kohler
4d62532187 Bug 733754 - Deactivate the 'OK' button if there is no text entered in Master Password credentials textbox. r=bnicholson 2012-12-03 12:22:05 -08:00
Brian Nicholson
43a47c2865 Bug 816902 - Prevent suggestion prompt buttons from being clicked multiple times. r=mfinkle 2012-12-03 12:08:15 -08:00
Kartikaya Gupta
d96543beb0 Bug 817067 - Introduce a ThumbnailHelper to deal with thumbnailing of pages. r=cpeterson, gcp 2012-12-03 14:27:34 -05:00
Sriram Ramasubramanian
7b7954aa61 Bug 817138: Private browsing support for Back/Forward buttons. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/address_bar_back_button.xml => mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
extra : rebase_source : 402a8d8202172a3480b8a10bd1e36ba107b9340b
2012-11-30 13:22:49 -08:00
Sriram Ramasubramanian
8bdeb3fdaa Bug 817138: Re-create back/forward button in code. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/address_bar_back_button.xml => mobile/android/base/resources/drawable/address_bar_nav_button.xml
extra : rebase_source : 8bfb59c06c0ad3fe648a2e0fc3ca6176c5617291
2012-11-30 13:16:45 -08:00
Sriram Ramasubramanian
c74dc86404 Bug 811738: Close tabs-tray on closing last tab. [r=mfinkle]. 2012-11-28 16:29:08 -08:00
Lucas Rocha
14a0eb7628 Bug 709433 - Animate toolbar when switching to/from awesome screen (r=mfinkle) 2012-12-03 10:50:41 +00:00
Nick Alexander
d7aca112c9 Bug 799729 - Generalize BaseResource authentication to support Basic-Auth, MAC, and Browser-ID. r=rnewman 2012-11-16 10:08:55 -08:00
Tetsuharu OHZEKI
e6b39e986c Bug 812781 - Rename pref_cookies in android_strings.dtd to reflect string change.r=mark.finkle 2012-11-18 13:45:54 +09:00
Lucas Rocha
b06817ccc6 Bug 812867 - Discard invalid favicon images (r=mfinkle) 2012-12-03 08:59:17 +00:00
Lucas Rocha
10bad7baf1 Bug 807279 - Turn Favicons into a singleton (r=mfinkle) 2012-12-03 08:59:17 +00:00
Lucas Rocha
b37ea2771b Bug 786454 - Protect isReadingListItem against null cursors (r=mfinkle) 2012-11-15 14:40:56 +00:00
Morrison Cole
c6ce5da67a Bug 810278 - Improved background/toolbar visual cohesion. r=wjohnston 2012-11-16 13:43:33 -08:00
Lucas Rocha
a22a51aacf Bug 817526 - Ensure awesome screen animation always starts from correct state (r=mfinkle) 2012-12-10 13:03:56 +00:00
Ed Morley
adcc97b091 Bug 770483 - Disable robocop testAboutPage for too many intermittent failures 2012-12-10 12:52:52 +00:00
Ed Morley
38ecc63452 Bug 817339 - Disable robocop testBookmark for too many intermittent failures 2012-12-10 12:49:32 +00:00
Brian Nicholson
de1ccec3f3 Bug 735399- Only do session restore after a crash. r=mfinkle 2012-12-07 10:50:40 -08:00
Brian Nicholson
071f996be3 Bug 819070 - Don't restore session if Gecko is already running. r=mfinkle
--HG--
extra : rebase_source : 35f720d9815d6e54d09419002dd30e5ab87f2d1a
2012-12-07 10:50:56 -08:00
Geoff Brown
8f2e66cc3d Bug 814278 - Protect against NPE in testThumbnails; r=bnicholson 2012-12-07 07:29:17 -07:00
Chris Lord
98d6ecce87 Bug 819310 - Fix possible race when stopping checkerboard recording. r=kats
Make stopCheckerboardRecording safe to call while recordCheckerboard is
executing.
2012-12-07 15:11:05 +00:00
Mike Hommey
0c81eadc1c Bug 804303 part 4 - Set environment variables earlier on Android. r=blassey,r=wesj 2012-12-07 09:32:24 +01:00
Sriram Ramasubramanian
f9a864752d Bug 811238: Cache color hint in tabs-tray. [r=mfinkle]
--HG--
extra : rebase_source : cf65f59a3ab0b932b57146f2d7613d1b36cf8650
2012-12-06 11:09:37 -08:00
Kartikaya Gupta
ffcbfdadda Bug 813311 - Hide Axis so that it is not unnecessarily exposed to the world. r=Cwiiis 2012-11-20 13:38:47 -05:00
Geoff Brown
7223bf1780 Bug 764901 - Disable part of testPasswordEncrypt to resolve intermittent orange; r=wesj 2012-11-20 10:41:03 -07:00