wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound

Browse Source
This commit is contained in:
Wes Kocher 2013-11-11 16:18:14 -08:00
commit b0b158af8a
44 changed files with 183 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "8aa52bb04742d118e84f830e72a5799b81c98e3a",
"revision": "ed6e6bf16fcf633d1c3f5af81b21ada05e94717c",
"repo_path": "/integration/gaia-central"
}

2
browser/components/downloads/content/indicator.js
View File

@ -361,7 +361,7 @@ const DownloadsIndicatorView = {
*/
set hasDownloads(aValue)
{
if (this._hasDownloads != aValue) {
if (this._hasDownloads != aValue || (!this._operational && aValue)) {
this._hasDownloads = aValue;
// If there is at least one download, ensure that the view elements are

2
mobile/android/base/AndroidManifest.xml.in
View File

@ -239,7 +239,7 @@
</intent-filter>
</activity>
<activity android:name="org.mozilla.gecko.GeckoPreferences"
<activity android:name="org.mozilla.gecko.preferences.GeckoPreferences"
android:theme="@style/Gecko.Preferences"
android:label="@string/settings_title"
android:configChanges="orientation|screenSize"

1
mobile/android/base/BrowserApp.java
View File

@ -21,6 +21,7 @@ import org.mozilla.gecko.home.HomePager;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.home.SearchEngine;
import org.mozilla.gecko.menu.GeckoMenu;
import org.mozilla.gecko.preferences.GeckoPreferences;
import org.mozilla.gecko.prompts.Prompt;
import org.mozilla.gecko.util.Clipboard;
import org.mozilla.gecko.util.GamepadUtils;

28
mobile/android/base/BrowserToolbar.java
View File

@ -670,8 +670,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
break;
case START:
if (Tabs.getInstance().isSelectedTab(tab)) {
updateBackButton(tab.canDoBack());
updateForwardButton(tab.canDoForward());
updateBackButton(canDoBack(tab));
updateForwardButton(canDoForward(tab));
Boolean showProgress = (Boolean)data;
if (showProgress && tab.getState() == Tab.STATE_LOADING)
setProgressVisibility(true);
@ -681,8 +681,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
break;
case STOP:
if (Tabs.getInstance().isSelectedTab(tab)) {
updateBackButton(tab.canDoBack());
updateForwardButton(tab.canDoForward());
updateBackButton(canDoBack(tab));
updateForwardButton(canDoForward(tab));
setProgressVisibility(false);
// Reset the title in case we haven't navigated to a new page yet.
updateTitle();
@ -710,8 +710,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
case ADDED:
updateTabCount(Tabs.getInstance().getDisplayCount());
if (Tabs.getInstance().isSelectedTab(tab)) {
updateBackButton(tab.canDoBack());
updateForwardButton(tab.canDoForward());
updateBackButton(canDoBack(tab));
updateForwardButton(canDoForward(tab));
}
break;
case FAVICON:
@ -877,6 +877,14 @@ public class BrowserToolbar extends GeckoRelativeLayout
return false;
}
private boolean canDoBack(Tab tab) {
return (tab.canDoBack() && !mIsEditing);
}
private boolean canDoForward(Tab tab) {
return (tab.canDoForward() && !mIsEditing);
}
private void addTab() {
mActivity.addTab();
}
@ -1321,8 +1329,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
final Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null) {
setButtonEnabled(mBack, enabled && tab.canDoBack());
setButtonEnabled(mForward, enabled && tab.canDoForward());
setButtonEnabled(mBack, canDoBack(tab));
setButtonEnabled(mForward, canDoForward(tab));
}
}
@ -1768,8 +1776,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
setProgressVisibility(tab.getState() == Tab.STATE_LOADING);
setSecurityMode(tab.getSecurityMode());
setPageActionVisibility(mStop.getVisibility() == View.VISIBLE);
updateBackButton(tab.canDoBack());
updateForwardButton(tab.canDoForward());
updateBackButton(canDoBack(tab));
updateForwardButton(canDoForward(tab));
final boolean isPrivate = tab.isPrivate();
mUrlBarBackground.setPrivateMode(isPrivate);

4
mobile/android/base/DataReportingNotification.java
View File

@ -5,8 +5,8 @@
package org.mozilla.gecko;
import org.mozilla.gecko.GeckoPreferences;
import org.mozilla.gecko.GeckoPreferenceFragment;
import org.mozilla.gecko.preferences.GeckoPreferences;
import org.mozilla.gecko.preferences.GeckoPreferenceFragment;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.Notification;

5
mobile/android/base/GeckoActivity.java
View File

@ -8,11 +8,6 @@ import android.content.ComponentName;
import android.content.Intent;
import android.support.v4.app.FragmentActivity;
interface GeckoActivityStatus {
public boolean isGeckoActivityOpened();
public boolean isFinishing(); // typically from android.app.Activity
};
public class GeckoActivity extends FragmentActivity implements GeckoActivityStatus {
// has this activity recently started another Gecko activity?
private boolean mGeckoActivityOpened = false;

10
mobile/android/base/GeckoActivityStatus.java Normal file
View File

@ -0,0 +1,10 @@
/* 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;
public interface GeckoActivityStatus {
public boolean isGeckoActivityOpened();
public boolean isFinishing(); // typically from android.app.Activity
};

1
mobile/android/base/GeckoApp.java
View File

@ -18,6 +18,7 @@ import org.mozilla.gecko.menu.GeckoMenuInflater;
import org.mozilla.gecko.menu.MenuPanel;
import org.mozilla.gecko.health.BrowserHealthRecorder;
import org.mozilla.gecko.health.BrowserHealthRecorder.SessionInformation;
import org.mozilla.gecko.preferences.GeckoPreferences;
import org.mozilla.gecko.updater.UpdateService;
import org.mozilla.gecko.updater.UpdateServiceHelper;
import org.mozilla.gecko.util.ActivityResultHandler;

4
mobile/android/base/GeckoApplication.java
View File

@ -54,7 +54,7 @@ public class GeckoApplication extends Application {
mInited = true;
}
protected void onActivityPause(GeckoActivityStatus activity) {
public void onActivityPause(GeckoActivityStatus activity) {
mInBackground = true;
if ((activity.isFinishing() == false) &&
@ -79,7 +79,7 @@ public class GeckoApplication extends Application {
GeckoNetworkManager.getInstance().stop();
}
protected void onActivityResume(GeckoActivityStatus activity) {
public void onActivityResume(GeckoActivityStatus activity) {
if (mPausedGecko) {
GeckoAppShell.sendEventToGecko(GeckoEvent.createAppForegroundingEvent());
mPausedGecko = false;

2
mobile/android/base/background/common/GlobalConstants.java.in
View File

@ -44,7 +44,7 @@ public class GlobalConstants {
// Fennec's prefs branch and pref name.
// Eventually Fennec might listen to startup notifications and
// do this automatically, but this will do for now. See Bug 800244.
public static String GECKO_PREFERENCES_CLASS = "org.mozilla.gecko.GeckoPreferences";
public static String GECKO_PREFERENCES_CLASS = "org.mozilla.gecko.preferences.GeckoPreferences";
public static String GECKO_BROADCAST_ANNOUNCEMENTS_PREF_METHOD = "broadcastAnnouncementsPref";
public static String GECKO_BROADCAST_HEALTHREPORT_UPLOAD_PREF_METHOD = "broadcastHealthReportUploadPref";
public static String GECKO_BROADCAST_HEALTHREPORT_PRUNE_METHOD = "broadcastHealthReportPrune";

4
mobile/android/base/home/SearchEngineRow.java
View File

@ -5,14 +5,14 @@
package org.mozilla.gecko.home;
import org.mozilla.gecko.AnimatedHeightLayout;
import org.mozilla.gecko.FlowLayout;
import org.mozilla.gecko.R;
import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener;
import org.mozilla.gecko.home.BrowserSearch.OnSearchListener;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.widget.AnimatedHeightLayout;
import org.mozilla.gecko.widget.FaviconView;
import org.mozilla.gecko.widget.FlowLayout;
import android.content.Context;
import android.util.AttributeSet;

31
mobile/android/base/moz.build
View File

@ -83,11 +83,6 @@ gbjar.sources += [
'ANRReporter.java',
'ActivityHandlerHelper.java',
'AlertNotification.java',
'AlignRightLinkPreference.java',
'AllCapsTextView.java',
'AndroidImport.java',
'AndroidImportPreference.java',
'AnimatedHeightLayout.java',
'AppNotificationClient.java',
'AutocompleteHandler.java',
'animation/AnimatorProxy.java',
@ -103,8 +98,6 @@ gbjar.sources += [
'CameraImageResultHandler.java',
'CameraVideoResultHandler.java',
'CanvasDelegate.java',
'CheckableLinearLayout.java',
'ClickableWhenDisabledEditText.java',
'ContactService.java',
'ContextGetter.java',
'CustomEditText.java',
@ -125,8 +118,6 @@ gbjar.sources += [
'FilePickerResultHandler.java',
'FilePickerResultHandlerSync.java',
'FindInPageBar.java',
'FlowLayout.java',
'FontSizePreference.java',
'FormAssistPopup.java',
'ForwardButton.java',
'GeckoAccessibility.java',
@ -134,6 +125,7 @@ gbjar.sources += [
'GeckoApp.java',
'GeckoAppShell.java',
'GeckoActivity.java',
'GeckoActivityStatus.java',
'GeckoBatteryManager.java',
'GeckoConnectivityReceiver.java',
'GeckoEditable.java',
@ -141,8 +133,6 @@ gbjar.sources += [
'GeckoHalDefines.java',
'GeckoInputConnection.java',
'GeckoMessageReceiver.java',
'GeckoPreferences.java',
'GeckoPreferenceFragment.java',
'GeckoProfile.java',
'GeckoSmsManager.java',
'GeckoThread.java',
@ -157,10 +147,8 @@ gbjar.sources += [
'JavaAddonManager.java',
'LightweightTheme.java',
'LightweightThemeDrawable.java',
'LinkPreference.java',
'MemoryMonitor.java',
'MotionEventInterceptor.java',
'MultiChoicePreference.java',
'NotificationClient.java',
'NotificationHandler.java',
'NotificationHelper.java',
@ -169,7 +157,6 @@ gbjar.sources += [
'OrderedBroadcastHelper.java',
'PageActionLayout.java',
'PrefsHelper.java',
'PrivateDataPreference.java',
'PrivateTab.java',
'prompts/Prompt.java',
'prompts/PromptInput.java',
@ -191,7 +178,6 @@ gbjar.sources += [
'SiteIdentityPopup.java',
'SmsManager.java',
'SurfaceBits.java',
'SyncPreference.java',
'Tab.java',
'TabCounter.java',
'Tabs.java',
@ -293,16 +279,31 @@ gbjar.sources += [
'menu/MenuItemDefault.java',
'menu/MenuPanel.java',
'menu/MenuPopup.java',
'preferences/AlignRightLinkPreference.java',
'preferences/AndroidImport.java',
'preferences/AndroidImportPreference.java',
'preferences/FontSizePreference.java',
'preferences/GeckoPreferences.java',
'preferences/GeckoPreferenceFragment.java',
'preferences/LinkPreference.java',
'preferences/MultiChoicePreference.java',
'preferences/PrivateDataPreference.java',
'preferences/SearchPreferenceCategory.java',
'preferences/SearchEnginePreference.java',
'preferences/SyncPreference.java',
'updater/UpdateServiceHelper.java',
'updater/UpdateService.java',
'widget/ActivityChooserModel.java',
'widget/AllCapsTextView.java',
'widget/AnimatedHeightLayout.java',
'widget/ButtonToast.java',
'widget/CheckableLinearLayout.java',
'widget/ClickableWhenDisabledEditText.java',
'widget/ArrowPopup.java',
'widget/DateTimePicker.java',
'widget/Divider.java',
'widget/FaviconView.java',
'widget/FlowLayout.java',
'widget/GeckoPopupMenu.java',
'widget/GeckoActionProvider.java',
'widget/IconTabWidget.java',

4
mobile/android/base/AlignRightLinkPreference.java → mobile/android/base/preferences/AlignRightLinkPreference.java
View File

@ -3,7 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import android.content.Context;
import android.util.AttributeSet;

3
mobile/android/base/AndroidImport.java → mobile/android/base/preferences/AndroidImport.java
View File

@ -3,8 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import org.mozilla.gecko.db.LocalBrowserDB;

3
mobile/android/base/AndroidImportPreference.java → mobile/android/base/preferences/AndroidImportPreference.java
View File

@ -3,8 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.ProgressDialog;

4
mobile/android/base/FontSizePreference.java → mobile/android/base/preferences/FontSizePreference.java
View File

@ -3,7 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import android.app.AlertDialog;
import android.content.Context;

5
mobile/android/base/GeckoPreferenceFragment.java → mobile/android/base/preferences/GeckoPreferenceFragment.java
View File

@ -3,7 +3,10 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import org.mozilla.gecko.PrefsHelper;
import android.preference.Preference;
import android.preference.PreferenceActivity;

14
mobile/android/base/GeckoPreferences.java → mobile/android/base/preferences/GeckoPreferences.java
View File

@ -3,14 +3,22 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.DataReportingNotification;
import org.mozilla.gecko.GeckoActivityStatus;
import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoApplication;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.PrefsHelper;
import org.mozilla.gecko.background.announcements.AnnouncementsConstants;
import org.mozilla.gecko.background.common.GlobalConstants;
import org.mozilla.gecko.background.healthreport.HealthReportConstants;
import org.mozilla.gecko.preferences.SearchEnginePreference;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.GeckoPreferenceFragment;
import org.mozilla.gecko.util.ThreadUtils;
import org.json.JSONArray;

4
mobile/android/base/LinkPreference.java → mobile/android/base/preferences/LinkPreference.java
View File

@ -3,7 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.Tabs;
import android.content.Context;
import android.preference.Preference;

3
mobile/android/base/MultiChoicePreference.java → mobile/android/base/preferences/MultiChoicePreference.java
View File

@ -3,8 +3,9 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.AlertDialog;

5
mobile/android/base/PrivateDataPreference.java → mobile/android/base/preferences/PrivateDataPreference.java
View File

@ -3,7 +3,10 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.json.JSONException;
import org.json.JSONObject;

2
mobile/android/base/SyncPreference.java → mobile/android/base/preferences/SyncPreference.java
View File

@ -3,7 +3,7 @@
* 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;
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.sync.setup.SyncAccounts;
import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity;

2
mobile/android/base/prompts/PromptInput.java
View File

@ -5,9 +5,9 @@
package org.mozilla.gecko.prompts;
import org.mozilla.gecko.AllCapsTextView;
import org.mozilla.gecko.util.GeckoEventResponder;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.widget.AllCapsTextView;
import org.mozilla.gecko.widget.DateTimePicker;
import org.json.JSONArray;

26
mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
View File

@ -3,16 +3,16 @@
- 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/. -->
<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client"
android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent"
android:paddingLeft="2dip"
android:paddingRight="2dip"
android:textStyle="bold"
android:textSize="12sp"
android:singleLine="false"
android:maxLines="2"
android:gravity="center_vertical"/>
<org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client"
android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent"
android:paddingLeft="2dip"
android:paddingRight="2dip"
android:textStyle="bold"
android:textSize="12sp"
android:singleLine="false"
android:maxLines="2"
android:gravity="center_vertical"/>

2
mobile/android/base/resources/layout/crash_reporter.xml
View File

@ -71,7 +71,7 @@
android:layout_marginBottom="10dp"
android:text="@string/crash_allow_contact2"/>
<org.mozilla.gecko.ClickableWhenDisabledEditText
<org.mozilla.gecko.widget.ClickableWhenDisabledEditText
android:id="@+id/email"
style="@style/CrashReporter.EditText"
android:layout_width="fill_parent"

22
mobile/android/base/resources/layout/remote_tabs_group.xml
View File

@ -3,14 +3,14 @@
- 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/. -->
<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client"
android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textStyle="bold"
android:textSize="14sp"
android:gravity="center_vertical"/>
<org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client"
android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textStyle="bold"
android:textSize="14sp"
android:gravity="center_vertical"/>

16
mobile/android/base/resources/layout/search_engine_row.xml
View File

@ -14,17 +14,17 @@
android:minWidth="@dimen/favicon_bg"
android:minHeight="@dimen/favicon_bg"/>
<org.mozilla.gecko.FlowLayout android:id="@+id/suggestion_layout"
android:layout_toRightOf="@id/suggestion_icon"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:duplicateParentState="true">
<org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
android:layout_toRightOf="@id/suggestion_icon"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:duplicateParentState="true">
<include layout="@layout/suggestion_item"
android:id="@+id/suggestion_user_entered"/>
</org.mozilla.gecko.FlowLayout>
</org.mozilla.gecko.widget.FlowLayout>
</merge>

4
mobile/android/base/resources/layout/site_setting_item.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<org.mozilla.gecko.CheckableLinearLayout
<org.mozilla.gecko.widget.CheckableLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -50,4 +50,4 @@
android:focusable="false"
android:clickable="false"/>
</org.mozilla.gecko.CheckableLinearLayout>
</org.mozilla.gecko.widget.CheckableLinearLayout>

10
mobile/android/base/resources/xml-v11/preference_headers.xml
View File

@ -9,31 +9,31 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
<header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_customize">
<extra android:name="resource"
android:value="preferences_customize_tablet"/>
</header>
<header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_display">
<extra android:name="resource"
android:value="preferences_display"/>
</header>
<header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_privacy_short">
<extra android:name="resource"
android:value="preferences_privacy"/>
</header>
<header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_vendor">
<extra android:name="resource"
android:value="preferences_vendor"/>
</header>
<header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_devtools">
<extra android:name="resource"
android:value="preferences_devtools"/>

16
mobile/android/base/resources/xml-v11/preferences.xml
View File

@ -11,38 +11,38 @@
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:enabled="false">
<org.mozilla.gecko.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_customize"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_display"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_display" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_privacy_short"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_privacy" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_vendor"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_vendor"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_devtools"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_devtools"/>
</PreferenceScreen>

4
mobile/android/base/resources/xml-v11/preferences_customize.xml
View File

@ -10,12 +10,12 @@
android:enabled="false">
<PreferenceScreen android:title="@string/pref_category_search"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_search"/>
</PreferenceScreen>
<org.mozilla.gecko.AndroidImportPreference
<org.mozilla.gecko.preferences.AndroidImportPreference
android:key="android.not_a_preference.import_android"
gecko:entries="@array/pref_import_android_entries"
gecko:entryKeys="@array/pref_import_android_keys"

10
mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml
View File

@ -12,17 +12,17 @@
android:title="@string/pref_category_customize"
android:enabled="false">
<org.mozilla.gecko.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_search"
android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_search"/>
</PreferenceScreen>
<org.mozilla.gecko.AndroidImportPreference
<org.mozilla.gecko.preferences.AndroidImportPreference
android:key="android.not_a_preference.import_android"
gecko:entries="@array/pref_import_android_entries"
gecko:entryKeys="@array/pref_import_android_keys"

16
mobile/android/base/resources/xml/preferences.xml
View File

@ -11,14 +11,14 @@
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:enabled="false">
<org.mozilla.gecko.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_customize" />
@ -28,7 +28,7 @@
<PreferenceScreen android:title="@string/pref_category_display" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_display" />
@ -38,7 +38,7 @@
<PreferenceScreen android:title="@string/pref_category_privacy_short" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_privacy" />
@ -48,7 +48,7 @@
<PreferenceScreen android:title="@string/pref_category_vendor">
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_vendor" />
@ -57,7 +57,7 @@
<PreferenceScreen android:title="@string/pref_category_devtools">
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_devtools" />

4
mobile/android/base/resources/xml/preferences_customize.xml
View File

@ -9,14 +9,14 @@
<PreferenceScreen android:title="@string/pref_category_search" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.GeckoPreferences" >
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
<extra
android:name="resource"
android:value="preferences_search" />
</intent>
</PreferenceScreen>
<org.mozilla.gecko.AndroidImportPreference
<org.mozilla.gecko.preferences.AndroidImportPreference
android:key="android.not_a_preference.import_android"
gecko:entries="@array/pref_import_android_entries"
gecko:entryKeys="@array/pref_import_android_keys"

4
mobile/android/base/resources/xml/preferences_devtools.xml
View File

@ -11,7 +11,7 @@
<CheckBoxPreference android:key="devtools.debugger.remote-enabled"
android:title="@string/pref_developer_remotedebugging" />
<org.mozilla.gecko.AlignRightLinkPreference android:title="@string/pref_developer_remotedebugging_docs"
url="https://developer.mozilla.org/docs/Tools/Remote_Debugging" />
<org.mozilla.gecko.preferences.AlignRightLinkPreference android:title="@string/pref_developer_remotedebugging_docs"
url="https://developer.mozilla.org/docs/Tools/Remote_Debugging" />
</PreferenceScreen>

2
mobile/android/base/resources/xml/preferences_display.xml
View File

@ -8,7 +8,7 @@
android:title="@string/pref_category_display"
android:enabled="false">
<org.mozilla.gecko.FontSizePreference
<org.mozilla.gecko.preferences.FontSizePreference
android:key="font.size.inflation.minTwips"
android:title="@string/pref_text_size"
android:positiveButtonText="@string/pref_font_size_set"

2
mobile/android/base/resources/xml/preferences_privacy.xml
View File

@ -31,7 +31,7 @@
android:persistent="false" />
<!-- keys prefixed with "android.not_a_preference." are not synced with Gecko -->
<org.mozilla.gecko.PrivateDataPreference
<org.mozilla.gecko.preferences.PrivateDataPreference
android:key="android.not_a_preference.privacy.clear"
android:title="@string/pref_clear_private_data"
android:persistent="true"

18
mobile/android/base/resources/xml/preferences_vendor.xml
View File

@ -8,14 +8,14 @@
android:title="@string/pref_category_vendor"
android:enabled="false">
<org.mozilla.gecko.LinkPreference android:title="@string/pref_about_firefox"
url="about:" />
<org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_about_firefox"
url="about:" />
<org.mozilla.gecko.LinkPreference android:title="@string/pref_vendor_faqs"
url="https://support.mozilla.org/kb/firefox-android-faq"/>
<org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_vendor_faqs"
url="https://support.mozilla.org/kb/firefox-android-faq"/>
<org.mozilla.gecko.LinkPreference android:title="@string/pref_vendor_feedback"
url="about:feedback" />
<org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_vendor_feedback"
url="about:feedback" />
<CheckBoxPreference android:key="android.not_a_preference.privacy.announcements.enabled"
android:title="@string/pref_show_product_announcements"
@ -43,9 +43,9 @@
android:summary="@string/datareporting_fhr_summary2"
android:defaultValue="true" />
<org.mozilla.gecko.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
android:title="@string/datareporting_abouthr_title"
url="about:healthreport" />
<org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
android:title="@string/datareporting_abouthr_title"
url="about:healthreport" />
</PreferenceCategory>

2
mobile/android/base/AllCapsTextView.java → mobile/android/base/widget/AllCapsTextView.java
View File

@ -2,7 +2,7 @@
* 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;
package org.mozilla.gecko.widget;
import android.content.Context;
import android.util.AttributeSet;

2
mobile/android/base/AnimatedHeightLayout.java → mobile/android/base/widget/AnimatedHeightLayout.java
View File

@ -2,7 +2,7 @@
* 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;
package org.mozilla.gecko.widget;
import org.mozilla.gecko.animation.HeightChangeAnimation;

8
mobile/android/base/CheckableLinearLayout.java → mobile/android/base/widget/CheckableLinearLayout.java
View File

@ -1,4 +1,10 @@
package org.mozilla.gecko;
/* 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.widget;
import org.mozilla.gecko.R;
import android.content.Context;
import android.util.AttributeSet;

2
mobile/android/base/ClickableWhenDisabledEditText.java → mobile/android/base/widget/ClickableWhenDisabledEditText.java
View File

@ -3,7 +3,7 @@
* 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;
package org.mozilla.gecko.widget;
import android.content.Context;
import android.util.AttributeSet;

4
mobile/android/base/FlowLayout.java → mobile/android/base/widget/FlowLayout.java
View File

@ -2,7 +2,9 @@
* 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;
package org.mozilla.gecko.widget;
import org.mozilla.gecko.R;
import android.content.Context;
import android.content.res.TypedArray;