Commit Graph

268 Commits

Author SHA1 Message Date
Wes Kocher
dd72dd2a82 Merge fx-team to m-c 2013-12-20 18:28:28 -08:00
Chenxia Liu
401c84e738 Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-20 10:35:10 -08:00
Nick Alexander
3520f2dfa1 Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
c01daad066 Merge b-i to elm
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander
fbff534ad2 Merge m-c to elm 2013-11-13 13:43:32 -08:00
Tim Taubert
e2df2442f1 merge m-c to elm 2013-10-17 10:51:26 -07:00
Tim Taubert
6e4ba571df merge m-c to elm 2013-10-16 17:42:00 -07:00
Chenxia Liu
34dc84ffb3 Bug 919230 - Implement empty screen state for bookmarks. r=sriram 2013-10-16 09:42:33 -07:00
Nick Alexander
663cec0e41 Fix merge 3. 2013-10-15 16:50:20 -07:00
Nick Alexander
de5e8e6409 Merge m-c to elm 2013-10-11 09:33:44 -07:00
Brian Nicholson
c5472b3652 Bug 923519 - Remove resource preprocessing. r=nalexander
--HG--
rename : mobile/android/base/resources/xml/preferences.xml.in => mobile/android/base/resources/xml/preferences.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml.in => mobile/android/base/resources/xml/preferences_customize.xml
rename : mobile/android/base/resources/xml/searchable.xml.in => mobile/android/base/resources/xml/searchable.xml
rename : mobile/android/base/resources/xml/sync_authenticator.xml.in => mobile/android/base/resources/xml/sync_authenticator.xml
rename : mobile/android/base/resources/xml/sync_options.xml.in => mobile/android/base/resources/xml/sync_options.xml
rename : mobile/android/base/resources/xml/sync_syncadapter.xml.in => mobile/android/base/resources/xml/sync_syncadapter.xml
2013-10-10 16:08:59 -07:00
Wes Kocher
994f51b53f Backed out 3 changesets (bug 910189) for breaking android builds
Backed out changeset 119e40b61023 (bug 910189)
Backed out changeset 1c778892acc6 (bug 910189)
Backed out changeset 96816b5d7299 (bug 910189)
2013-12-19 17:10:26 -08:00
Chenxia Liu
9767ec0bba Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-19 16:30:47 -08:00
Nick Alexander
2c8842b2b6 Merge m-c to elm 2013-09-27 08:41:13 -07:00
Nick Alexander
f8b82bf7ff Merge m-c to elm. 2013-09-24 09:17:43 -07:00
Chenxia Liu
86a04e2e04 Bug 919704 - Remove empty screen for "Top Sites". r=sriram 2013-09-26 10:47:23 -07:00
Nick Alexander
1c33b9c9ee Merge m-c to elm. 2013-09-23 08:47:42 -07:00
Margaret Leibovic
14368e3729 Bug 919228 - (Part 2) Remove unused bookmark_add string. r=sriram 2013-09-23 10:40:26 -07:00
Margaret Leibovic
0324828e2d Bug 919228 - Update top sites thumbnail placeholder text to "Add a site". r=sriram 2013-09-23 10:40:24 -07:00
Nick Alexander
30b2d29664 Bug 808813 - Part 2: Implement Firefox Account Android account type. r=rnewman 2013-09-13 14:52:27 -07:00
Mike Hommey
74d249b377 Bug 913842 - Avoid recursing under mobile/android/base/locales when rebuilding gecko.ap_. r=ted 2013-09-10 14:58:50 +09:00
Mike Hommey
c244524eea Backed out changesets b1b292d8e383 and 24af5272b52f (bug 913842) for Android bustage. 2013-09-10 09:38:25 +09:00
Mike Hommey
2538834a31 Fixup for bug 913842. r=me 2013-09-10 08:43:53 +09:00
Chenxia Liu
c4eedb156d Bug 852608 - Part 3: Add UI for adding a search engine. r=lucasr 2013-11-06 15:21:56 -08:00
Mike Hommey
a470038314 Bug 935305 - Move preprocessor to mozbuild.action. r=gps
--HG--
rename : config/Preprocessor.py => python/mozbuild/mozbuild/preprocessor.py
rename : config/tests/unit-Expression.py => python/mozbuild/mozbuild/test/test_expression.py
rename : config/tests/unit-LineEndings.py => python/mozbuild/mozbuild/test/test_line_endings.py
rename : config/tests/unit-Preprocessor.py => python/mozbuild/mozbuild/test/test_preprocessor.py
2013-11-09 10:35:44 +09:00
Ryan VanderMeulen
1c7789af0a Backed out changesets 72a80fc289f2, 30258cd308b5, and c572890f16a2 (bug 910189) for robocop orange. 2013-12-18 20:37:16 -05:00
Chenxia Liu
81bee00b4b Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-18 15:21:14 -08:00
Tetsuharu OHZEKI
cb43dae772 Bug 944925 - Add an option to switch dynamic toolbar mode. r=mleibovic 2013-12-06 10:29:27 -05:00
Mike Hommey
881a7c1554 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
Ed Morley
78591b59b9 Bug 878560 - Rename "Automatic updates" pref to make it clearer that notifications are still expected; r=snorp f=ibarlow,mfinkle 2013-11-27 16:39:23 +00:00
Wes Johnston
55fbf738c2 Bug 768667 - Provide an action mode for compatibility with old Android versions. r=sriram 2013-11-19 11:57:35 -08:00
Ryan VanderMeulen
fb27786b35 Backed out changesets 26df3bab1ab9 and 3c9dbe653a4e (bug 768667) for Android test bustage.
--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-mdpi/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
2013-11-19 17:33:27 -05:00
Wes Johnston
9747791d38 Bug 768667 - Provide an action mode for compatibility with old Android versions. r=sriram 2013-11-19 11:57:35 -08:00
Sriram Ramasubramanian
689741bd5c Bug 917396: Move the grid to "TopSites" page. [r=lucasr]
--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksAdapter.java => mobile/android/base/home/TopSitesGridAdapter.java
rename : mobile/android/base/home/TopBookmarkItemView.java => mobile/android/base/home/TopSitesGridItemView.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/layout/top_bookmark_item_view.xml => mobile/android/base/resources/layout/top_sites_grid_item_view.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
2013-09-17 16:24:48 -04:00
Lucas Rocha
ed9279760c Bug 917394 - Rearrange about:home tabs as per new design (r=sriram)
--HG--
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
2013-09-17 16:58:12 -04:00
Mike Hommey
f8bc7fa754 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Max Li
59d38e9e89 Bug 909153 - Empty reading list hint is inaccessible. r=lucasr 2013-08-25 18:37:32 -04:00
Chenxia Liu
e53c707f0e Bug 907850 - Add a little space around the reader icon in awesomescreen tip. r=sriram 2013-08-26 15:16:26 -07:00
Brian Nicholson
d0e3b6fce3 Bug 904741 - Change session restore pref to have two states. r=mfinkle 2013-08-23 12:32:19 -07:00
Max Li
839bd3582a Bug 906711 - Search buttons don't indicate the search engine. r=lucasr 2013-08-23 10:45:09 -04:00
Margaret Leibovic
89815bce52 Bug 905426 - String tweaks for the new about:home. r=lucasr 2013-08-18 17:39:44 -07:00
Chenxia Liu
cb593f8feb Bug 891953 - Part 2: Add "Tip" for reading list empty screen. r=sriram 2013-08-16 01:41:00 -07:00
Chenxia Liu
86006f24d4 Bug 891953 - Part 1: Implement empty screen text and icon for reading list. r=sriram 2013-08-16 01:33:04 -07:00
Lucas Rocha
85f3dd7c54 Bug 904689 - Implement empty screen state for "Most Visited" page (r=liuche) 2013-08-14 23:31:42 +01:00
Chenxia Liu
5306da399e Bug 895867 - Implement empty screen state for 'tabs from last time'. r=lucasr 2013-08-09 13:39:13 -07:00
Sriram Ramasubramanian
bbe8dd62c4 Merge m-c to fig. 2013-08-09 10:49:51 -07:00
Chenxia Liu
9d5c107c57 Bug 895866 - Implement empty screen state for 'history'. r=sriram 2013-08-06 17:03:04 -07:00
Chenxia Liu
1d488c20c1 Backed out changeset e979b2ee0d42 2013-08-06 18:06:33 -07:00
Chenxia Liu
7ba0024434 Bug 895866 - Implement empty screen state for 'history'. r=sriram 2013-08-06 17:03:04 -07:00
Margaret Leibovic
edbdd9ca7e merge m-c to fig 2013-08-04 15:14:01 -07:00