/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to AndroidManifest.xml

  • Committer: edam
  • Date: 2010-10-28 15:49:21 UTC
  • Revision ID: edam@waxworlds.org-20101028154921-98svlxlpno3cpzb8
- added file chooser
- changed file/dir entry box for a button that opens the file chooser
- added dialog to ask if you want to select a dir to scan or a file
- fixed bug where you could abort as dialog opened and the dialog wasn't cancelled
- fixed crash where you could abort as the merge prompt opened and it would try to use the just-destroyed importer
- fixed bug where closing the application at the end would show "aborted!" erroniously

Show diffs side-by-side

added added

removed removed

AndroidManifest.xml
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 *-->
25
 
 
26
 
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.waxworlds.importcontacts" android:versionCode="1" android:versionName="1.0.0">
27
 
 
28
 
        <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
29
 
                <activity android:name=".ImportContacts" android:label="@string/app_name">
 
24
 *
 
25
-->
 
26
 
 
27
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
28
        package="org.waxworlds.edam.importcontacts"
 
29
        android:versionCode="1"
 
30
        android:versionName="1.0">
 
31
 
 
32
        <application android:icon="@drawable/icon"
 
33
                android:label="@string/app_name"
 
34
                android:debuggable="true">
 
35
 
 
36
                <activity android:name=".Intro"
 
37
                                android:label="@string/app_name">
30
38
                        <intent-filter>
31
39
                                <action android:name="android.intent.action.MAIN" />
32
40
                                <category android:name="android.intent.category.LAUNCHER" />
33
41
                        </intent-filter>
34
42
                </activity>
35
 
 
36
 
                <activity android:name=".Intro"></activity>
37
43
                <activity android:name=".ConfigureVCF"></activity>
38
44
                <activity android:name=".Merge"></activity>
39
45
                <activity android:name=".Doit"></activity>