Commit Graph

18594 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
8b8104669f merge mozilla-inbound to mozilla-central a=merge 2015-12-23 12:00:09 +01:00
Mark Capella
a94051d66a Bug 1233709 - Action bar overflow menu sometimes appears with only one item, r=mcomella 2015-12-22 21:47:50 -05:00
Michael Comella
97a55737a2 Bug 1232773 - Call Adjust.onPause/onResume. r=mfinkle 2015-12-22 14:29:51 -08:00
Michael Comella
79e5bb8f12 Bug 1233614 - Remove MOZ_INSTALL_TRACKING branch around Adjust usage. r=mfinkle
We already take care of this in AdjustConstants where we return
StubAdjustHelper if MOZ_INSTALL_TRACKING is not defined.

However, the one downside to this is that we touch SharedPreferences on the
main thread in onCreate even if Adjust is disabled. However, our release and
beta users already have this problem (since Adjust is enabled) so who cares if
our Nightly and Aurora users also have this problem.
2015-12-22 09:47:08 -08:00
Michael Comella
473e39efbf Bug 1233614 - Adjust.setEnabled before upload can occur. r=mfinkle
See the added comment for motivations.
2015-12-22 09:45:49 -08:00
Michael Comella
bda53d488f Bug 1233614 - Remove health report flags in favor of Adjust.setEnabled. r=mfinkle 2015-12-22 09:05:28 -08:00
Margaret Leibovic
1bb1ca8702 Bug 1234238 - Restore FFB theme. r=sebastian 2015-12-21 17:09:05 -05:00
Mark Finkle
b83cd7a904 Bug 935190 - Try to show cached pages when Fennec is offline r=sebastian 2015-12-22 14:28:49 -05:00
Mark Finkle
14f40a5bd3 Bug 1234453 - More complete save.1 UI Telemetry probes r=margaret 2015-12-22 09:32:13 -05:00
Mark Finkle
2385794159 Bug 1234449 - Cleanup reader telemetry r=margaret 2015-12-22 09:32:10 -05:00
Mark Finkle
281f704559 Bug 1234449 - Cleanup import telemetry r=margaret 2015-12-22 09:32:07 -05:00
Mark Finkle
e015d87b59 Bug 1234449 - Cleanup homescreen telemetry r=margaret 2015-12-22 09:32:04 -05:00
Carsten "Tomcat" Book
a38f023bca Merge mozilla-central to fx-team 2015-12-22 12:28:35 +01:00
Carsten "Tomcat" Book
0382f6e22b merge fx-team to mozilla-central a=merge 2015-12-22 11:42:20 +01:00
Wes Kocher
fd5d0e9f28 Backed out changeset 050fbc311d98 (bug 1232632) for android build bustage 2015-12-21 13:06:49 -08:00
Sebastian Kaspari
6b311e248e Bug 1232632 - Restricted profiles: Hide 'Clear private data' if needed. r=margaret 2015-12-21 16:33:36 +01:00
Sebastian Kaspari
06fa351851 Bug 1232632 - Restricted profiles: Hide 'Clear private data' if needed. r=margaret 2015-12-21 16:33:36 +01:00
Carsten "Tomcat" Book
3cca10f430 Merge mozilla-central to b2g-inbound 2015-12-21 12:01:32 +01:00
Carsten "Tomcat" Book
97c5920693 merge mozilla-inbound to mozilla-central a=merge 2015-12-21 11:52:31 +01:00
Sebastian Kaspari
483c6dbe2d Bug 1233467 - Dismiss snackbar when user taps outside. r=mcomella 2015-12-18 17:32:21 +01:00
Margaret Leibovic
29810f518c Bug 1232761 - Expose telemetry/fhr settings directly in restricted profile admin UI. r=sebastian 2015-12-18 11:37:26 -05:00
Margaret Leibovic
54482837ee Bug 1228090 - Update traacking protection telemetry histogram to represent user setting. r=mfinkle 2015-12-18 14:30:24 -05:00
Michael Comella
5952522542 Bug 1232773 - Backout 3 changesets for build errors.
This build configuration doesn't appear to run in automation which is why it
wasn't caught.
2015-12-17 16:30:34 -08:00
Nick Alexander
ef919b3ce9 Bug 1233599 - Add build dependencies to appcompat-v7. r=mcomella 2015-12-16 13:57:05 -08:00
Carsten "Tomcat" Book
c913f81d47 Merge mozilla-central to fx-team 2015-12-21 12:00:23 +01:00
Mantaroh Yoshinaga
9827988f68 Bug 1200133 - Part1 - Change mochitest using TV Simulator Service. r=seanlin 2015-12-17 15:41:00 +01:00
Mark Finkle
b2f4665d6e Bug 1229274 - Investigate tracking when a screenshot is taken in Firefox r=liuche f=nalexander 2015-12-17 13:04:47 -05:00
Sebastian Kaspari
518f0b588b Bug 1219078 - Delegate OMA downloads to external app (if available). r=mfinkle
This patch will prevent Firefox from downloading OMA download descriptors on
its own. Instead it will prompt to complete the action with an external app
if available. An error will be shown if no external app can handle the download.
2015-12-17 14:49:37 +01:00
Samuel Mendes
d7f5fb4f10 Bug 1228037 - GeckoPreferences.PREFS_ZOOMED_VIEW_ENABLED is unused. r=mcomella 2015-12-05 15:44:51 -02:00
Carsten "Tomcat" Book
6d2a08ef4b merge mozilla-inbound to mozilla-central a=merge 2015-12-17 11:59:41 +01:00
Phil Ringnalda
29c5e19176 Back out 3 changesets (bug 1220309) for 2.3 robocop bustage in testPrivateBrowsing and testSessionHistory
CLOSED TREE

