Commit Graph

10094 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
3ec5c00413 merge mozilla-inbound to mozilla-central a=merge 2015-10-28 10:43:33 +01:00
Nick Alexander
3323ad2cde Bug 1207708 - Part 2: Build against play-services-{basement,base,gcm} if MOZ_ANDROID_GCM. r=sebastian
Since MOZ_NATIVE_DEVICES builds against play-services-{basement,base,cast},
some ad-hoc de-duplication is necessary.

--HG--
extra : commitid : 2jNIgZpLUq2
extra : source : 0957d3435ac22765d7868cb3c7db1e0787836bc3
2015-10-27 17:41:49 -07:00
Nick Alexander
28cbcc16f5 Bug 1207708 - Part 1: Add MOZ_ANDROID_GCM{_SENDERID} build flags. r=sebastian
These flags are not intended to be feature specific.  On day one, we
intend to support a single GCM-backed feature -- Push Notifications --
but the set of GCM-consuming features is potentially large (e.g.,
possibly Firefox Sync tickles and Send Tab to Device alerts).  Such
features can and will have their own build flags.

Note that GCM sender IDs are not sensitive -- see link in code
comment.  Since this is something custom branding will almost always
want to set, I don't want to bury the default value in confvars.sh.

--HG--
extra : commitid : HBHDBk2tC6S
extra : source : d4e39587c87c16564eeac6d1f8568814b63e5325
2015-10-27 17:42:35 -07:00
Michael Comella
560b98df94 Bug 1213490 - review: Move BrowserApp.getOtherSyncClientCount -> TabsAccessor.getRemoteClientCount. r=me
--HG--
extra : commitid : Ao8erEHjceB
extra : rebase_source : ef834e244bd8a43e77a3712dfbc0bd1b7e265b25
2015-10-27 17:08:28 -07:00
Michael Comella
81acbb1252 Bug 1213490 - Handle shareplane when device list cannot be shown. r=nalexander
The handled cases are:
  * The user is not signed in (sync setup is shown)
  * The user is signed in but has no other synced devices (toast is shown)

--HG--
extra : commitid : LsCwJgg4Zkn
extra : rebase_source : a5551ecbe992968eaf7055c9444f4c49ce5e95c0
2015-10-27 16:59:39 -07:00
Michael Comella
8a576124d4 Bug 1213490 - Move send to device handling code to a separate method. r=nalexander
This makes space to do more in the upcoming patches.

--HG--
extra : commitid : 4zbRVGonbfQ
extra : rebase_source : 50ad23724b31df3338ac36c3d178976cddb2047e
2015-10-19 16:22:37 -04:00
Nick Alexander
b44ed5f63d Bug 1191068 - Support "Choose what to Sync" in Fennec web sign in. r=vivek
The set operation is:

* known engines are enabled by default;
* unchecked engines from fxa-content-server are disabled;
* the "forms" engine is special: it's always the same as "history".

--HG--
extra : commitid : Lbu8A5CH8R9
extra : rebase_source : 74e921492787f69fb36cd5c5e9da61dfd1e2ffc5
2015-10-26 16:37:48 -07:00
Nick Alexander
57cb37d888 Bug 1216100 - Handle "fxaccounts:sync_preferences" message in FxA WebChannel. r=vivek
The only wrinkle is that we don't always have an Activity context, so
we always start a new task.  We might want to revisit that decision.

--HG--
extra : commitid : Liun7Xv30B5
extra : rebase_source : c5afc439ba4fe818e4fda15b2756f510cb76d639
2015-10-26 16:31:19 -07:00
vivek
e8eb8bee2f Bug 1025128 - Part 1: Regularize tabs and clients tables. r=nalexander
This patch bumps the browser.db version to 25 and makes
tabs.client_guid a foreign key to client.guid.  It also replaces the
non-standard "rowid" with "_id".

Together, these disambiguate client_guid and guid and fix non-local
client deletion.

