Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: mobile/android/base/BrowserApp.java

Issue 29322349: Issue 2774 - Make the first run page work again (Closed)
Left Patch Set: Created July 14, 2015, 6:35 p.m.
Right Patch Set: Returning, naming Created July 20, 2015, 4:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
2 * This Source Code Form is subject to the terms of the Mozilla Public 2 * This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 package org.mozilla.gecko; 6 package org.mozilla.gecko;
7 7
8 import org.mozilla.gecko.AppConstants.Versions; 8 import org.mozilla.gecko.AppConstants.Versions;
9 import org.mozilla.gecko.DynamicToolbar.PinReason; 9 import org.mozilla.gecko.DynamicToolbar.PinReason;
10 import org.mozilla.gecko.DynamicToolbar.VisibilityTransition; 10 import org.mozilla.gecko.DynamicToolbar.VisibilityTransition;
(...skipping 2434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2445 }); 2445 });
2446 break; 2446 break;
2447 default: 2447 default:
2448 super.onActivityResult(requestCode, resultCode, data); 2448 super.onActivityResult(requestCode, resultCode, data);
2449 } 2449 }
2450 } 2450 }
2451 2451
2452 private void showFirstrunPager() { 2452 private void showFirstrunPager() {
2453 final DialogFragment dialog = new org.adblockplus.browser.StartPane(); 2453 final DialogFragment dialog = new org.adblockplus.browser.StartPane();
2454 dialog.show(getSupportFragmentManager(), "start_pane"); 2454 dialog.show(getSupportFragmentManager(), "start_pane");
2455 /* 2455
Felix Dahlke 2015/07/20 08:14:22 Instead of commenting this out, we could do someth
René Jeschke 2015/07/20 16:48:36 Done.
2456 Removed to revert to previous start pane behaviour, see https://issues.adblock plus.org/ticket/2774 2456 // Exiting here because we want to show our first run page instead of Mo zilla's
Felix Dahlke 2015/07/20 08:14:22 At this point this "start pane" is just ours - and
René Jeschke 2015/07/20 16:48:36 Done.
2457 // see https://issues.adblockplus.org/ticket/2774
2458 if (true)
2459 {
2460 return;
2461 }
2462
2457 if (mFirstrunPane == null) { 2463 if (mFirstrunPane == null) {
2458 final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firs trun_pager_stub); 2464 final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firs trun_pager_stub);
2459 mFirstrunPane = (FirstrunPane) firstrunPagerStub.inflate(); 2465 mFirstrunPane = (FirstrunPane) firstrunPagerStub.inflate();
2460 mFirstrunPane.load(getSupportFragmentManager()); 2466 mFirstrunPane.load(getSupportFragmentManager());
2461 mFirstrunPane.registerOnFinishListener(new FirstrunPane.OnFinishList ener() { 2467 mFirstrunPane.registerOnFinishListener(new FirstrunPane.OnFinishList ener() {
2462 @Override 2468 @Override
2463 public void onFinish() { 2469 public void onFinish() {
2464 BrowserApp.this.mFirstrunPane = null; 2470 BrowserApp.this.mFirstrunPane = null;
2465 } 2471 }
2466 }); 2472 });
2467 } 2473 }
2468 2474
2469 mHomePagerContainer.setVisibility(View.VISIBLE); 2475 mHomePagerContainer.setVisibility(View.VISIBLE);
2470 */
2471 } 2476 }
2472 2477
2473 private void showHomePager(String panelId) { 2478 private void showHomePager(String panelId) {
2474 showHomePagerWithAnimator(panelId, null); 2479 showHomePagerWithAnimator(panelId, null);
2475 } 2480 }
2476 2481
2477 private void showHomePagerWithAnimator(String panelId, PropertyAnimator anim ator) { 2482 private void showHomePagerWithAnimator(String panelId, PropertyAnimator anim ator) {
2478 if (isHomePagerVisible()) { 2483 if (isHomePagerVisible()) {
2479 // Home pager already visible, make sure it shows the correct panel. 2484 // Home pager already visible, make sure it shows the correct panel.
2480 mHomePager.showPanel(panelId); 2485 mHomePager.showPanel(panelId);
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
3722 dispatcher, 3727 dispatcher,
3723 osLocale, 3728 osLocale,
3724 appLocale, 3729 appLocale,
3725 previousSession); 3730 previousSession);
3726 } 3731 }
3727 3732
3728 public static interface Refreshable { 3733 public static interface Refreshable {
3729 public void refresh(); 3734 public void refresh();
3730 } 3735 }
3731 } 3736 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld