mobile/android/base/AppConstants.java.in - Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: mobile/android/base/AppConstants.java.in

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)

Patch Set: Created Nov. 26, 2015, 11:01 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

OLD	NEW
1 //#filter substitution	1 //#filter substitution

2 /* -- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; --	2 /* -- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; --

3 * This Source Code Form is subject to the terms of the Mozilla Public	3 * This Source Code Form is subject to the terms of the Mozilla Public

4 * License, v. 2.0. If a copy of the MPL was not distributed with this	4 * License, v. 2.0. If a copy of the MPL was not distributed with this

5 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */	5 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

6	6

7 package org.mozilla.gecko;	7 package org.mozilla.gecko;

8	8

9 import android.os.Build;	9 import android.os.Build;

10	10

(...skipping 305 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
316 //#endif	316 //#endif

317	317

318 public static final boolean MOZ_DRAGGABLE_URLBAR = false;	318 public static final boolean MOZ_DRAGGABLE_URLBAR = false;

319	319

320 public static final boolean MOZ_INSTALL_TRACKING =	320 public static final boolean MOZ_INSTALL_TRACKING =

321 //#ifdef MOZ_INSTALL_TRACKING	321 //#ifdef MOZ_INSTALL_TRACKING

322 true;	322 true;

323 //#else	323 //#else

324 false;	324 false;

325 //#endif	325 //#endif

	326

	327 public static final boolean ABB_RELEASE_BUILD =

	328 //#ifdef ABB_RELEASE_BUILD

	329 true;

	330 //#else

	331 false;

	332 //#endif

	333

326 }	334 }

OLD	NEW

« no previous file with comments | « mobile/android/app/mobile.js ('k') | mobile/android/base/home/HomeConfigPrefsBackend.java » ('j') | no next file with comments »