--HG--
extra : commitid : 5dSVFfdTJRK
extra : rebase_source : e72fe51e1afd1a94bbc96efcfaa3a302de468043
2015-10-27 14:44:23 -07:00
Wes Kocher
8d99befba7 Merge m-c to inbound, a=merge
--HG--
extra : commitid : CprilDXCNVx
2015-10-27 14:15:23 -07:00
Jim Chen
72863d2ceb Bug 1199658 - Don't commit Java composition when Gecko side commits its composition; r=esawin
Right now, when the Gecko side commits its composition, we notify the
Java side and the Java side commits its composition as well. However,
some keyboards have trouble dealing with us manually committing the
composition. To better support these keyboards, this patch makes it so
that even if the Gecko composition is committed, the Java composition
is still kept. Because the Gecko composition on Android is used only for
display purposes, it doesn't matter too much when the Gecko composition
is out-of-sync with the Java composition.
2015-10-27 14:22:05 -04:00
Jim Chen
ea2ac091f6 Bug 1199658 - Add test for text duplication when JS resets input value; r=esawin
Add a test to testInputConnection that reproduces this bug. Because this
bug involves JS running during editing, another input field is used on
the test page. Additional code was added to testInputConnection,
GeckoInputConnection, and GeckoViewComponent in order to reproduce the
bug in the new input field.
2015-10-27 14:22:05 -04:00
James Willcox
51d24946f1 Bug 1217942 - Use the fastest mode for VR-related sensor data on Android r=jchen 2015-10-27 12:43:50 -05:00
Michael Comella
6f4aff3f97 Bug 1140210 - Rename MenuItemActionView styles to new name. r=liuche
--HG--
extra : commitid : 2C9M4zQfpaJ
extra : rebase_source : 1a87cd9c6f28080e10debaf41ef99a34f4c2f44a
2015-10-15 14:55:28 -07:00
Michael Comella
01e90d794a Bug 1140210 - menu_item_action_view -> menu_item_switcher_layout. r=liuche
--HG--
rename : mobile/android/base/resources/layout/menu_item_action_view.xml => mobile/android/base/resources/layout/menu_item_switcher_layout.xml
extra : commitid : 3kPAXZAbO6n
extra : rebase_source : 456d7fb795a2fcafca0e9396b607df204eb41f3a
2015-10-15 14:51:26 -07:00
Michael Comella
bb76d0c878 Bug 1140210 - Add class comment to MenuItemSwitcherLayout. r=liuche
--HG--
extra : commitid : Ber6FCYbhO0
extra : rebase_source : 5c8bf9197bce937fe51bd9a0bde4ee4a005c4755
2015-10-15 14:48:37 -07:00
Michael Comella
185c646823 Bug 1140210 - MenuItemActionView -> MenuItemSwitcherLayout. r=liuche
--HG--
rename : mobile/android/base/menu/MenuItemActionView.java => mobile/android/base/menu/MenuItemSwitcherLayout.java
extra : commitid : ChqibE1sVfI
extra : rebase_source : ce5200e57aff013d3fa5cc481969398ab5905c18
2015-10-15 14:48:06 -07:00
Michael Comella
15d941b12e Bug 1213486 - Resize shareplane in top level menu. r=liuche
The menu code is hard to change (I filed bug 1216328) so I opted
to save time by adjusting the padding in the image with an inset
drawable. It'd be better to adjust it statically in the menu code.

--HG--
extra : commitid : D47jDAhHbJV
extra : rebase_source : 9025c9a6e6e7b0010f2f2f3c6311786bc8b2d9ab
2015-10-19 16:17:04 -04:00
Nick Alexander
8b9481fa99 Bug 1214366 - Part 3: Use getLastVisited equivalent in PushService.jsm. r=kitcambridge,rnewman
--HG--
extra : commitid : 7BJvkjwmp6t
extra : rebase_source : b856fccd39ddf3cf8692b45b6b2d77e6c229f51a
2015-10-23 10:07:05 -07:00
Nick Alexander
43901100df Bug 1214366 - Part 2: Add getLastVisited equivalent to Fennec. r=rnewman
The approach is the same as that used on Desktop.  The function name
calls out the "prePath" and "milliseconds" since the first is likely
to be overlooked by Fennec consumers, and the second is notably
different than Desktop (where the database timestamps are microseconds).

--HG--
extra : commitid : 2A7Eux7zPkE
extra : rebase_source : 1ae224da0e2a7836bda84a4371e89afa84f2bf2a
2015-10-23 10:06:26 -07:00
Michael Comella
3cf4ca52de Bug 1215353 - Move TabReceivedBroadcastReceiver notifications to IntentService. r=nalexander
--HG--
rename : mobile/android/base/sync/TabReceivedBroadcastReceiver.java => mobile/android/base/sync/TabReceivedService.java
extra : commitid : BiorrdiQT71
extra : rebase_source : aa51743b45fd9cfaa9b837a2ffbab8e8d6beef14
2015-10-21 14:19:49 -04:00
Sebastian Kaspari
9b7981b86c Bug 1217416 - Override Snackbar.Message style in base theme. r=margaret
--HG--
extra : commitid : DfuP5LK7rpu
extra : rebase_source : acf0438312c2ed48f94ea2388fbaf719bd5e4314
2015-10-22 20:31:16 +02:00
Sebastian Kaspari
2f6fba6f3b Bug 1218336 - Remove obsolete code after removing toolbar drag behavior. r=margaret
--HG--
extra : commitid : DRg4AydqW9i
extra : rebase_source : 5e6ab0966bb43252c1005c216939c1f627d54aac
2015-10-26 11:07:23 +01:00
Michael Comella
c12448a7c8 Bug 1216503 - Have GeckoPrefs inherit from Gecko on 5+. r=sebastian
Before we inherited from GeckoBase, which did not have the colorAccent
attribute.

