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

Side by Side Diff: mobile/android/base/home/PanelLayout.java

Issue 29341383: Issue 2606 - Firefox logo shown in background on empty Adblock Browser New Tab and Search pages (Closed)
Patch Set: Adjustments in comments Created Nov. 21, 2016, 12:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; 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.home; 6 package org.mozilla.gecko.home;
7 7
8 import org.mozilla.gecko.R; 8 import org.mozilla.gecko.R;
9 import org.mozilla.gecko.db.BrowserContract.HomeItems; 9 import org.mozilla.gecko.db.BrowserContract.HomeItems;
10 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; 10 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 final TextView textView = (TextView) view.findViewById(R.id.home_emp ty_text); 452 final TextView textView = (TextView) view.findViewById(R.id.home_emp ty_text);
453 if (TextUtils.isEmpty(text)) { 453 if (TextUtils.isEmpty(text)) {
454 textView.setText(R.string.home_default_empty); 454 textView.setText(R.string.home_default_empty);
455 } else { 455 } else {
456 textView.setText(text); 456 textView.setText(text);
457 } 457 }
458 458
459 final String imageUrl = (emptyViewConfig == null) ? null : emptyView Config.getImageUrl(); 459 final String imageUrl = (emptyViewConfig == null) ? null : emptyView Config.getImageUrl();
460 final ImageView imageView = (ImageView) view.findViewById(R.id.home_ empty_image); 460 final ImageView imageView = (ImageView) view.findViewById(R.id.home_ empty_image);
461 461
462 // Changed icon. See https://issues.adblockplus.org/ticket/2606
462 if (TextUtils.isEmpty(imageUrl)) { 463 if (TextUtils.isEmpty(imageUrl)) {
463 imageView.setImageResource(R.drawable.icon_home_empty_firefox); 464 imageView.setImageResource(R.drawable.abb_icon_home_empty);
464 } else { 465 } else {
465 ImageLoader.with(getContext()) 466 ImageLoader.with(getContext())
466 .load(imageUrl) 467 .load(imageUrl)
467 .error(R.drawable.icon_home_empty_firefox) 468 .error(R.drawable.abb_icon_home_empty)
468 .into(imageView); 469 .into(imageView);
469 } 470 }
470 471
471 viewState.setEmptyView(view); 472 viewState.setEmptyView(view);
472 } 473 }
473 474
474 return view; 475 return view;
475 } 476 }
476 477
477 private void replacePanelView(View currentView, View newView) { 478 private void replacePanelView(View currentView, View newView) {
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 public boolean canGoBack() { 739 public boolean canGoBack() {
739 return mViewState.canPopFilter(); 740 return mViewState.canPopFilter();
740 } 741 }
741 742
742 @Override 743 @Override
743 public void goBack() { 744 public void goBack() {
744 popFilterOnView(mViewState); 745 popFilterOnView(mViewState);
745 } 746 }
746 } 747 }
747 } 748 }
OLDNEW
« no previous file with comments | « mobile/android/base/home/PanelAuthLayout.java ('k') | mobile/android/base/resources/drawable-hdpi/abb_icon_home_empty.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld