mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1251362 - Part 19 - Remove code and resources for the old Recent Tabs panel. r=liuche 

MozReview-Commit-ID: FQJ7j8YlV6E

--HG--
extra : transplant_source : H%B7Ul%94%E3%C9%9A%C3m%A7%E7At%84%D4%B3%85%5BY
This commit is contained in:
Jan Henning 2016-05-26 17:40:19 +02:00
Родитель 17fe927454
Коммит c37347cd35
15 изменённых файлов: 10 добавлений и 547 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
Просмотреть файл

@ -10,6 +10,7 @@ import android.app.DownloadManager;
import android.os.Environment;
import android.support.annotation.CheckResult;
import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.mozilla.gecko.adjust.AdjustHelperInterface;
import org.mozilla.gecko.annotation.RobocopTarget;
@ -2528,7 +2529,7 @@ public class BrowserApp extends GeckoApp
// history, and loading new pages, see Bug 1268887
panelId = tab.getMostRecentHomePanel();
panelRestoreData = tab.getMostRecentHomePanelData();
} else if (panelId.equals(HomeConfig.getIdForBuiltinPanelType(PanelType.RECENT_TABS))) {
} else if (panelId.equals(HomeConfig.getIdForBuiltinPanelType(PanelType.DEPRECATED_RECENT_TABS))) {
// Redirect to the Combined History panel.
panelId = HomeConfig.getIdForBuiltinPanelType(PanelType.COMBINED_HISTORY);
panelRestoreData = new Bundle();

2
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
Просмотреть файл

@ -1463,7 +1463,7 @@ public abstract class GeckoApp
if (mLastSessionCrashed) {
// The Recent Tabs panel no longer exists, but BrowserApp will redirect us
// to the Recent Tabs folder of the Combined History panel.
Tabs.getInstance().loadUrl(AboutPages.getURLForBuiltinPanelType(PanelType.RECENT_TABS), flags);
Tabs.getInstance().loadUrl(AboutPages.getURLForBuiltinPanelType(PanelType.DEPRECATED_RECENT_TABS), flags);
} else {
final String homepage = getHomepage();
Tabs.getInstance().loadUrl(!TextUtils.isEmpty(homepage) ? homepage : AboutPages.HOME, flags);

10
mobile/android/base/java/org/mozilla/gecko/home/HomeConfig.java
Просмотреть файл

@ -43,13 +43,13 @@ public final class HomeConfig {
TOP_SITES("top_sites", TopSitesPanel.class),
BOOKMARKS("bookmarks", BookmarksPanel.class),
COMBINED_HISTORY("combined_history", CombinedHistoryPanel.class),
RECENT_TABS("recent_tabs", RecentTabsPanel.class),
DYNAMIC("dynamic", DynamicPanel.class),
// Deprecated panels that should no longer exist but are kept around for
// migration code. Class references have been replaced with new version of the panel.
DEPRECATED_REMOTE_TABS("remote_tabs", CombinedHistoryPanel.class),
DEPRECATED_HISTORY("history", CombinedHistoryPanel.class),
DEPRECATED_READING_LIST("reading_list", BookmarksPanel.class);
DEPRECATED_READING_LIST("reading_list", BookmarksPanel.class),
DEPRECATED_RECENT_TABS("recent_tabs", CombinedHistoryPanel.class);
private final String mId;
private final Class<?> mPanelClass;
@ -1644,12 +1644,10 @@ public final class HomeConfig {
case DEPRECATED_HISTORY:
case DEPRECATED_REMOTE_TABS:
case DEPRECATED_RECENT_TABS:
case COMBINED_HISTORY:
return R.string.home_history_title;
case RECENT_TABS:
return R.string.recent_tabs_title;
default:
throw new IllegalArgumentException("Only for built-in panel types: " + panelType);
}
@ -1675,7 +1673,7 @@ public final class HomeConfig {
case DEPRECATED_READING_LIST:
return DEPRECATED_READING_LIST_PANEL_ID;
case RECENT_TABS:
case DEPRECATED_RECENT_TABS:
return RECENT_TABS_PANEL_ID;
default:

4
mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java
Просмотреть файл

@ -362,7 +362,7 @@ public class HomeConfigPrefsBackend implements HomeConfigBackend {
case 1:
// Add "Recent Tabs" panel.
addBuiltinPanelConfig(context, jsonPanels,
PanelType.RECENT_TABS, Position.FRONT, Position.BACK);
PanelType.DEPRECATED_RECENT_TABS, Position.FRONT, Position.BACK);
// Remove the old pref key.
prefsEditor.remove(PREFS_CONFIG_KEY_OLD);
@ -406,7 +406,7 @@ public class HomeConfigPrefsBackend implements HomeConfigBackend {
case 7:
jsonPanels = removePanel(context, jsonPanels,
PanelType.RECENT_TABS, PanelType.COMBINED_HISTORY, true);
PanelType.DEPRECATED_RECENT_TABS, PanelType.COMBINED_HISTORY, true);
break;
}
}

443
mobile/android/base/java/org/mozilla/gecko/home/RecentTabsPanel.java
Просмотреть файл

@ -1,443 +0,0 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.home;
import java.util.ArrayList;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.mozilla.gecko.AboutPages;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.R;
import org.mozilla.gecko.SessionParser;
import org.mozilla.gecko.Telemetry;
import org.mozilla.gecko.TelemetryContract;
import org.mozilla.gecko.db.BrowserContract.CommonColumns;
import org.mozilla.gecko.db.BrowserContract.URLColumns;
import org.mozilla.gecko.reader.SavedReaderViewHelper;
import org.mozilla.gecko.util.EventCallback;
import org.mozilla.gecko.util.NativeEventListener;
import org.mozilla.gecko.util.NativeJSObject;
import org.mozilla.gecko.util.ThreadUtils;
import android.content.Context;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.database.MatrixCursor.RowBuilder;
import android.os.Bundle;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.TextView;
/**
* Fragment that displays tabs from last session in a ListView.
*/
public class RecentTabsPanel extends HomeFragment
implements NativeEventListener {
// Logging tag name
@SuppressWarnings("unused")
private static final String LOGTAG = "GeckoRecentTabsPanel";
// Cursor loader ID for the loader that loads recent tabs
private static final int LOADER_ID_RECENT_TABS = 0;
private static final String TELEMETRY_EXTRA_LAST_TIME = "recent_tabs_last_time";
private static final String TELEMETRY_EXTRA_CLOSED = "recent_closed_tabs";
// Adapter for the list of recent tabs.
private RecentTabsAdapter mAdapter;
// The view shown by the fragment.
private HomeListView mList;
// Reference to the View to display when there are no results.
private View mEmptyView;
// Callbacks used for the search and favicon cursor loaders
private CursorLoaderCallbacks mCursorLoaderCallbacks;
// Recently closed tabs from gecko
private ClosedTab[] mClosedTabs;
private void restoreSessionWithHistory(List<String> dataList) {
JSONObject json = new JSONObject();
try {
json.put("tabs", new JSONArray(dataList));
} catch (JSONException e) {
Log.e(LOGTAG, "JSON error", e);
}
GeckoAppShell.notifyObservers("Session:RestoreRecentTabs", json.toString());
}
private static final class ClosedTab {
public final String url;
public final String title;
public final String data;
public ClosedTab(String url, String title, String data) {
this.url = url;
this.title = title;
this.data = data;
}
}
public static final class RecentTabs implements URLColumns, CommonColumns {
public static final String TYPE = "type";
public static final String DATA = "data";
public static final int TYPE_HEADER = 0;
public static final int TYPE_LAST_TIME = 1;
public static final int TYPE_CLOSED = 2;
public static final int TYPE_OPEN_ALL_LAST_TIME = 3;
public static final int TYPE_OPEN_ALL_CLOSED = 4;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.home_list_panel, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
mList = (HomeListView) view.findViewById(R.id.list);
mList.setTag(HomePager.LIST_TAG_RECENT_TABS);
mList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final Cursor c = mAdapter.getCursor();
if (c == null || !c.moveToPosition(position)) {
return;
}
final int itemType = c.getInt(c.getColumnIndexOrThrow(RecentTabs.TYPE));
if (itemType == RecentTabs.TYPE_OPEN_ALL_LAST_TIME) {
openTabsWithType(RecentTabs.TYPE_LAST_TIME);
return;
}
if (itemType == RecentTabs.TYPE_OPEN_ALL_CLOSED) {
openTabsWithType(RecentTabs.TYPE_CLOSED);
return;
}
final String extras = (itemType == RecentTabs.TYPE_CLOSED) ? TELEMETRY_EXTRA_CLOSED : TELEMETRY_EXTRA_LAST_TIME;
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.LIST_ITEM, extras);
final List<String> dataList = new ArrayList<>();
dataList.add(c.getString(c.getColumnIndexOrThrow(RecentTabs.DATA)));
restoreSessionWithHistory(dataList);
}
});
mList.setContextMenuInfoFactory(new HomeContextMenuInfo.Factory() {
@Override
public HomeContextMenuInfo makeInfoForCursor(View view, int position, long id, Cursor cursor) {
// Don't show context menus for the "Open all" rows.
final int itemType = cursor.getInt(cursor.getColumnIndexOrThrow(RecentTabs.TYPE));
if (itemType == RecentTabs.TYPE_OPEN_ALL_LAST_TIME || itemType == RecentTabs.TYPE_OPEN_ALL_CLOSED) {
return null;
}
final HomeContextMenuInfo info = new HomeContextMenuInfo(view, position, id);
info.url = cursor.getString(cursor.getColumnIndexOrThrow(RecentTabs.URL));
info.title = cursor.getString(cursor.getColumnIndexOrThrow(RecentTabs.TITLE));
return info;
}
});
registerForContextMenu(mList);
EventDispatcher.getInstance().registerGeckoThreadListener(this, "ClosedTabs:Data");
GeckoAppShell.notifyObservers("ClosedTabs:StartNotifications", null);
}
@Override
public void onDestroyView() {
super.onDestroyView();
// Discard any additional item clicks on the list as the
// panel is getting destroyed (bug 1210243).
mList.setOnItemClickListener(null);
mList = null;
mEmptyView = null;
EventDispatcher.getInstance().unregisterGeckoThreadListener(this, "ClosedTabs:Data");
GeckoAppShell.notifyObservers("ClosedTabs:StopNotifications", null);
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
// Intialize adapter
mAdapter = new RecentTabsAdapter(getActivity());
mList.setAdapter(mAdapter);
// Create callbacks before the initial loader is started
mCursorLoaderCallbacks = new CursorLoaderCallbacks();
loadIfVisible();
}
private void updateUiFromCursor(Cursor c) {
if (c != null && c.getCount() > 0) {
return;
}
if (mEmptyView == null) {
// Set empty panel view. We delay this so that the empty view won't flash.
final ViewStub emptyViewStub = (ViewStub) getView().findViewById(R.id.home_empty_view_stub);
mEmptyView = emptyViewStub.inflate();
final ImageView emptyIcon = (ImageView) mEmptyView.findViewById(R.id.home_empty_image);
emptyIcon.setImageResource(R.drawable.icon_remote_tabs_empty);
final TextView emptyText = (TextView) mEmptyView.findViewById(R.id.home_empty_text);
emptyText.setText(R.string.home_last_tabs_empty);
mList.setEmptyView(mEmptyView);
}
}
@Override
protected void load() {
getLoaderManager().initLoader(LOADER_ID_RECENT_TABS, null, mCursorLoaderCallbacks);
}
@Override
public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
final NativeJSObject[] tabs = message.getObjectArray("tabs");
final int length = tabs.length;
final ClosedTab[] closedTabs = new ClosedTab[length];
for (int i = 0; i < length; i++) {
final NativeJSObject tab = tabs[i];
closedTabs[i] = new ClosedTab(tab.getString("url"), tab.getString("title"), tab.getObject("data").toString());
}
// Only modify mClosedTabs on the UI thread
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
mClosedTabs = closedTabs;
// The fragment might have been detached before this code
// runs in the UI thread.
if (getActivity() != null) {
// Reload the cursor to show recently closed tabs.
getLoaderManager().restartLoader(LOADER_ID_RECENT_TABS, null, mCursorLoaderCallbacks);
}
}
});
}
private void openTabsWithType(int type) {
final Cursor c = mAdapter.getCursor();
if (c == null || !c.moveToFirst()) {
return;
}
final List<String> dataList = new ArrayList<String>();
do {
if (c.getInt(c.getColumnIndexOrThrow(RecentTabs.TYPE)) == type) {
dataList.add(c.getString(c.getColumnIndexOrThrow(RecentTabs.DATA)));
}
} while (c.moveToNext());
final String extras = (type == RecentTabs.TYPE_CLOSED) ? TELEMETRY_EXTRA_CLOSED : TELEMETRY_EXTRA_LAST_TIME;
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.BUTTON, extras);
restoreSessionWithHistory(dataList);
}
private static class RecentTabsCursorLoader extends SimpleCursorLoader {
private final ClosedTab[] closedTabs;
public RecentTabsCursorLoader(Context context, ClosedTab[] closedTabs) {
super(context);
this.closedTabs = closedTabs;
}
private void addRow(MatrixCursor c, String url, String title, int type, String data) {
final RowBuilder row = c.newRow();
row.add(-1);
row.add(url);
row.add(title);
row.add(type);
row.add(data);
}
@Override
public Cursor loadCursor() {
// TwoLinePageRow requires the SavedReaderViewHelper to be initialised. Usually this is
// done as part of BrowserDatabaseHelper.onOpen(), however we don't actually access
// the DB when showing the Recent Tabs panel, hence it's possible that the SavedReaderViewHelper
// isn't loaded. Therefore we need to explicitly force loading here.
// Note: loadCursor is run on a background thread, hence it's safe to do this here.
// (loading time is a few ms, and hence shouldn't impact overall loading time for this
// panel in any significant way).
SavedReaderViewHelper.getSavedReaderViewHelper(getContext()).loadItems();
final Context context = getContext();
final MatrixCursor c = new MatrixCursor(new String[] { RecentTabs._ID,
RecentTabs.URL,
RecentTabs.TITLE,
RecentTabs.TYPE,
RecentTabs.DATA});
if (closedTabs != null && closedTabs.length > 0) {
// How many closed tabs are actually displayed.
int visibleClosedTabs = 0;
final int length = closedTabs.length;
for (int i = 0; i < length; i++) {
final String url = closedTabs[i].url;
// Don't show recent tabs for about:home or about:privatebrowsing.
if (!AboutPages.isTitlelessAboutPage(url)) {
// If this is the first closed tab we're adding, add a header for the section.
if (visibleClosedTabs == 0) {
addRow(c, null, context.getString(R.string.home_closed_tabs_title), RecentTabs.TYPE_HEADER, null);
}
addRow(c, url, closedTabs[i].title, RecentTabs.TYPE_CLOSED, closedTabs[i].data);
visibleClosedTabs++;
}
}
// Add an "Open all" button if more than 2 tabs were added to the list.
if (visibleClosedTabs > 1) {
addRow(c, null, null, RecentTabs.TYPE_OPEN_ALL_CLOSED, null);
}
}
// We need to ensure that the session restore code has updated sessionstore.bak as necessary.
GeckoProfile.get(context).waitForOldSessionDataProcessing();
final String jsonString = GeckoProfile.get(context).readSessionFile(true);
if (jsonString == null) {
// No previous session data
return c;
}
final int count = c.getCount();
new SessionParser() {
@Override
public void onTabRead(SessionTab tab) {
final String url = tab.getUrl();
// Don't show last tabs for about:home
if (AboutPages.isAboutHome(url)) {
return;
}
// If this is the first tab we're reading, add a header.
if (c.getCount() == count) {
addRow(c, null, context.getString(R.string.home_last_tabs_title), RecentTabs.TYPE_HEADER, null);
}
addRow(c, url, tab.getTitle(), RecentTabs.TYPE_LAST_TIME, tab.getTabObject().toString());
}
}.parse(jsonString);
// Add an "Open all" button if more than 2 tabs were added to the list (account for the header)
if (c.getCount() - count > 2) {
addRow(c, null, null, RecentTabs.TYPE_OPEN_ALL_LAST_TIME, null);
}
return c;
}
}
private static class RecentTabsAdapter extends MultiTypeCursorAdapter {
private static final int ROW_HEADER = 0;
private static final int ROW_STANDARD = 1;
private static final int ROW_OPEN_ALL = 2;
private static final int[] VIEW_TYPES = new int[] { ROW_STANDARD, ROW_HEADER, ROW_OPEN_ALL };
private static final int[] LAYOUT_TYPES =
new int[] { R.layout.home_item_row, R.layout.home_header_row, R.layout.home_open_all_row };
public RecentTabsAdapter(Context context) {
super(context, null, VIEW_TYPES, LAYOUT_TYPES);
}
@Override
public int getItemViewType(int position) {
final Cursor c = getCursor(position);
final int type = c.getInt(c.getColumnIndexOrThrow(RecentTabs.TYPE));
if (type == RecentTabs.TYPE_HEADER) {
return ROW_HEADER;
}
if (type == RecentTabs.TYPE_OPEN_ALL_LAST_TIME || type == RecentTabs.TYPE_OPEN_ALL_CLOSED) {
return ROW_OPEN_ALL;
}
return ROW_STANDARD;
}
@Override
public boolean isEnabled(int position) {
return (getItemViewType(position) != ROW_HEADER);
}
@Override
public void bindView(View view, Context context, int position) {
final int itemType = getItemViewType(position);
if (itemType == ROW_OPEN_ALL) {
return;
}
final Cursor c = getCursor(position);
if (itemType == ROW_HEADER) {
final String title = c.getString(c.getColumnIndexOrThrow(RecentTabs.TITLE));
final TextView textView = (TextView) view;
textView.setText(title);
} else if (itemType == ROW_STANDARD) {
final TwoLinePageRow pageRow = (TwoLinePageRow) view;
pageRow.setShowIcons(false);
pageRow.updateFromCursor(c);
}
}
}
private class CursorLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
return new RecentTabsCursorLoader(getActivity(), mClosedTabs);
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
mAdapter.swapCursor(c);
updateUiFromCursor(c);
}
@Override
public void onLoaderReset(Loader<Cursor> loader) {
mAdapter.swapCursor(null);
}
}
}

4
mobile/android/base/locales/en-US/android_strings.dtd
Просмотреть файл

@ -44,7 +44,6 @@
They are automatically converted to all caps by the Android platform. -->
<!ENTITY bookmarks_title "Bookmarks">
<!ENTITY history_title "History">
<!ENTITY recent_tabs_title "Recent Tabs">
<!ENTITY switch_to_tab "Switch to tab">
@ -570,11 +569,8 @@ size. -->
<!ENTITY home_clear_history_button "Clear browsing history">
<!ENTITY home_clear_history_confirm "Are you sure you want to clear your history?">
<!ENTITY home_bookmarks_empty "Bookmarks you save show up here.">
<!ENTITY home_closed_tabs_title "Recently closed tabs">
<!ENTITY home_closed_tabs_title2 "Recently closed">
<!ENTITY home_last_tabs_title "Tabs from last time">
<!ENTITY home_last_tabs_empty "Your recent tabs show up here.">
<!ENTITY home_open_all "Open all">
<!ENTITY home_restore_all "Restore all">
<!ENTITY home_closed_tabs_number "&formatD; tabs">
<!-- Localization note (home_closed_tabs_one): This is the singular version of home_closed_tabs_number, referring to the number of recently closed tabs available. -->

1
mobile/android/base/moz.build
Просмотреть файл

