Backed out changesets 34516556f823 (bug 1004890) and 0610c2dcc6f5 (bug 1004889) for Android Armv6 robocop crashes.
CLOSED TREE
This commit is contained in:
@@ -2350,10 +2350,6 @@ abstract public class BrowserApp extends GeckoApp
|
|||||||
|
|
||||||
final int itemId = item.getItemId();
|
final int itemId = item.getItemId();
|
||||||
|
|
||||||
// Track the menu action. We don't know much about the context, but we can use this to determine
|
|
||||||
// the frequency of use for various actions.
|
|
||||||
Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.MENU, getResources().getResourceEntryName(itemId));
|
|
||||||
|
|
||||||
if (itemId == R.id.bookmark) {
|
if (itemId == R.id.bookmark) {
|
||||||
tab = Tabs.getInstance().getSelectedTab();
|
tab = Tabs.getInstance().getSelectedTab();
|
||||||
if (tab != null) {
|
if (tab != null) {
|
||||||
|
|||||||
@@ -46,9 +46,6 @@ public interface TelemetryContract {
|
|||||||
|
|
||||||
// Loading a URL.
|
// Loading a URL.
|
||||||
public static final String LOAD_URL = "loadurl.1";
|
public static final String LOAD_URL = "loadurl.1";
|
||||||
|
|
||||||
// Generic action, usually for tracking menu and toolbar actions.
|
|
||||||
public static final String ACTION = "action.1";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -68,9 +65,6 @@ public interface TelemetryContract {
|
|||||||
// Action occurred via an intent.
|
// Action occurred via an intent.
|
||||||
public static final String INTENT = "intent";
|
public static final String INTENT = "intent";
|
||||||
|
|
||||||
// Action occurred via the main menu.
|
|
||||||
public static final String MENU = "menu";
|
|
||||||
|
|
||||||
// Action occurred via a context menu.
|
// Action occurred via a context menu.
|
||||||
public static final String CONTEXT_MENU = "contextmenu";
|
public static final String CONTEXT_MENU = "contextmenu";
|
||||||
|
|
||||||
|
|||||||
@@ -127,11 +127,6 @@ abstract class HomeFragment extends Fragment {
|
|||||||
final Context context = getActivity();
|
final Context context = getActivity();
|
||||||
|
|
||||||
final int itemId = item.getItemId();
|
final int itemId = item.getItemId();
|
||||||
|
|
||||||
// Track the menu action. We don't know much about the context, but we can use this to determine
|
|
||||||
// the frequency of use for various actions.
|
|
||||||
Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.CONTEXT_MENU, getResources().getResourceEntryName(itemId));
|
|
||||||
|
|
||||||
if (itemId == R.id.home_share) {
|
if (itemId == R.id.home_share) {
|
||||||
if (info.url == null) {
|
if (info.url == null) {
|
||||||
Log.e(LOGTAG, "Can't share because URL is null");
|
Log.e(LOGTAG, "Can't share because URL is null");
|
||||||
|
|||||||
Reference in New Issue
Block a user