summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2011-09-16 21:17:21 -0700
committerFred Quintana <fredq@google.com>2011-09-16 22:55:08 -0700
commitb04fe4e82abb073b4e5d82563b0882cea0dcc139 (patch)
tree4c7bc22caf7ca5b90bc05f70059d2415ba03b762 /core/res/AndroidManifest.xml
parent1afeea0f207f8b8b781f799f5d150b70495abb1a (diff)
downloadframeworks_base-b04fe4e82abb073b4e5d82563b0882cea0dcc139.zip
frameworks_base-b04fe4e82abb073b4e5d82563b0882cea0dcc139.tar.gz
frameworks_base-b04fe4e82abb073b4e5d82563b0882cea0dcc139.tar.bz2
Continuation of the unified account chooser flow.
- made the UI match the spec - added ability to force the account chooser to appear - added ability to pass in a description that will override the stock one - added ability to pass in requiredFeatures for addAccount - added ability to pass in an authTokenType for addAccount Bug: 5293377 Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 80741eb..9755f22 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1533,19 +1533,14 @@
<activity android:name="android.accounts.ChooseTypeAndAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
- android:theme="@android:style/Theme.Holo.Dialog"
+ android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar"
android:label="@string/choose_account_label"
android:process=":ui">
- <intent-filter>
- <action android:name="android.intent.action.PICK" />
- <category android:name="android.intent.category.ACCOUNT" />
- </intent-filter>
</activity>
<activity android:name="android.accounts.ChooseAccountTypeActivity"
android:excludeFromRecents="true"
- android:exported="true"
- android:theme="@android:style/Theme.Holo.Dialog"
+ android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>