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

Bug 718703 - Part 1: Sync crashes from Pair a Device link in sync settings. r=rnewman

Browse Source
This commit is contained in:
Richard Newman 2012-02-03 13:09:28 -08:00
parent e5ef3394a1
commit 9b401b2cd9
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
mobile/android/base/resources/drawable/sync_icon.png → mobile/android/base/resources/drawable/sync_ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

6
mobile/android/base/resources/xml/sync_authenticator.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="org.mozilla.firefox_sync"
android:icon="@drawable/sync_icon"
android:smallIcon="@drawable/sync_icon"
android:icon="@drawable/sync_ic_launcher"
android:smallIcon="@drawable/sync_ic_launcher"
android:label="@string/sync_account_label"
android:accountPreferences="@xml/sync_options" />
android:accountPreferences="@xml/sync_options" />

5
mobile/android/base/resources/xml/sync_options.xml → mobile/android/base/resources/xml/sync_options.xml.in
View File

@ -1,3 +1,4 @@
#filter substitution
<?xml version="1.0" encoding="UTF-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
@ -8,11 +9,11 @@
android:summary="@string/sync_settings_summary_pair">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="org.mozilla.gecko"
android:targetPackage="@ANDROID_PACKAGE_NAME@"
android:targetClass="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity">
<extra
android:name="isSetup"
android:value="false" />
</intent>
</PreferenceScreen>
</PreferenceScreen>
</PreferenceScreen>

2
mobile/android/sync/android-drawable-resources.mn
View File

@ -1,2 +1,2 @@
mobile/android/base/resources/drawable/pin_background.xml
mobile/android/base/resources/drawable/sync_icon.png
mobile/android/base/resources/drawable/sync_ic_launcher.png

1
mobile/android/sync/android-xml-resources.mn
View File

@ -1,3 +1,2 @@
mobile/android/base/resources/xml/sync_authenticator.xml
mobile/android/base/resources/xml/sync_options.xml
mobile/android/base/resources/xml/sync_syncadapter.xml

8
mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
View File

@ -1,7 +1,6 @@
<activity
android:icon="@drawable/sync_ic_launcher"
android:label="@string/sync_app_name"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:configChanges="orientation"
android:windowSoftInputMode="adjustResize|stateHidden"
@ -12,17 +11,14 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="sync" android:host="org.mozilla.android" android:path="/setup"/>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity
android:clearTaskOnLaunch="true"
android:launchMode="singleTask"
android:name="org.mozilla.gecko.sync.setup.activities.AccountActivity"
android:windowSoftInputMode="adjustPan|stateHidden"/>
<activity
android:name="org.mozilla.gecko.sync.setup.activities.SetupFailureActivity" />
<activity
android:name="org.mozilla.gecko.sync.setup.activities.SetupSuccessActivity"
android:launchMode="singleTask" />
android:name="org.mozilla.gecko.sync.setup.activities.SetupSuccessActivity" />

3
mobile/android/sync/strings.xml.in
View File

@ -59,4 +59,5 @@
<string name="bookmarks_folder_mobile">&bookmarks.folder.mobile.label;</string>
<!-- Notification strings -->
<string name="sync_notification_oneaccount">&sync.notification.oneaccount.label;</string>
<string name="sync_notification_oneaccount">&sync.notification.oneaccount.label;</string>