@ -432,7 +432,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'home/PanelViewItemHandler.java',
'home/PinSiteDialog.java',
'home/RecentTabsAdapter.java',
'home/RecentTabsPanel.java',
'home/RemoteTabsExpandableListState.java',
'home/SearchEngine.java',
'home/SearchEngineAdapter.java',

20
mobile/android/base/resources/layout-large-land-v11/home_list.xml
Просмотреть файл

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ViewStub android:id="@+id/home_empty_view_stub"
android:layout="@layout/home_empty_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<org.mozilla.gecko.home.HomeListView
android:id="@+id/list"
style="@style/Widget.Home.HomeList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</merge>

20
mobile/android/base/resources/layout-xlarge-v11/home_list.xml
Просмотреть файл

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ViewStub android:id="@+id/home_empty_view_stub"
android:layout="@layout/home_empty_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<org.mozilla.gecko.home.HomeListView
android:id="@+id/list"
style="@style/Widget.Home.HomeList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</merge>

20
mobile/android/base/resources/layout/home_list.xml
Просмотреть файл

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ViewStub android:id="@+id/home_empty_view_stub"
android:layout="@layout/home_empty_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<org.mozilla.gecko.home.HomeListView
android:id="@+id/list"
style="@style/Widget.Home.HomeList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</merge>