--HG--
extra : commitid : LK0WCHwaH6x
extra : rebase_source : caeaf49dd9f7e6f05e3b8cfede997eeb2a75a805
2015-10-20 15:38:39 -04:00
Nick Alexander
e4602fd4e7 Bug 1215604 - Use <intent-filter> indirection to allow native and web Sync Get Started activities. r=margaret
--HG--
extra : commitid : EahFUJCcVIC
extra : rebase_source : fab0ebf7728d14a9dd577bdbec64216a8f7b08a7
extra : histedit_source : 8957846ba850fcae9dc4237e6c863ff5f7673a5d
2015-10-21 15:32:42 -07:00
Wes Kocher
9c5b4f52e1 Backed out changeset a6eb8032ebf6 (bug 1217416) for b2gdroid build bustage
--HG--
extra : commitid : H0QJaiNw5dg
2015-10-23 14:25:49 -07:00
Sebastian Kaspari
b4ba229f35 Bug 1208863 - CropImageView: Reset matrix before reusing it. r=margaret
--HG--
extra : commitid : 7g65WiZDyqH
extra : rebase_source : 1f605a3705a6130588ad65c81d842bead04ee3b0
2015-10-23 19:52:34 +02:00
Sebastian Kaspari
8e78389769 Bug 1203137 - Tabs tray (Grid): Explicitly disable fading edge. r=margaret
On newer devices there's no fading edge but on Gingerbread you can see
an ugly, misplaced fading edge effect.

--HG--
extra : commitid : 16zS0rofxHM
extra : rebase_source : f3bed7e22971204cc8f1697e8adc28fb4ff54635
extra : amend_source : 0d418d43d827bc541f0ce50fc63e455587540c56
2015-10-23 17:14:33 +02:00
Sebastian Kaspari
2fba9df490 Bug 1217416 - Override Snackbar.Message style in base theme. r=margaret
--HG--
extra : commitid : CngQGyILL7N
extra : amend_source : 8382ef7a64fe45c568083ecbba1f85fba092580c
2015-10-23 21:16:37 +02:00
Sebastian Kaspari
0781d5819d Bug 1215026 - Create API for Snackbars. r=mfinkle
--HG--
extra : commitid : D0WRiRNan78
extra : rebase_source : 953b0a818dd24b5849c4367aec57c1fdb9d968d1
2015-10-22 14:15:42 +02:00
Sebastian Kaspari
579c312daa Bug 1189306 - Add Android Design Support library to gradle and mach builds. r=nalexander
--HG--
extra : commitid : J3JxjMlJdcC
extra : rebase_source : 8f4624bcf432201e345f75c834e08755c53766ad
2015-10-15 13:01:32 +02:00
Sebastian Kaspari
a50072e010 Bug 1217109 - TabsPanel: Remove unused methods. r=margaret
--HG--
extra : commitid : 4bfxuLXRaeT
extra : rebase_source : 94fb9253368d0529116815b9451f590d3783fcdc
2015-10-23 14:15:50 +02:00
Sebastian Kaspari
e5954d8191 Bug 1217109 - Replace TabsLayoutContainer with FrameLayout. r=margaret
--HG--
extra : commitid : 5Gw5043XlZq
extra : rebase_source : ee9562162ca399891d0e1499a1231fe1d4d1d1e7
2015-10-23 14:04:09 +02:00
Sebastian Kaspari
0be557798a Bug 1217109 - Remove OuterLayout and drag handling. r=margaret
After switching to a full screen tabs tray there's no chrome to drag anymore.

--HG--
extra : commitid : CirRiLLp5Ry
extra : rebase_source : 64fcd4ffd9ae61788e38bed175b6d98701aca3ff
2015-10-23 13:44:37 +02:00
Sebastian Kaspari
fd13c2e2bc Bug 1202753 - Tabs tray (Grid): Scroll to selected tab if it is not visible. r=margaret
--HG--
extra : commitid : Cm97FTi6pCd
extra : rebase_source : 94961d50ccf77ccfcb884df4f41ab1e970630224
extra : amend_source : eccc38963aa0244ed05eb11481fe06b603d837f8
2015-10-23 12:57:17 +02:00
Carsten "Tomcat" Book
c138c48fd1 Merge m-c to fx-team 2015-10-23 11:51:27 +02:00
Sebastian Kaspari
686c33075c Bug 1217003 - Tabs tray (List): Remove unused landscape layout. r=margaret
--HG--
extra : commitid : KX50oJO0G31
extra : rebase_source : e48251654a81fe6f26804ad4474201b62735112c
2015-10-23 10:26:03 +02:00
Sebastian Kaspari
88dea54640 Bug 1217003 - Tabs tray (List): Use ImageView without background for close button. r=margaret
This creates feature parity with the tab view of the grid tabs tray.

