Bug 716906 - Add "Firefox Sync" item to settings. r=dougt

This commit is contained in:
Brian Nicholson 2012-01-25 14:44:59 -08:00
parent ca8c9935e4
commit f0a980ebdd
5 changed files with 78 additions and 3 deletions

View File

@ -65,6 +65,7 @@ FENNEC_JAVA_FILES = \
AwesomeBarTabs.java \
BrowserToolbar.java \
ConfirmPreference.java \
SyncPreference.java \
db/AndroidBrowserDB.java \
db/BrowserDB.java \
db/LocalBrowserDB.java \

View File

@ -0,0 +1,73 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Android code.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2009-2012
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Brian Nicholson <bnicholson@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
package org.mozilla.gecko;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.preference.Preference;
import android.util.AttributeSet;
import android.util.Log;
import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity;
class SyncPreference extends Preference {
private static final String FENNEC_ACCOUNT_TYPE = "org.mozilla.firefox_sync";
private static final String SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";
private Context mContext;
public SyncPreference(Context context, AttributeSet attrs) {
super(context, attrs);
mContext = context;
}
@Override
protected void onClick() {
// show sync setup if no accounts exist; otherwise, show account settings
Account[] accounts = AccountManager.get(mContext).getAccountsByType(FENNEC_ACCOUNT_TYPE);
Intent intent;
if (accounts.length > 0)
intent = new Intent(SYNC_SETTINGS);
else
intent = new Intent(mContext, SetupSyncActivity.class);
mContext.startActivity(intent);
}
}

View File

@ -69,6 +69,7 @@
<!ENTITY pref_font_size_large "Large">
<!ENTITY pref_font_size_xlarge "Extra Large">
<!ENTITY pref_use_master_password "Use master password">
<!ENTITY pref_sync "Sync">
<!ENTITY quit "Quit">

View File

@ -7,9 +7,8 @@
<org.mozilla.gecko.LinkPreference android:title="@string/pref_about_firefox"
url="about:" />
<!-- TODO: Default Search Engine -->
<!-- TODO: Sync -->
<org.mozilla.gecko.SyncPreference android:title="@string/pref_sync"
android:persistent="false" />
</PreferenceCategory>

View File

@ -74,6 +74,7 @@
<string name="pref_font_size_medium">&pref_font_size_medium;</string>
<string name="pref_font_size_large">&pref_font_size_large;</string>
<string name="pref_font_size_xlarge">&pref_font_size_xlarge;</string>
<string name="pref_sync">&pref_sync;</string>
<string name="reload">&reload;</string>
<string name="forward">&forward;</string>