13
mobile/android/base/resources/layout/home_list_panel.xml
Просмотреть файл

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/home_list"/>
</LinearLayout>

8
mobile/android/base/resources/layout/home_open_all_row.xml
Просмотреть файл

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/home_open_all"
style="@style/Widget.Home.ActionItem"/>

4
mobile/android/base/strings.xml.in
Просмотреть файл

@ -65,7 +65,6 @@
<string name="bookmarks_title">&bookmarks_title;</string>
<string name="history_title">&history_title;</string>
<string name="recent_tabs_title">&recent_tabs_title;</string>
<string name="switch_to_tab">&switch_to_tab;</string>
@ -452,11 +451,8 @@
<string name="home_clear_history_button">&home_clear_history_button;</string>
<string name="home_clear_history_confirm">&home_clear_history_confirm;</string>
<string name="home_bookmarks_empty">&home_bookmarks_empty;</string>
<string name="home_closed_tabs_title">&home_closed_tabs_title;</string>
<string name="home_closed_tabs_title2">&home_closed_tabs_title2;</string>
<string name="home_last_tabs_title">&home_last_tabs_title;</string>
<string name="home_last_tabs_empty">&home_last_tabs_empty;</string>
<string name="home_open_all">&home_open_all;</string>
<string name="home_restore_all">&home_restore_all;</string>
<string name="home_closed_tabs_number">&home_closed_tabs_number;</string>
<string name="home_closed_tabs_one">&home_closed_tabs_one;</string>

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/components/AboutHomeComponent.java
Просмотреть файл

@ -34,8 +34,7 @@ public class AboutHomeComponent extends BaseComponent {
private static final List<PanelType> PANEL_ORDERING = Arrays.asList(
PanelType.TOP_SITES,
PanelType.BOOKMARKS,
PanelType.COMBINED_HISTORY,
PanelType.RECENT_TABS
PanelType.COMBINED_HISTORY
);
// The percentage of the panel to swipe between 0 and 1. This value was set through

2
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testAboutHomePageNavigation.java
Просмотреть файл

@ -10,8 +10,6 @@ import org.mozilla.gecko.tests.helpers.GeckoHelper;
/**
* Tests functionality related to navigating between the various about:home panels.
*
* TODO: Update this test to account for recent tabs panel (bug 1028727).
*/
public class testAboutHomePageNavigation extends UITest {
// TODO: Define this test dynamically by creating dynamic representations of the Page