diff options
| author | Zeapo <mohamed@zenadi.com> | 2014-08-01 00:17:05 +0100 |
|---|---|---|
| committer | Zeapo <mohamed@zenadi.com> | 2014-08-01 00:17:05 +0100 |
| commit | a0263aabadf04869da704a0075f01bfde98f279a (patch) | |
| tree | f2c95abaca52becba061761b4b163a188eaf921a /app/src/main/AndroidManifest.xml | |
| parent | 4fe2baccf1b6cb6fe944fa49e34ab794ee53e5c5 (diff) | |
Better distinction between categories and passwords, multilevel categories
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index edec0fa1..822ad8cd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,10 +2,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.zeapo.pwdstore" > - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.INTERNET" /> - <application android:allowBackup="true" android:icon="@drawable/ic_launcher" @@ -22,27 +18,35 @@ </activity> <activity android:name=".GitClone" - android:label="@string/title_activity_git_clone" > + android:label="@string/title_activity_git_clone" + android:parentActivityName=".PasswordStore"> + <meta-data + android:name="android.PARENT_ACTIVITY1" + android:value="com.zeapo.pwdstore.PasswordStore" /> </activity> - <activity android:name=".OpenPgpProviderActivity" /> - <activity android:name=".UserPreference" /> - <activity - android:name=".PgpHandler" - android:label="@string/title_activity_pgp_handler" > + <activity android:name=".crypto.OpenPgpProviderActivity" /> + + <activity android:name=".UserPreference" + android:parentActivityName=".PasswordStore"> + + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.zeapo.pwdstore.PasswordStore" /> </activity> - </application> - <!-- - To retrieve OAuth 2.0 tokens or invalidate tokens to disconnect a user. This disconnect - option is required to comply with the Google+ Sign-In developer policies - --> - <uses-permission android:name="android.permission.USE_CREDENTIALS" /> + <activity + android:name=".crypto.PgpHandler" + android:label="@string/title_activity_pgp_handler" + android:parentActivityName=".PasswordStore"> - <!-- To retrieve the account name (email) as part of sign-in: --> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.zeapo.pwdstore.PasswordStore" /> + </activity> + </application> - <!-- To auto-complete the email text field in the login form with the user's emails --> - <uses-permission android:name="android.permission.READ_PROFILE" /> - <uses-permission android:name="android.permission.READ_CONTACTS" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.INTERNET" /> </manifest> |