Previously the ImageButton created an unpleasant effect when the List row was pressed (due to
duplicateParentState). Rather than losing the selection state by removing duplicateParentState,
this patch will effectively remove the focus state from the close button. This ressembles the
behavior of the close button in the grid version of the tabs tray.

--HG--
extra : commitid : Boe3L8qOvJ1
extra : rebase_source : 008d7532becde2afa272449074d80aec74d50f17
2015-10-22 12:41:04 +02:00
Sebastian Kaspari
6a4c749dd9 Bug 1217003 - Tabs tray (List): Use different text color and close button style if tab is selected. r=margaret
This will create feature parity with the look & feel of tabs in the grid view.

--HG--
extra : commitid : 3eOQy5B93tt
extra : rebase_source : b2079bb0cf7fbba0b82010c22b59b58e8dbd9905
2015-10-22 12:30:54 +02:00
Sebastian Kaspari
028de34297 Bug 1217003 - Tabs tray (List): Add drawable padding for audio indicator. r=margaret
This patch is using the same value we use in the tabs tray grid (tabs_layout_item_view.xml).

--HG--
extra : commitid : I4YLFKAccy1
extra : rebase_source : 21cee94b2ca474228437368ea9219f26670080a7
2015-10-22 12:13:37 +02:00
Sebastian Kaspari
5ae5fd8948 Bug 1217003 - Tabs tray (List): Vertically center tab title. r=margaret
--HG--
extra : commitid : 26D4aT3derL
extra : rebase_source : 56b2a11b4c149bdad1416b22c4642510cf879c88
2015-10-22 12:07:32 +02:00
Sebastian Kaspari
abf9f9b6bb Bug 1215950 - GeckoInputConnection: Run re-focus workaround on the UI thread. r=jchen
--HG--
extra : commitid : Kr4SMp8ijae
extra : rebase_source : 165537cde92b5d5f81cf6b4c4aab9a5cbe48b00a
2015-10-23 10:05:40 +02:00
Wes Kocher
2fc1737838 Merge m-c to inbound, a=merge 2015-10-22 16:56:10 -07:00
Wes Kocher
872e4742b4 Merge fx-team to central, a=merge 2015-10-22 16:45:45 -07:00
Jim Chen
f4bb277325 Bug 1211704 - Remove obsolete GeckoEvent definitions; r=esawin
Remove obsolete GeckoEvent definitions from GeckoEvent.java and
AndroidJavaWrappers.cpp/h.
2015-10-22 17:45:47 -04:00
Jim Chen
0516bbb465 Bug 1211704 - Let GeckoEditable call disposeNative; r=esawin
Right now we call disposeNative on GeckoEditable in the
nsWindow::Natives destructor. However, we may still have pending native
calls in the event queue at that point, and these events will cause
exceptions when handled. This patch makes GeckoEditable call
disposeNative, after ensuring there's no pending calls.
2015-10-22 17:45:47 -04:00
Jim Chen
0e7ee1df92 Bug 1211704 - Convert IME events to native calls; r=esawin
Remove IME events from GeckoEvent and use the newly added native calls
in GeckoEditable.
2015-10-22 17:45:46 -04:00
Jim Chen
aecd53254d Bug 1211704 - Add GeckoEditable native methods; r=esawin
These native methods will replace the IME events used by GeckoEditable.
2015-10-22 17:45:46 -04:00
Jim Chen
1b57167834 Bug 1215139 - Separate out nsWindow closing from disposeNative; r=snorp
This patch adds a separate close() call to nsWindow, and let the
GeckoView decide whether to make that call or not. This lets us use the
static version of disposeNative. If nsWindow is destroyed in the
meantime, we still want to call disposeNative, which would only be
possible using the static version of disposeNative.
2015-10-22 17:45:46 -04:00
Jim Chen
1b1fe2fdef Bug 1210585 - Add native calls for key events; r=esawin
This patch adds a native call to GeckoEditable that will handle key
events instead of using GeckoEvent.KEY_EVENT.
2015-10-22 17:45:46 -04:00