Backed out changeset 1cf6f364d319 (bug 1220309)
Backed out changeset f774157cf5f4 (bug 1220309)
Backed out changeset bd4581fe6c9d (bug 1220309)
2015-12-16 22:03:13 -08:00
Michael Comella
ee6227086b Bug 1232773 - review: Comment on Adjust usage. r=me 2015-12-16 14:50:02 -08:00
Michael Comella
f877291fd8 Bug 1232773 - Check if user is opt out from Adjust before accessing. r=mfinkle
It made sense to me to have this code inside the AdjustHelper so I moved the
existing opt out code inside the AdjustHelper as well.
2015-12-16 16:01:57 -08:00
Michael Comella
8b980a0619 Bug 1232773 - Add Adjust.onPause/onResume to record session info. r=mfinkle
I added these to BrowserApp to match the use of Adjust.onCreate in BrowserApp.

These sessions don't perfectly match the FHR sessions they replace which get
called in:
  GeckoApp.onPause (session end)
  BrowserHealthRecorder.onEnvironmentTransition (session end)
  BrowserHealthRecorder.checkForOrphanSessions (session start)
    - From BHR.initializeStorage <- BHR.handleMessage. I didn't figure out
      where this message comes from but given "initializeStorage", I assume
      this comes from a startup routine of GeckoApp.

However, the Adjust docs are explicit about adding these values to
onPause/onResume and presumably written under the assumption that those methods
are called in the appropriate places.

The docs also mention these calls should occur in all Activities but I followed
FHR where only the main Activity is logged - I don't predict any negative side
effects from this change.
2015-12-15 14:44:02 -08:00
Varun Joshi
d38a394d51 Bug 1128675 - Duplicate indexes in browser.db. r=rnewman 2015-12-16 15:02:13 -08:00
Nick Alexander
a1703fa503 Bug 1220309 - Follow-up: Add build dependencies to appcompat-v7. r=mcomella 2015-12-16 13:57:05 -08:00
Michael Comella
10b9c4ef91 Bug 1220309 - Correct all caps button text in Button from AppCompat. r=sebastian
AppCompat capitalizes all text in `Button`s so we have to override
that behavior to maintain the same UI. Ideally, we do this through
`android:buttonStyle` but the place I found the issue doesn't inherit
from that style so we can't and we change the style directly.

There may be issues with other `Button`s, but this is the only one I found.
2015-12-15 11:26:33 -08:00
Geoff Brown
9d13c4ac57 Bug 1232962 - Use emulator device-serial for android-emulator command only; r=jmaher 2015-12-16 13:59:11 -07:00
Geoff Brown
696e2d0c58 Bug 1231491 - Warn when android-emulator run from a non-Android context; r=jmaher 2015-12-16 13:59:09 -07:00
Nick Alexander
e7d014e578 Bug 1232468 - Add ch.boye dependency for Adjust SDK. r=me a=bustage
Pushing to try to address bustage on a CLOSED TREE.
2015-12-14 20:26:34 -08:00
Wes Kocher
3f182b45af Backed out changeset bbe415dff600 (bug 1230937) for testRestrictions failures in android rc3 2015-12-15 14:11:22 -08:00
Wes Kocher
08eb68bcef Backed out changeset 0ac99e7e0440 (bug 1222377) for testRestrictions bustage in android rc3 2015-12-15 14:11:10 -08:00
Nick Alexander
a2df8f3cff Bug 1230848 - Remove Gradle configuration rooted in the object directory. r=gps
DONTBUILD NPOTB

The top source directory configuration requires
mobile/android/gradle/m2repo/**, so it stays.  There's no value
changing the location; it contains an Android-specific Gradle plugin.

We note the removal of |mach gradle-install| and point to the new
documentation.
2015-12-06 15:02:11 -08:00
Sebastian Kaspari
559a4ea324 Bug 1222377 - Add option to enable blocking content in restricted profiles. r=margaret
(Feature only enabled in Nightly until we deployed an actual block list)
2015-12-15 13:34:49 +01:00
Sebastian Kaspari
81dfd88293 Bug 1230937 - Restricted profiles: Always allow features that are not in the configuration. r=margaret 2015-12-15 13:21:45 +01:00
Michael Comella
f93ef40233 Bug 1229958 - Remove android:panelBackground. r=sebastian
There is no noticeable difference in background color of the menu on my 4.* GS4
or my 2.3 Nexus S, though perhaps it affects more than the menu.

The menu_panel_bg drawable is now unused so I removed that too.
2015-12-02 15:32:42 -08:00
Carsten "Tomcat" Book
2c5f71c734 merge mozilla-inbound to mozilla-central a=merge 2015-12-15 12:16:29 +01:00
Michael Comella
ea0c94024c Bug 1209967 - test failures: Increase wait time when searching for a menu View. r=me 2015-12-01 16:48:09 -08:00
Michael Comella
46a2b1f6f5 Bug 1209967 - review: Set menu buttons visible in xml & remove dynamic visibility. r=me 2015-11-25 15:58:47 -08:00
Michael Comella
5d73cc04ea Bug 1209967 - Fix AppMenuComponent to work on GB. r=sebastian
This required us to use the menu button to open the menu and check
if the menu is open by looking at more menu items due to intermittent
issues where the menu would not always be scrolled to the top (I
think Robotium scrolled the menu before it finished appearing so
we couldn't see the first item and failed the isOpen test).
2015-11-25 15:52:39 -08:00